move to my external lib

16 files changed, 32 insertions, 12 deletions

diff --git a/hosts/turret/default.nix b/hosts/_turret/default.nix
index faac3d2..faac3d2 100644
--- a/hosts/turret/default.nix
+++ b/hosts/_turret/default.nix
diff --git a/hosts/turret/files/etc/config/dhcp b/hosts/_turret/files/etc/config/dhcp
index 4a471cf..4a471cf 100644
--- a/hosts/turret/files/etc/config/dhcp
+++ b/hosts/_turret/files/etc/config/dhcp
diff --git a/hosts/turret/files/etc/config/dropbear b/hosts/_turret/files/etc/config/dropbear
index 2139ba0..2139ba0 100644
--- a/hosts/turret/files/etc/config/dropbear
+++ b/hosts/_turret/files/etc/config/dropbear
diff --git a/hosts/turret/files/etc/config/firewall b/hosts/_turret/files/etc/config/firewall
index b9a4647..b9a4647 100644
--- a/hosts/turret/files/etc/config/firewall
+++ b/hosts/_turret/files/etc/config/firewall
diff --git a/hosts/turret/files/etc/config/https-dns-proxy b/hosts/_turret/files/etc/config/https-dns-proxy
index e5623ad..e5623ad 100644
--- a/hosts/turret/files/etc/config/https-dns-proxy
+++ b/hosts/_turret/files/etc/config/https-dns-proxy
diff --git a/hosts/turret/files/etc/config/luci b/hosts/_turret/files/etc/config/luci
index 8eb8a9b..8eb8a9b 100644
--- a/hosts/turret/files/etc/config/luci
+++ b/hosts/_turret/files/etc/config/luci
diff --git a/hosts/turret/files/etc/config/network b/hosts/_turret/files/etc/config/network
index c71cf98..c71cf98 100644
--- a/hosts/turret/files/etc/config/network
+++ b/hosts/_turret/files/etc/config/network
diff --git a/hosts/turret/files/etc/config/rpcd b/hosts/_turret/files/etc/config/rpcd
index 176c643..176c643 100644
--- a/hosts/turret/files/etc/config/rpcd
+++ b/hosts/_turret/files/etc/config/rpcd
diff --git a/hosts/turret/files/etc/config/system b/hosts/_turret/files/etc/config/system
index ee3415f..ee3415f 100644
--- a/hosts/turret/files/etc/config/system
+++ b/hosts/_turret/files/etc/config/system
diff --git a/hosts/turret/files/etc/config/ucitrack b/hosts/_turret/files/etc/config/ucitrack
index bb4cdbc..bb4cdbc 100644
--- a/hosts/turret/files/etc/config/ucitrack
+++ b/hosts/_turret/files/etc/config/ucitrack
diff --git a/hosts/turret/files/etc/config/uhttpd b/hosts/_turret/files/etc/config/uhttpd
index cb2ff71..cb2ff71 100644
--- a/hosts/turret/files/etc/config/uhttpd
+++ b/hosts/_turret/files/etc/config/uhttpd
diff --git a/hosts/turret/files/etc/config/wireless b/hosts/_turret/files/etc/config/wireless
index b4a431d..b4a431d 100644
--- a/hosts/turret/files/etc/config/wireless
+++ b/hosts/_turret/files/etc/config/wireless
diff --git a/hosts/turret/files/etc/dropbear/authorized_keys b/hosts/_turret/files/etc/dropbear/authorized_keys
index 495c605..495c605 100644
--- a/hosts/turret/files/etc/dropbear/authorized_keys
+++ b/hosts/_turret/files/etc/dropbear/authorized_keys
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;
   };
 }
diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix
index 4ba8485..25aaf5e 100644
--- a/hosts/glados-wsl/default.nix
+++ b/hosts/glados-wsl/default.nix
@@ -5,7 +5,6 @@
 }: {
   imports = [
     (modulesPath + "/profiles/minimal.nix")
-    ../../users/seth
   ];
 
   environment.systemPackages = with pkgs; [
@@ -31,6 +30,8 @@
 
   nixos.networking.enable = false;
 
+  networking.hostName = "glados-wsl";
+
   security = {
     apparmor.enable = false;
     audit.enable = false;
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index a2be3f5..62006b3 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -1,6 +1,9 @@
-{home-manager, ...}: {
+{
+  home-manager,
+  self,
+  ...
+}: {
   imports = [
-    ../../users/seth
     ./boot.nix
     ./hardware-configuration.nix
   ];
@@ -15,7 +18,7 @@
 
   home-manager.users.seth = {
     imports = [
-      ../../users/seth/desktop
+      "${self}/users/seth/desktop"
     ];
 
     desktop.gnome.enable = true;
@@ -25,6 +28,7 @@
     LIBVA_DRIVER_NAME=vdpau
   '';
 
+  networking.hostName = "glados";
   powerManagement.cpuFreqGovernor = "ondemand";
 
   security.tpm2 = {