Restructure repo

home/scripts/default.nix

@@ -1,15 +0,0 @@
-{
-  imports = [
-    ./nixy
-    ./sounds
-    ./brightness
-    ./caffeine
-    ./hyprpanel
-    ./hyprfocus
-    ./night-shift
-    ./screenshot
-    ./nerdfont-fzf
-    ./notification
-    ./system
-  ];
-}

hosts/altair/configuration.nix

@@ -2,16 +2,16 @@
 {
   imports = [
     # Mostly system related configuration
-    ../../nixos/audio.nix
-    ../../nixos/bluetooth.nix
-    ../../nixos/fonts.nix
-    ../../nixos/home-manager.nix
-    ../../nixos/nix.nix
-    ../../nixos/systemd-boot.nix
-    ../../nixos/sddm.nix
-    ../../nixos/users.nix
-    ../../nixos/utils.nix
-    ../../nixos/hyprland.nix
+    ../../modules/nixos/audio.nix
+    ../../modules/nixos/bluetooth.nix
+    ../../modules/nixos/fonts.nix
+    ../../modules/nixos/home-manager.nix
+    ../../modules/nixos/nix.nix
+    ../../modules/nixos/systemd-boot.nix
+    ../../modules/nixos/sddm.nix
+    ../../modules/nixos/users.nix
+    ../../modules/nixos/utils.nix
+    ../../modules/nixos/hyprland.nix
 
     # You should let those lines as is
     ./hardware-configuration.nix

hosts/altair/home.nix

@@ -10,46 +10,39 @@
     ./variables.nix
 
     # Programs
-    ../../home/programs/kitty
-    # ../../home/programs/alacritty
-    ../../home/programs/ghostty
-    #../../home/programs/nvf
-    ../../home/programs/shell
-    #../../home/programs/fetch
-    ../../home/programs/git
-    #../../home/programs/git/signing.nix
-    ../../home/programs/spicetify
-    ../../home/programs/thunar
-    #../../home/programs/lazygit
-    ../../home/programs/discord
-    #../../home/programs/tailscale
-    ../../home/programs/gpg
-    ../../home/programs/rclone
-    ../../home/programs/direnv
-    ../../home/programs/thunderbird
-    ../../home/programs/bitwarden
-    ../../home/programs/nixCats
-    ../../home/programs/khal
-    ../../home/programs/aerc
-    ../../home/programs/accounts
-    #../../home/programs/zen-browser
+    ../../modules/home-manager/accounts
+    ../../modules/home-manager/nixCats
+    ../../modules/home-manager/shell
+
+    ../../modules/home-manager/aerc.nix
+    ../../modules/home-manager/bitwarden.nix
+    ../../modules/home-manager/direnv.nix
+    ../../modules/home-manager/discord.nix
+    ../../modules/home-manager/ghostty.nix
+    ../../modules/home-manager/git.nix
+    ../../modules/home-manager/gpg.nix
+    ../../modules/home-manager/khal.nix
+    ../../modules/home-manager/kitty.nix
+    ../../modules/home-manager/lazygit.nix
+    ../../modules/home-manager/nh.nix
+    ../../modules/home-manager/rclone.nix
+    ../../modules/home-manager/spicetify.nix
+    ../../modules/home-manager/ssh.nix
+    ../../modules/home-manager/thunar.nix
+    ../../modules/home-manager/thunderbird.nix
+    ../../modules/home-manager/todoman.nix
+    ../../modules/home-manager/vicinae.nix
+    ../../modules/home-manager/zathura.nix
 
     # Scripts
-    ../../home/scripts # All scripts
+    ../../modules/home-manager/scripts
 
     # System (Desktop environment like stuff)
-    ../../home/system/hyprland
-    #../../home/system/hyprlock
-    ../../home/system/hyprpanel
-    #../../home/system/ashell
-    ../../home/system/hyprsunset
-    ../../home/system/hyprpaper
-    ../../home/system/zathura
-    ../../home/system/mime
-    ../../home/system/udiskie
-    ../../home/system/vicinae
-    ../../home/system/wofi
-    # ../../home/system/hypridle
+    ../../modules/home-manager/hyprland
+    ../../modules/home-manager/hyprpanel.nix
+    ../../modules/home-manager/hyprpaper.nix
+    ../../modules/home-manager/mime.nix
+    ../../modules/home-manager/udiskie.nix
   ];
 
   home = {

hosts/altair/variables.nix

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

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

hosts/polaris/configuration.nix

@@ -2,18 +2,18 @@
 {
   imports = [
     # Mostly system related configuration
-    ../../nixos/audio.nix
-    ../../nixos/bluetooth.nix
-    ../../nixos/fonts.nix
-    ../../nixos/home-manager.nix
-    ../../nixos/nix.nix
-    ../../nixos/systemd-boot.nix
-    ../../nixos/sddm.nix
-    ../../nixos/users.nix
-    ../../nixos/utils.nix
-    #../../nixos/tailscale.nix
-    ../../nixos/hyprland.nix
-    #../../nixos/docker.nix
+    ../../modules/nixos/audio.nix
+    ../../modules/nixos/bluetooth.nix
+    ../../modules/nixos/fonts.nix
+    ../../modules/nixos/home-manager.nix
+    ../../modules/nixos/nix.nix
+    ../../modules/nixos/systemd-boot.nix
+    ../../modules/nixos/sddm.nix
+    ../../modules/nixos/users.nix
+    ../../modules/nixos/utils.nix
+    #../../modules/nixos/tailscale.nix
+    ../../modules/nixos/hyprland.nix
+    #../../modules/nixos/docker.nix
 
     # You should let those lines as is
     ./hardware-configuration.nix

hosts/polaris/home.nix

@@ -11,48 +11,39 @@
     ./secrets/default.nix
 
     # Programs
-    ../../home/programs/kitty
-    # ../../home/programs/alacritty
-    ../../home/programs/ghostty
-    #../../home/programs/nvf
-    ../../home/programs/shell
-    #../../home/programs/fetch
-    ../../home/programs/git
-    #../../home/programs/git/signing.nix
-    ../../home/programs/spicetify
-    ../../home/programs/thunar
-    ../../home/programs/lazygit
-    ../../home/programs/discord
-    #../../home/programs/tailscale
-    ../../home/programs/gpg
-    ../../home/programs/rclone
-    ../../home/programs/direnv
-    ../../home/programs/thunderbird
-    ../../home/programs/bitwarden
-    ../../home/programs/nixCats
-    ../../home/programs/khal
-    ../../home/programs/nh
-    ../../home/programs/todoman
-    ../../home/programs/aerc
-    ../../home/programs/accounts
-    ../../home/programs/ssh
-    #../../home/programs/zen-browser
+    ../../modules/home-manager/accounts
+    ../../modules/home-manager/nixCats
+    ../../modules/home-manager/shell
+
+    ../../modules/home-manager/aerc.nix
+    ../../modules/home-manager/bitwarden.nix
+    ../../modules/home-manager/direnv.nix
+    ../../modules/home-manager/discord.nix
+    ../../modules/home-manager/ghostty.nix
+    ../../modules/home-manager/git.nix
+    ../../modules/home-manager/gpg.nix
+    ../../modules/home-manager/khal.nix
+    ../../modules/home-manager/kitty.nix
+    ../../modules/home-manager/lazygit.nix
+    ../../modules/home-manager/nh.nix
+    ../../modules/home-manager/rclone.nix
+    ../../modules/home-manager/spicetify.nix
+    ../../modules/home-manager/ssh.nix
+    ../../modules/home-manager/thunar.nix
+    ../../modules/home-manager/thunderbird.nix
+    ../../modules/home-manager/todoman.nix
+    ../../modules/home-manager/vicinae.nix
+    ../../modules/home-manager/zathura.nix
 
     # Scripts
-    ../../home/scripts # All scripts
+    ../../modules/home-manager/scripts
 
     # System (Desktop environment like stuff)
-    ../../home/system/hyprland
-    #../../home/system/hyprlock
-    ../../home/system/hyprpanel
-    #../../home/system/ashell
-    ../../home/system/hyprpaper
-    ../../home/system/zathura
-    ../../home/system/mime
-    ../../home/system/udiskie
-    ../../home/system/vicinae
-    ../../home/system/wofi
-    # ../../home/system/hypridle
+    ../../modules/home-manager/hyprland
+    ../../modules/home-manager/hyprpanel.nix
+    ../../modules/home-manager/hyprpaper.nix
+    ../../modules/home-manager/mime.nix
+    ../../modules/home-manager/udiskie.nix
   ];
 
   home = {
@@ -108,9 +99,6 @@
       libreoffice-qt6-fresh
     ];
 
-    # Import my profile picture, used by the hyprpanel dashboard
-    #file.".face.icon" = {source = ./profile_picture.png;};
-
     # Don't touch this
     stateVersion = "24.05";
   };

hosts/polaris/variables.nix

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

modules/home-manager/scripts/default.nix

@@ -0,0 +1,15 @@
+{
+  imports = [
+    ./nixy.nix
+    ./sounds.nix
+    ./brightness.nix
+    ./caffeine.nix
+    ./hyprpanel.nix
+    ./hyprfocus.nix
+    ./night-shift.nix
+    ./screenshot.nix
+    ./nerdfont-fzf.nix
+    ./notification.nix
+    ./system.nix
+  ];
+}