implementing modules for system applications

hosts/adampad/default.nix

@@ -32,6 +32,7 @@ in {
 
   imports = [
     ./hardware-configuration.nix
+    ./modules.nix
   ];
 
   boot = {

hosts/adampad/modules.nix

@@ -0,0 +1,66 @@
+{
+  modules = {
+    network = {
+      enable = true;
+      hostName = "adampad";
+      interfaces = {
+        "enp7s0" = {
+          allowedTCPPorts = [22 80 443];
+        };
+      };
+    };
+    gaming = {
+      steam.enable = false;
+      gamescope.enable = false;
+      lutris.enable = false;
+      gamemode = {
+        enable = false;
+        optimizeGpu = false;
+      };
+    };
+    gui = {
+      gnome.enable = false;
+      hyprland.enable = true;
+    };
+    utils = {
+      android.enable = true;
+      anyrun.enable = true;
+      corectrl.enable = false;
+      microfetch.enable = true;
+      nix-ld.enable = false;
+    };
+    sysd = {
+      blueman.enable = true;
+      dbus.enable = true;
+      fwupd.enable = true;
+      gnome-keyring.enable = true;
+      greetd.enable = true;
+      gvfs.enable = true;
+      locate.enable = true;
+      mullvad.enable = true;
+      pipewire.enable = true;
+      powerd.enable = true;
+      samba.enable = false;
+      sops.enable = false;
+      ssh.enable = true;
+      udisks.enable = true;
+      xserver.amd.enable = true;
+    };
+    hardware = {
+      bluetooth.enable = true;
+      logitech.enable = false;
+      graphics = {
+        amd.enable = true;
+        nvidia.enable = false;
+      };
+    };
+    studio = {
+      blender = {
+        enable = false;
+        hip = false;
+      };
+      gimp.enable = false;
+      inkscape.enable = false;
+    };
+  };
+}

hosts/cnix/default.nix

@@ -38,6 +38,7 @@ in {
 
   imports = [
     ./hardware-configuration.nix
+    ./modules.nix
   ];
 
   boot = {

hosts/cnix/modules.nix

@@ -0,0 +1,66 @@
+{
+  modules = {
+    network = {
+      enable = true;
+      hostName = "cnix";
+      interfaces = {
+        "enp7s0" = {
+          allowedTCPPorts = [22 80 443];
+        };
+      };
+    };
+    gaming = {
+      steam.enable = true;
+      gamescope.enable = true;
+      lutris.enable = true;
+      gamemode = {
+        enable = true;
+        optimizeGpu = true;
+      };
+    };
+    gui = {
+      gnome.enable = false;
+      hyprland.enable = true;
+    };
+    utils = {
+      android.enable = true;
+      anyrun.enable = true;
+      corectrl.enable = true;
+      microfetch.enable = true;
+      nix-ld.enable = false;
+    };
+    sysd = {
+      blueman.enable = true;
+      dbus.enable = true;
+      fwupd.enable = true;
+      gnome-keyring.enable = true;
+      greetd.enable = true;
+      gvfs.enable = true;
+      locate.enable = true;
+      mullvad.enable = true;
+      pipewire.enable = true;
+      powerd.enable = true;
+      samba.enable = false;
+      sops.enable = true;
+      ssh.enable = true;
+      udisks.enable = true;
+      xserver.amd.hhkbse.enable = true;
+    };
+    hardware = {
+      bluetooth.enable = true;
+      logitech.enable = true;
+      graphics = {
+        amd.enable = true;
+        nvidia.enable = false;
+      };
+    };
+    studio = {
+      blender = {
+        enable = false;
+        hip = false;
+      };
+      gimp.enable = true;
+      inkscape.enable = true;
+    };
+  };
+}

hosts/default.nix

@@ -11,9 +11,9 @@
     systemConfig = "${self}/system";
     hostConfig = "${self}/hosts";
 
-    cnstConfig = "${self}/home/profiles/cnst";
-    toothpickConfig = "${self}/home/profiles/toothpick";
-    adamConfig = "${self}/home/profiles/adam";
+    cnstConfig = "${self}/home/users/cnst";
+    toothpickConfig = "${self}/home/users/toothpick";
+    adamConfig = "${self}/home/users/adam";
 
     userModules = "${self}/home/modules";
     systemModules = "${self}/system/modules";
@@ -23,7 +23,7 @@
     mod = "${systemConfig}";
 
     # get the basic config to build on top of
-    inherit (import "${systemConfig}") adampad cnix toothpc;
+    inherit (import "${systemConfig}") shared;
 
     # get these into the module system
     specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules;};
@@ -31,15 +31,10 @@
     cnix = nixosSystem {
       inherit specialArgs;
       modules =
-        cnix
+        shared
         ++ [
           ./cnix
           "${mod}/boot/lanzaboote"
-          "${mod}/etc/bluetooth"
-          "${mod}/etc/graphics/amd"
-          "${mod}/etc/logitech"
-          "${mod}/etc/network/cnix"
-          "${mod}/etc/xserver/amd/hhkbse"
           "${mod}/nix/nh/cnix"
           {
             home-manager = {
@@ -54,14 +49,10 @@
     toothpc = nixosSystem {
       inherit specialArgs;
       modules =
-        toothpc
+        shared
         ++ [
           ./toothpc
           "${mod}/boot/lanzaboote"
-          "${mod}/etc/graphics/nvidia"
-          "${mod}/etc/logitech"
-          "${mod}/etc/network/toothpc"
-          "${mod}/etc/xserver/nvidia"
           "${mod}/nix/nh/toothpc"
           {
             home-manager = {
@@ -77,14 +68,10 @@
     adampad = nixosSystem {
       inherit specialArgs;
       modules =
-        adampad
+        shared
         ++ [
           ./adampad
           "${mod}/boot"
-          "${mod}/etc/bluetooth"
-          "${mod}/etc/graphics/amd"
-          "${mod}/etc/network/adampad"
-          "${mod}/etc/xserver/amd"
           "${mod}/nix/nh/adampad"
           {
             home-manager = {

hosts/toothpc/default.nix

@@ -32,6 +32,7 @@ in {
 
   imports = [
     ./hardware-configuration.nix
+    ./modules.nix
   ];
 
   boot = {

hosts/toothpc/modules.nix

@@ -0,0 +1,66 @@
+{
+  modules = {
+    network = {
+      enable = true;
+      hostName = "toothpc";
+      interfaces = {
+        "enp4s0" = {
+          allowedTCPPorts = [22 80 443];
+        };
+      };
+    };
+    gaming = {
+      steam.enable = true;
+      gamescope.enable = true;
+      lutris.enable = true;
+      gamemode = {
+        enable = true;
+        optimizeGpu = false;
+      };
+    };
+    gui = {
+      gnome.enable = false;
+      hyprland.enable = true;
+    };
+    utils = {
+      android.enable = false;
+      anyrun.enable = true;
+      corectrl.enable = true;
+      microfetch.enable = true;
+      nix-ld.enable = false;
+    };
+    sysd = {
+      blueman.enable = false;
+      dbus.enable = true;
+      fwupd.enable = true;
+      gnome-keyring.enable = true;
+      greetd.enable = true;
+      gvfs.enable = true;
+      locate.enable = true;
+      mullvad.enable = true;
+      pipewire.enable = true;
+      powerd.enable = true;
+      samba.enable = false;
+      sops.enable = false;
+      ssh.enable = true;
+      udisks.enable = true;
+      xserver.nvidia.enable = true;
+    };
+    hardware = {
+      bluetooth.enable = false;
+      logitech.enable = true;
+      graphics = {
+        amd.enable = false;
+        nvidia.enable = true;
+      };
+    };
+    studio = {
+      blender = {
+        enable = false;
+        hip = false;
+      };
+      gimp.enable = true;
+      inkscape.enable = true;
+    };
+  };
+}