Finished the registry of modules

hosts/common/modules.nix

@@ -1,12 +1,15 @@
+let
+  modules = import ../../modules;
+in
 {
     # Common nixos systems modules (not nix-darwin)
     imports = [
-      ../../modules/common/nix.nix
+      modules.common.nix
-      ../../modules/common/direnv.nix
+      modules.common.direnv
-      ../../modules/nixos/swap.nix
+      modules.nixos.swap
-      ../../modules/nixos/locale.nix # For localisation options
+      modules.nixos.locale # For localisation options
-      ../../modules/common/ssh.nix
+      modules.common.ssh
-      ../../modules/nixos/bootloader.nix
+      modules.nixos.bootloader
-      ../../modules/common/environment.nix
+      modules.common.environment
     ];
 }

hosts/framework/hardware-configuration.nix

@@ -14,12 +14,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/da617628-d792-4010-af1d-20a25eda3d5b";
+    { device = "/dev/disk/by-label/NIXROOT";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C246-555A";
+    { device = "/dev/disk/by-label/NIXBOOT";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };

hosts/framework/home.nix

@@ -5,7 +5,7 @@ let
 in 
 {
   imports = [
-    ../common/home.nix
+    modules.common.home
     modules.hm.hyprland
   ];
 

hosts/framework/modules.nix

@@ -1,13 +1,15 @@
 { inputs, ...}:
-
+let
+  modules = import ../../modules;
+in
 {
   imports = [
     ./hardware-configuration.nix
     inputs.sops-nix.nixosModules.sops
-    ../common/modules.nix
+    modules.common.module
-    ../../modules/nixos/secrets.nix
+    modules.nixos.secrets
-    ../../modules/nixos/gaming/starCitizen.nix
+    modules.nixos.gaming.starCitizen
-    ../../modules/nixos/gaming/steam.nix
+    modules.nixos.gaming.steam
-    ../../modules/common/spotify.nix
+    modules.common.spotify
   ];
 }

hosts/laptop/modules.nix

@@ -1,9 +1,12 @@
+let
+  modules = import ../../modules;
+in
 {
   imports = [
-    ../common/modules.nix
+    modules.common.module
     ./hardware-configuration.nix
-    ../../modules/nixos/gaming/steam.nix
+    modules.nixos.gaming.steam
-    ../../modules/nixos/gaming/nvidia.nix
+    modules.nixos.gaming.nvidia
   ];
 
 }

hosts/light/configuration.nix

@@ -20,17 +20,23 @@
       };
     };
 
+  programs = {
+    zsh = {
+      enable = true;
+    };
+  };
+
   # Home-Manager config
-  home-manager = {
+  #home-manager = {
-    extraSpecialArgs = { inherit inputs; };
+  #  extraSpecialArgs = { inherit inputs; };
-    useGlobalPkgs = true;
+  #  useGlobalPkgs = true;
-    useUserPackages = true;
+  #  useUserPackages = true;
-    backupFileExtension = "HM-backup";
+  #  backupFileExtension = "HM-backup";
-    users = {
+  #  users = {
-      # Change this to your username
+  #    # Change this to your username
-      "light" = import ./home.nix;
+  #    "light" = import ./home.nix;
-    };
+  #  };
-  };
+  #};
 
   environment = {
     systemPackages = with pkgs; [

hosts/light/modules.nix

@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    #./hardware-configuration.nix
+    ./hardware-configuration.nix
     modules.common.module
     modules.nixos.xfce # Desktop Enviroment 
   ];

hosts/macos/home.nix

@@ -1,9 +1,11 @@
 { config, pkgs, inputs, ... }:
-
+let
+  modules = import ../../modules;
+in
 {
   # Refer to the nixOS host for info about home-manager
   imports = [
-    ../common/home.nix
+    modules.common.home
   ];
 
   

hosts/macos/modules.nix

@@ -1,11 +1,13 @@
 { pkgs, ... }:
-
+let
+  modules = import ../../modules;
+in
 {
 # Enpty file for future imports
   imports = [
-    ../../modules/common/nix.nix
+    modules.common.nix
     #../../modules/macos/vesktop.nix
     #../../modules/macos/ollama.nix
-    ../../modules/common/direnv.nix
+    modules.common.direnv
   ];
 }

hosts/nixos/configuration.nix

@@ -7,7 +7,6 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
       ./modules.nix
     ];
 

hosts/nixos/modules.nix

@@ -6,14 +6,15 @@ in
   # This file is used to import all modules required by this setup.
   imports =
     [
+      ./hardware-configuration.nix
       inputs.sops-nix.nixosModules.sops
       modules.common.module
       modules.nixos.secrets # Sops
 #     ../../modules/nixos/wireless.nix # For the wifi
-      ../../modules/nixos/gaming/nvidia.nix # Nvidia (Drivers and Settings)
+      modules.nixos.gaming.nvidia # Nvidia (Drivers and Settings)
-      ../../modules/nixos/gaming/starCitizen.nix
+      modules.nixos.gaming.starCitizen
-      ../../modules/nixos/gaming/steam.nix # For Steam/Proton/Lutris/MangoHUD/Heroic/Bottles
+      modules.nixos.gaming.steam # For Steam/Proton/Lutris/MangoHUD/Heroic/Bottles
-      ../../modules/common/spotify.nix # Spotify
+      modules.common.spotify # Spotify
-      ../../modules/common/ai.nix
+      modules.common.ai
     ];
 }

modules/default.nix

@@ -21,10 +21,12 @@
   };
 
   nixos = {
-    bootloader = ./nixos/bootloader.nix;
+    gaming = {
       nvidia = ./nixos/gaming/nvidia.nix;
       starCitizen = ./nixos/gaming/starCitizen.nix;
       steam = ./nixos/gaming/steam.nix;
+    };
+    bootloader = ./nixos/bootloader.nix;
     locale = ./nixos/locale.nix;
     secrets = ./nixos/secrets.nix;
     swap = ./nixos/swap.nix;