rearranged modules/

flake.nix

@@ -69,9 +69,9 @@
                     "speccon18" #default user
                     [
                         ./hosts/creatorforge.nix
-                        ./modules/services/docker.nix
-                        ./modules/services/openssh.nix
-                        ./modules/desktop/gui/gnome.nix
+                        ./modules/system/services/docker.nix
+                        ./modules/system/services/openssh.nix
+                        ./modules/system/desktop-environments/gnome.nix
                     ] #extra modules to load
                     []; #extra modules to be loaded by home-manager
                 creatorforge-framework = mkComputer
@@ -81,9 +81,9 @@
                         nixos-hardware.nixosModules.framework-12th-gen-intel
                         disko.nixosModules.disko
                         ./hosts/creatorforge.nix
-                        ./modules/services/docker.nix
-                        ./modules/services/openssh.nix
-                        ./modules/desktop/gui/gnome.nix
+                        ./modules/system/services/docker.nix
+                        ./modules/system/services/openssh.nix
+                        ./modules/system/desktop-environments/gnome.nix
                         
                     ] #extra modules to load
                     []; #extra modules to be loaded by home-manager

machines/framework.nix

@@ -30,7 +30,7 @@
     };
   };
 
-  disko.devices = import ../modules/disko/luks-lvm.nix {
+  disko.devices = import ../modules/system/disko/luks-lvm.nix {
     disks = [ "/dev/nvme0n1" ];
   };