From f0faf5d5d14ace4f97fc06e4de89b69735c78e28 Mon Sep 17 00:00:00 2001
From: Joshua Potter <jrpotter2112@gmail.com>
Date: Sat, 23 Dec 2023 14:17:37 -0700
Subject: [PATCH] framework: Upgrade to 23.11.

---
 flake.lock | 31 +++++++------------------------
 flake.nix  | 46 ++++++++++++++++------------------------------
 2 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1a9e8ce..fd29816 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,42 +1,26 @@
 {
   "nodes": {
-    "home-manager-23_05": {
+    "home-manager-23_11": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-23_05"
+          "nixpkgs-23_11"
         ]
       },
       "locked": {
-        "lastModified": 1702195668,
-        "narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=",
+        "lastModified": 1703113038,
+        "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f",
+        "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
-    "nixpkgs-23_05": {
-      "locked": {
-        "lastModified": 1702221085,
-        "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-23_11": {
       "locked": {
         "lastModified": 1702233072,
@@ -71,8 +55,7 @@
     },
     "root": {
       "inputs": {
-        "home-manager-23_05": "home-manager-23_05",
-        "nixpkgs-23_05": "nixpkgs-23_05",
+        "home-manager-23_11": "home-manager-23_11",
         "nixpkgs-23_11": "nixpkgs-23_11",
         "sops-nix-23_11": "sops-nix-23_11"
       }
diff --git a/flake.nix b/flake.nix
index a2aab02..1ee7c3b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,56 +2,45 @@
   description = "Colmena hive configuration.";
 
   inputs = {
-    # Stoat
-    nixpkgs-23_05.url = "github:NixOS/nixpkgs/nixos-23.05";
-    home-manager-23_05 = {
-      url = "github:nix-community/home-manager/release-23.05";
-      inputs.nixpkgs.follows = "nixpkgs-23_05";
+    nixpkgs-23_11 = {
+      url = "github:NixOS/nixpkgs/nixos-23.11";
+    };
+    home-manager-23_11 = {
+      url = "github:nix-community/home-manager/release-23.11";
+      inputs.nixpkgs.follows = "nixpkgs-23_11";
     };
-
-    # Tapir
-    nixpkgs-23_11.url = "github:NixOS/nixpkgs/nixos-23.11";
     sops-nix-23_11 = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs-23_11";
     };
   };
 
-  outputs = {
-    nixpkgs-23_05,
-    home-manager-23_05,
-    nixpkgs-23_11,
-    sops-nix-23_11,
-    ...
-  }:
+  outputs = { nixpkgs-23_11, home-manager-23_11, sops-nix-23_11, ... }:
     let
       system = "x86_64-linux";
-      stoat = {
-        stateVersion = "23.05";
-        pkgs = import nixpkgs-23_05 { inherit system; };
-        home-manager = home-manager-23_05;
-        sops-nix = null;
-      };
       tapir = {
         stateVersion = "23.11";
         pkgs = import nixpkgs-23_11 { inherit system; };
-        home-manager = null;
+        home-manager = home-manager-23_11;
         sops-nix = sops-nix-23_11;
       };
     in
     {
       colmena = {
         meta = {
-          nixpkgs = stoat.pkgs;
+          nixpkgs = tapir.pkgs;
           specialArgs = { inherit system; };
           nodeNixpkgs = {
-            framework = stoat.pkgs;
+            framework = tapir.pkgs;
             deimos = tapir.pkgs;
             phobos = tapir.pkgs;
           };
           nodeSpecialArgs = {
             framework = {
-              inherit (stoat) home-manager;
+              inherit (tapir) home-manager;
+            };
+            deimos = {
+              inherit (tapir) sops-nix;
             };
             phobos = {
               inherit (tapir) sops-nix;
@@ -76,17 +65,14 @@
       };
 
       packages.${system}.digital-ocean = {
-        stoat = import ./digital-ocean {
-          inherit (stoat) pkgs;
-        };
         tapir = import ./digital-ocean {
-          inherit (tapir) pkgs;
+          inherit (tapir) pkgs stateVersion;
         };
       };
 
       devShells.${system}.default =
         let
-          pkgs = stoat.pkgs;
+          pkgs = tapir.pkgs;
         in
           pkgs.mkShell {
             packages = with pkgs; [ ssh-to-age sops ];