Restructure repo

hosts/orion/configuration.nix

@@ -4,21 +4,21 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")
 
-    ../../nixos/home-manager.nix
-    ../../nixos/nix.nix
-    ../../nixos/users.nix
-    ../../nixos/utils.nix
+    ../../modules/nixos/home-manager.nix
+    ../../modules/nixos/nix.nix
+    ../../modules/nixos/users.nix
+    ../../modules/nixos/utils.nix
 
-    ../../server-modules/ssh.nix
-    ../../server-modules/caddy.nix
-    ../../server-modules/bitwarden.nix
-    ../../server-modules/firewall.nix
-    ../../server-modules/copyparty.nix
-    ../../server-modules/home-assistant.nix
-    ../../server-modules/glance.nix
-    ../../server-modules/radicale.nix
-    ../../server-modules/actual-budget.nix
-    ../../server-modules/gitea.nix
+    ../../modules/nixos/ssh.nix
+    ../../modules/nixos/caddy.nix
+    ../../modules/nixos/bitwarden.nix
+    ../../modules/nixos/firewall.nix
+    ../../modules/nixos/copyparty.nix
+    ../../modules/nixos/home-assistant.nix
+    ../../modules/nixos/glance.nix
+    ../../modules/nixos/radicale.nix
+    ../../modules/nixos/actual-budget.nix
+    ../../modules/nixos/gitea.nix
 
     ./disk-config.nix
     ./hardware-configuration.nix

hosts/orion/home.nix

@@ -9,14 +9,8 @@
     ./variables.nix
 
     # Programs
-    #../../home/programs/nvf
-    ../../home/programs/shell
-    #../../home/programs/fetch
-    ../../home/programs/git
-    #../../home/programs/lazygit
-
-    # Scripts
-    #../../home/scripts # All scripts
+    ../../modules/home-manager/shell
+    ../../modules/home-manager/git.nix
   ];
 
   home = {

hosts/orion/variables.nix

@@ -6,7 +6,7 @@
 {
   imports = [
     # Choose your theme here:
-    ../../themes/catppuccin.nix
+    ../../modules/themes/catppuccin.nix
   ];
 
   config.var = {