From ba9dc85f5e25e01fa08ad5b20584e65b47de732e Mon Sep 17 00:00:00 2001
From: Bailey Stevens <me@mtxyz.me>
Date: Thu, 8 Feb 2024 20:05:41 -0500
Subject: [PATCH] Note to self: Test before pushing next time.

---
 flake.lock                                    | 37 +++++++++++++++++++
 flake.nix                                     |  8 +++-
 .../cmb/default.nix                           | 12 +++++-
 .../cmb/pubkeys/hive.keys                     |  0
 .../cmb/pubkeys/mtxyz.keys                    |  0
 5 files changed, 54 insertions(+), 3 deletions(-)
 rename systems/{x86_64-install-iso => x86_64-iso}/cmb/default.nix (83%)
 rename systems/{x86_64-install-iso => x86_64-iso}/cmb/pubkeys/hive.keys (100%)
 rename systems/{x86_64-install-iso => x86_64-iso}/cmb/pubkeys/mtxyz.keys (100%)

diff --git a/flake.lock b/flake.lock
index ceaee9f..3a7e188 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,6 +92,42 @@
         "type": "github"
       }
     },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1693701915,
+        "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixos-generators": {
+      "inputs": {
+        "nixlib": "nixlib",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707405218,
+        "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=",
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1705856552,
@@ -112,6 +148,7 @@
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
+        "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "snowfall-lib": "snowfall-lib"
       }
diff --git a/flake.nix b/flake.nix
index 111d55c..7788d4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixos-generators = "github:nix-community/nixos-generators";
+
+    nixos-generators = {
+      url = "github:nix-community/nixos-generators";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     disko = {
       url = "github:nix-community/disko";
@@ -32,6 +36,8 @@
       disko.nixosModules.disko
     ];
 
+    templates.shim.description = "/etc/nixos shim for geekygay nixconf";
+
     src = ./.;
   };
 }
diff --git a/systems/x86_64-install-iso/cmb/default.nix b/systems/x86_64-iso/cmb/default.nix
similarity index 83%
rename from systems/x86_64-install-iso/cmb/default.nix
rename to systems/x86_64-iso/cmb/default.nix
index 15e5935..2a7b83d 100644
--- a/systems/x86_64-install-iso/cmb/default.nix
+++ b/systems/x86_64-iso/cmb/default.nix
@@ -7,13 +7,21 @@
 
 {
   imports = [ 
-    "${modulesPath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
+    "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
   ];
 
+  isoImage.isoBaseName = "nixos-gg-cmb";
+
+  boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages;
+
   nix = {
     registry = {
       nixpkgs.flake = inputs.nixpkgs;
-      nixconf.flake = "git+https://codeberg.org/geekygays/srv-nixconf";
+      nixconf.to = {
+        type = "git+https";
+        server = "codeberg.org";
+        path = "geekygays/srv-nixconf";
+      };
     };
     nixPath = [ 
       "nixpkgs=flake:nixpkgs"
diff --git a/systems/x86_64-install-iso/cmb/pubkeys/hive.keys b/systems/x86_64-iso/cmb/pubkeys/hive.keys
similarity index 100%
rename from systems/x86_64-install-iso/cmb/pubkeys/hive.keys
rename to systems/x86_64-iso/cmb/pubkeys/hive.keys
diff --git a/systems/x86_64-install-iso/cmb/pubkeys/mtxyz.keys b/systems/x86_64-iso/cmb/pubkeys/mtxyz.keys
similarity index 100%
rename from systems/x86_64-install-iso/cmb/pubkeys/mtxyz.keys
rename to systems/x86_64-iso/cmb/pubkeys/mtxyz.keys