implementing modules for system applications

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 = {