chore(modules): update modules

raexera · Nov 25, 2024 · a084b1a · a084b1a
1 parent c98bc32
commit a084b1a
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 61 deletions.
diff --git a/hosts/default.nix b/hosts/default.nix
@@ -19,7 +19,9 @@
     sharedModules = [
       ./modules/config
       ./modules/environment
+      ./modules/programs
       ./modules/security
+      ./modules/services
       ./modules/shell
       ./modules/system
     ];

diff --git a/hosts/minimal/default.nix b/hosts/minimal/default.nix
@@ -2,11 +2,6 @@
   imports = [
     ./disk-configuration.nix
     ./hardware-configuration.nix
-
-    ./programs/neovim.nix
-    ./programs/nh.nix
-    ./services/networking.nix
-    ./services/openssh.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;

diff --git a/hosts/modules/hardware/bluetooth.nix → hosts/modules/hardware/bluetooth/default.nix b/hosts/modules/hardware/bluetooth.nix → hosts/modules/hardware/bluetooth/default.nix
diff --git a/hosts/modules/hardware/gpu/intel.nix → hosts/modules/hardware/gpu/intel/default.nix b/hosts/modules/hardware/gpu/intel.nix → hosts/modules/hardware/gpu/intel/default.nix
diff --git a/hosts/modules/hardware/gpu/nvidia.nix → ...s/modules/hardware/gpu/nvidia/default.nix b/hosts/modules/hardware/gpu/nvidia.nix → ...s/modules/hardware/gpu/nvidia/default.nix
diff --git a/hosts/modules/programs/default.nix b/hosts/modules/programs/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./gnupg.nix
+    ./neovim.nix
+    ./nh.nix
+  ];
+}
diff --git a/hosts/yuki/programs/gnupg.nix → hosts/modules/programs/gnupg.nix b/hosts/yuki/programs/gnupg.nix → hosts/modules/programs/gnupg.nix
diff --git a/hosts/minimal/programs/neovim.nix → hosts/modules/programs/neovim.nix b/hosts/minimal/programs/neovim.nix → hosts/modules/programs/neovim.nix
diff --git a/hosts/minimal/programs/nh.nix → hosts/modules/programs/nh.nix b/hosts/minimal/programs/nh.nix → hosts/modules/programs/nh.nix
diff --git a/hosts/modules/services/default.nix b/hosts/modules/services/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./networking.nix
+    ./openssh.nix
+  ];
+}
diff --git a/hosts/minimal/services/networking.nix → hosts/modules/services/networking.nix b/hosts/minimal/services/networking.nix → hosts/modules/services/networking.nix
diff --git a/hosts/minimal/services/openssh.nix → hosts/modules/services/openssh.nix b/hosts/minimal/services/openssh.nix → hosts/modules/services/openssh.nix
diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix
@@ -5,9 +5,6 @@
     ./power-management.nix
 
     ./programs/dconf.nix
-    ./programs/gnupg.nix
-    ./programs/neovim.nix
-    ./programs/nh.nix
     ./programs/thunar.nix
     ./services/blueman.nix
     ./services/dbus.nix
@@ -16,18 +13,16 @@
     ./services/gvfs.nix
     ./services/location.nix
     ./services/mariadb.nix
-    ./services/networking.nix
-    ./services/openssh.nix
     ./services/pipewire.nix
     ./services/postgresql.nix
     ./virtualisation/containers.nix
     ./virtualisation/docker.nix
     ./virtualisation/podman.nix
 
-    ../modules/hardware/bluetooth.nix
-    ../modules/hardware/gpu/intel.nix
-    ../modules/hardware/gpu/nvidia.nix
-    ../modules/window-managers/hyprland.nix
+    ../modules/hardware/bluetooth
+    ../modules/hardware/gpu/intel
+    ../modules/hardware/gpu/nvidia
+    ../modules/window-managers/hyprland
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;

diff --git a/hosts/yuki/programs/neovim.nix b/hosts/yuki/programs/neovim.nix
diff --git a/hosts/yuki/programs/nh.nix b/hosts/yuki/programs/nh.nix
diff --git a/hosts/yuki/services/networking.nix b/hosts/yuki/services/networking.nix
diff --git a/hosts/yuki/services/openssh.nix b/hosts/yuki/services/openssh.nix