move to my external lib

1 files changed, 23 insertions, 8 deletions

diff --git a/hosts/default.nix b/hosts/default.nix
index fdaea60..e9396a1 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,26 +1,42 @@
 inputs:
 with inputs; let
-  common = {
+  common = rec {
     system = "x86_64-linux";
-    stateVersion = "23.05";
-    pkgs = nixpkgsUnstable;
-    modules = with inputs; [
+    builder = nixpkgsUnstable.lib.nixosSystem;
+
+    modules = [
       agenix.nixosModules.default
       home-manager.nixosModules.home-manager
       nur.nixosModules.nur
+
+      self.nixosModules.getchoo
+      "${self}/users/seth"
+
       {
         age = {
           identityPaths = ["/etc/age/key"];
           secrets = {
-            rootPassword.file = ../users/secrets/rootPassword.age;
-            sethPassword.file = ../users/secrets/sethPassword.age;
+            rootPassword.file = "${self}/users/_secrets/rootPassword.age";
+            sethPassword.file = "${self}/users/_secrets/sethPassword.age";
           };
         };
+
+        nixpkgs = {
+          overlays = [nur.overlay getchoo.overlays.default];
+          config.allowUnfree = true;
+        };
+
+        nix.registry.getchoo.flake = getchoo;
+        nixos.enable = true;
+        system.stateVersion = "23.05";
       }
     ];
+
+    specialArgs = {};
   };
 in {
   glados = {
+    inherit (common) builder specialArgs system;
     modules =
       common.modules
       ++ [
@@ -29,14 +45,13 @@ in {
         nixos-hardware.nixosModules.common-pc-ssd
         lanzaboote.nixosModules.lanzaboote
       ];
-    inherit (common) system stateVersion pkgs;
   };
   glados-wsl = {
+    inherit (common) builder specialArgs system;
     modules =
       common.modules
       ++ [
         nixos-wsl.nixosModules.wsl
       ];
-    inherit (common) system stateVersion pkgs;
   };
 }