diff --git a/home/scripts/default.nix b/home/scripts/default.nix deleted file mode 100644 index f8b36f7..0000000 --- a/home/scripts/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - imports = [ - ./nixy - ./sounds - ./brightness - ./caffeine - ./hyprpanel - ./hyprfocus - ./night-shift - ./screenshot - ./nerdfont-fzf - ./notification - ./system - ]; -} diff --git a/hosts/altair/configuration.nix b/hosts/altair/configuration.nix index 615b431..327168e 100644 --- a/hosts/altair/configuration.nix +++ b/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 diff --git a/hosts/altair/home.nix b/hosts/altair/home.nix index f7c15f0..05b8a4b 100644 --- a/hosts/altair/home.nix +++ b/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 = { diff --git a/hosts/altair/variables.nix b/hosts/altair/variables.nix index 5b08506..ac7570e 100644 --- a/hosts/altair/variables.nix +++ b/hosts/altair/variables.nix @@ -6,7 +6,7 @@ { imports = [ # Choose your theme here: - ../../themes/catppuccin.nix + ../../modules/themes/catppuccin.nix ]; config.var = { diff --git a/hosts/orion/configuration.nix b/hosts/orion/configuration.nix index 502a280..180f602 100644 --- a/hosts/orion/configuration.nix +++ b/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 diff --git a/hosts/orion/home.nix b/hosts/orion/home.nix index 637e1f0..936a6a5 100644 --- a/hosts/orion/home.nix +++ b/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 = { diff --git a/hosts/orion/variables.nix b/hosts/orion/variables.nix index 12ac6d7..92c70d3 100644 --- a/hosts/orion/variables.nix +++ b/hosts/orion/variables.nix @@ -6,7 +6,7 @@ { imports = [ # Choose your theme here: - ../../themes/catppuccin.nix + ../../modules/themes/catppuccin.nix ]; config.var = { diff --git a/hosts/polaris/configuration.nix b/hosts/polaris/configuration.nix index 57e06e5..b5efffd 100644 --- a/hosts/polaris/configuration.nix +++ b/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 diff --git a/hosts/polaris/home.nix b/hosts/polaris/home.nix index 958e5a4..18d284f 100644 --- a/hosts/polaris/home.nix +++ b/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"; }; diff --git a/hosts/polaris/variables.nix b/hosts/polaris/variables.nix index 6a0100a..e2977c7 100644 --- a/hosts/polaris/variables.nix +++ b/hosts/polaris/variables.nix @@ -6,7 +6,7 @@ { imports = [ # Choose your theme here: - ../../themes/catppuccin.nix + ../../modules/themes/catppuccin.nix ]; config.var = { diff --git a/home/programs/accounts/calendar.nix b/modules/home-manager/accounts/calendar.nix similarity index 100% rename from home/programs/accounts/calendar.nix rename to modules/home-manager/accounts/calendar.nix diff --git a/home/programs/accounts/default.nix b/modules/home-manager/accounts/default.nix similarity index 100% rename from home/programs/accounts/default.nix rename to modules/home-manager/accounts/default.nix diff --git a/home/programs/accounts/email.nix b/modules/home-manager/accounts/email.nix similarity index 100% rename from home/programs/accounts/email.nix rename to modules/home-manager/accounts/email.nix diff --git a/home/programs/aerc/default.nix b/modules/home-manager/aerc.nix similarity index 100% rename from home/programs/aerc/default.nix rename to modules/home-manager/aerc.nix diff --git a/home/programs/bitwarden/default.nix b/modules/home-manager/bitwarden.nix similarity index 100% rename from home/programs/bitwarden/default.nix rename to modules/home-manager/bitwarden.nix diff --git a/home/programs/direnv/default.nix b/modules/home-manager/direnv.nix similarity index 100% rename from home/programs/direnv/default.nix rename to modules/home-manager/direnv.nix diff --git a/home/programs/discord/default.nix b/modules/home-manager/discord.nix similarity index 100% rename from home/programs/discord/default.nix rename to modules/home-manager/discord.nix diff --git a/home/programs/ghostty/default.nix b/modules/home-manager/ghostty.nix similarity index 100% rename from home/programs/ghostty/default.nix rename to modules/home-manager/ghostty.nix diff --git a/home/programs/git/default.nix b/modules/home-manager/git.nix similarity index 100% rename from home/programs/git/default.nix rename to modules/home-manager/git.nix diff --git a/home/programs/gpg/default.nix b/modules/home-manager/gpg.nix similarity index 100% rename from home/programs/gpg/default.nix rename to modules/home-manager/gpg.nix diff --git a/home/system/hyprland/animations.nix b/modules/home-manager/hyprland/animations.nix similarity index 100% rename from home/system/hyprland/animations.nix rename to modules/home-manager/hyprland/animations.nix diff --git a/home/system/hyprland/bindings.nix b/modules/home-manager/hyprland/bindings.nix similarity index 100% rename from home/system/hyprland/bindings.nix rename to modules/home-manager/hyprland/bindings.nix diff --git a/home/system/hyprland/default.nix b/modules/home-manager/hyprland/default.nix similarity index 100% rename from home/system/hyprland/default.nix rename to modules/home-manager/hyprland/default.nix diff --git a/home/system/hyprland/polkitagent.nix b/modules/home-manager/hyprland/polkitagent.nix similarity index 100% rename from home/system/hyprland/polkitagent.nix rename to modules/home-manager/hyprland/polkitagent.nix diff --git a/home/system/hyprpanel/default.nix b/modules/home-manager/hyprpanel.nix similarity index 100% rename from home/system/hyprpanel/default.nix rename to modules/home-manager/hyprpanel.nix diff --git a/home/system/hyprpaper/default.nix b/modules/home-manager/hyprpaper.nix similarity index 100% rename from home/system/hyprpaper/default.nix rename to modules/home-manager/hyprpaper.nix diff --git a/home/system/hyprsunset/default.nix b/modules/home-manager/hyprsunset.nix similarity index 100% rename from home/system/hyprsunset/default.nix rename to modules/home-manager/hyprsunset.nix diff --git a/home/programs/khal/default.nix b/modules/home-manager/khal.nix similarity index 100% rename from home/programs/khal/default.nix rename to modules/home-manager/khal.nix diff --git a/home/programs/kitty/default.nix b/modules/home-manager/kitty.nix similarity index 100% rename from home/programs/kitty/default.nix rename to modules/home-manager/kitty.nix diff --git a/home/programs/lazygit/default.nix b/modules/home-manager/lazygit.nix similarity index 100% rename from home/programs/lazygit/default.nix rename to modules/home-manager/lazygit.nix diff --git a/home/system/mime/default.nix b/modules/home-manager/mime.nix similarity index 100% rename from home/system/mime/default.nix rename to modules/home-manager/mime.nix diff --git a/home/programs/nh/default.nix b/modules/home-manager/nh.nix similarity index 100% rename from home/programs/nh/default.nix rename to modules/home-manager/nh.nix diff --git a/home/programs/nixCats/.stylua.toml b/modules/home-manager/nixCats/.stylua.toml similarity index 100% rename from home/programs/nixCats/.stylua.toml rename to modules/home-manager/nixCats/.stylua.toml diff --git a/home/programs/nixCats/default.nix b/modules/home-manager/nixCats/default.nix similarity index 100% rename from home/programs/nixCats/default.nix rename to modules/home-manager/nixCats/default.nix diff --git a/home/programs/nixCats/init.lua b/modules/home-manager/nixCats/init.lua similarity index 100% rename from home/programs/nixCats/init.lua rename to modules/home-manager/nixCats/init.lua diff --git a/home/programs/nixCats/lua/options.lua b/modules/home-manager/nixCats/lua/options.lua similarity index 100% rename from home/programs/nixCats/lua/options.lua rename to modules/home-manager/nixCats/lua/options.lua diff --git a/home/programs/nixCats/lua/plugins/coding.lua b/modules/home-manager/nixCats/lua/plugins/coding.lua similarity index 100% rename from home/programs/nixCats/lua/plugins/coding.lua rename to modules/home-manager/nixCats/lua/plugins/coding.lua diff --git a/home/programs/nixCats/lua/plugins/editor.lua b/modules/home-manager/nixCats/lua/plugins/editor.lua similarity index 100% rename from home/programs/nixCats/lua/plugins/editor.lua rename to modules/home-manager/nixCats/lua/plugins/editor.lua diff --git a/home/programs/nixCats/lua/plugins/lsp.lua b/modules/home-manager/nixCats/lua/plugins/lsp.lua similarity index 100% rename from home/programs/nixCats/lua/plugins/lsp.lua rename to modules/home-manager/nixCats/lua/plugins/lsp.lua diff --git a/home/programs/nixCats/lua/plugins/ui.lua b/modules/home-manager/nixCats/lua/plugins/ui.lua similarity index 100% rename from home/programs/nixCats/lua/plugins/ui.lua rename to modules/home-manager/nixCats/lua/plugins/ui.lua diff --git a/home/programs/rclone/default.nix b/modules/home-manager/rclone.nix similarity index 100% rename from home/programs/rclone/default.nix rename to modules/home-manager/rclone.nix diff --git a/home/scripts/brightness/default.nix b/modules/home-manager/scripts/brightness.nix similarity index 100% rename from home/scripts/brightness/default.nix rename to modules/home-manager/scripts/brightness.nix diff --git a/home/scripts/caffeine/default.nix b/modules/home-manager/scripts/caffeine.nix similarity index 100% rename from home/scripts/caffeine/default.nix rename to modules/home-manager/scripts/caffeine.nix diff --git a/modules/home-manager/scripts/default.nix b/modules/home-manager/scripts/default.nix new file mode 100644 index 0000000..5a0ad7c --- /dev/null +++ b/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 + ]; +} diff --git a/home/scripts/hyprfocus/default.nix b/modules/home-manager/scripts/hyprfocus.nix similarity index 100% rename from home/scripts/hyprfocus/default.nix rename to modules/home-manager/scripts/hyprfocus.nix diff --git a/home/scripts/hyprpanel/default.nix b/modules/home-manager/scripts/hyprpanel.nix similarity index 100% rename from home/scripts/hyprpanel/default.nix rename to modules/home-manager/scripts/hyprpanel.nix diff --git a/home/scripts/nerdfont-fzf/default.nix b/modules/home-manager/scripts/nerdfont-fzf.nix similarity index 100% rename from home/scripts/nerdfont-fzf/default.nix rename to modules/home-manager/scripts/nerdfont-fzf.nix diff --git a/home/scripts/night-shift/default.nix b/modules/home-manager/scripts/night-shift.nix similarity index 100% rename from home/scripts/night-shift/default.nix rename to modules/home-manager/scripts/night-shift.nix diff --git a/home/scripts/nixy/default.nix b/modules/home-manager/scripts/nixy.nix similarity index 100% rename from home/scripts/nixy/default.nix rename to modules/home-manager/scripts/nixy.nix diff --git a/home/scripts/notification/default.nix b/modules/home-manager/scripts/notification.nix similarity index 100% rename from home/scripts/notification/default.nix rename to modules/home-manager/scripts/notification.nix diff --git a/home/scripts/screenshot/default.nix b/modules/home-manager/scripts/screenshot.nix similarity index 100% rename from home/scripts/screenshot/default.nix rename to modules/home-manager/scripts/screenshot.nix diff --git a/home/scripts/sounds/default.nix b/modules/home-manager/scripts/sounds.nix similarity index 100% rename from home/scripts/sounds/default.nix rename to modules/home-manager/scripts/sounds.nix diff --git a/home/scripts/system/default.nix b/modules/home-manager/scripts/system.nix similarity index 100% rename from home/scripts/system/default.nix rename to modules/home-manager/scripts/system.nix diff --git a/home/programs/shell/default.nix b/modules/home-manager/shell/default.nix similarity index 100% rename from home/programs/shell/default.nix rename to modules/home-manager/shell/default.nix diff --git a/home/programs/shell/eza.nix b/modules/home-manager/shell/eza.nix similarity index 100% rename from home/programs/shell/eza.nix rename to modules/home-manager/shell/eza.nix diff --git a/home/programs/shell/fzf.nix b/modules/home-manager/shell/fzf.nix similarity index 100% rename from home/programs/shell/fzf.nix rename to modules/home-manager/shell/fzf.nix diff --git a/home/programs/shell/starship.nix b/modules/home-manager/shell/starship.nix similarity index 100% rename from home/programs/shell/starship.nix rename to modules/home-manager/shell/starship.nix diff --git a/home/programs/shell/zoxide.nix b/modules/home-manager/shell/zoxide.nix similarity index 100% rename from home/programs/shell/zoxide.nix rename to modules/home-manager/shell/zoxide.nix diff --git a/home/programs/shell/zsh.nix b/modules/home-manager/shell/zsh.nix similarity index 100% rename from home/programs/shell/zsh.nix rename to modules/home-manager/shell/zsh.nix diff --git a/home/programs/spicetify/default.nix b/modules/home-manager/spicetify.nix similarity index 100% rename from home/programs/spicetify/default.nix rename to modules/home-manager/spicetify.nix diff --git a/home/programs/ssh/default.nix b/modules/home-manager/ssh.nix similarity index 100% rename from home/programs/ssh/default.nix rename to modules/home-manager/ssh.nix diff --git a/home/programs/thunar/default.nix b/modules/home-manager/thunar.nix similarity index 100% rename from home/programs/thunar/default.nix rename to modules/home-manager/thunar.nix diff --git a/home/programs/thunderbird/default.nix b/modules/home-manager/thunderbird.nix similarity index 100% rename from home/programs/thunderbird/default.nix rename to modules/home-manager/thunderbird.nix diff --git a/home/programs/todoman/default.nix b/modules/home-manager/todoman.nix similarity index 100% rename from home/programs/todoman/default.nix rename to modules/home-manager/todoman.nix diff --git a/home/system/udiskie/default.nix b/modules/home-manager/udiskie.nix similarity index 100% rename from home/system/udiskie/default.nix rename to modules/home-manager/udiskie.nix diff --git a/home/system/vicinae/default.nix b/modules/home-manager/vicinae.nix similarity index 100% rename from home/system/vicinae/default.nix rename to modules/home-manager/vicinae.nix diff --git a/home/system/wofi/default.nix b/modules/home-manager/wofi.nix similarity index 100% rename from home/system/wofi/default.nix rename to modules/home-manager/wofi.nix diff --git a/home/system/zathura/default.nix b/modules/home-manager/zathura.nix similarity index 100% rename from home/system/zathura/default.nix rename to modules/home-manager/zathura.nix diff --git a/server-modules/actual-budget.nix b/modules/nixos/actual-budget.nix similarity index 100% rename from server-modules/actual-budget.nix rename to modules/nixos/actual-budget.nix diff --git a/server-modules/adguardhome.nix b/modules/nixos/adguardhome.nix similarity index 100% rename from server-modules/adguardhome.nix rename to modules/nixos/adguardhome.nix diff --git a/server-modules/arr.nix b/modules/nixos/arr.nix similarity index 100% rename from server-modules/arr.nix rename to modules/nixos/arr.nix diff --git a/nixos/audio.nix b/modules/nixos/audio.nix similarity index 100% rename from nixos/audio.nix rename to modules/nixos/audio.nix diff --git a/server-modules/bitwarden.nix b/modules/nixos/bitwarden.nix similarity index 100% rename from server-modules/bitwarden.nix rename to modules/nixos/bitwarden.nix diff --git a/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix similarity index 100% rename from nixos/bluetooth.nix rename to modules/nixos/bluetooth.nix diff --git a/server-modules/caddy.nix b/modules/nixos/caddy.nix similarity index 100% rename from server-modules/caddy.nix rename to modules/nixos/caddy.nix diff --git a/server-modules/copyparty.nix b/modules/nixos/copyparty.nix similarity index 100% rename from server-modules/copyparty.nix rename to modules/nixos/copyparty.nix diff --git a/nixos/docker.nix b/modules/nixos/docker.nix similarity index 100% rename from nixos/docker.nix rename to modules/nixos/docker.nix diff --git a/server-modules/eleakxir.nix b/modules/nixos/eleakxir.nix similarity index 100% rename from server-modules/eleakxir.nix rename to modules/nixos/eleakxir.nix diff --git a/server-modules/firewall.nix b/modules/nixos/firewall.nix similarity index 100% rename from server-modules/firewall.nix rename to modules/nixos/firewall.nix diff --git a/nixos/fonts.nix b/modules/nixos/fonts.nix similarity index 100% rename from nixos/fonts.nix rename to modules/nixos/fonts.nix diff --git a/server-modules/gitea.nix b/modules/nixos/gitea.nix similarity index 100% rename from server-modules/gitea.nix rename to modules/nixos/gitea.nix diff --git a/server-modules/glance-nixy.nix b/modules/nixos/glance-nixy.nix similarity index 100% rename from server-modules/glance-nixy.nix rename to modules/nixos/glance-nixy.nix diff --git a/server-modules/glance.nix b/modules/nixos/glance.nix similarity index 100% rename from server-modules/glance.nix rename to modules/nixos/glance.nix diff --git a/server-modules/home-assistant.nix b/modules/nixos/home-assistant.nix similarity index 100% rename from server-modules/home-assistant.nix rename to modules/nixos/home-assistant.nix diff --git a/nixos/home-manager.nix b/modules/nixos/home-manager.nix similarity index 100% rename from nixos/home-manager.nix rename to modules/nixos/home-manager.nix diff --git a/nixos/hyprland.nix b/modules/nixos/hyprland.nix similarity index 100% rename from nixos/hyprland.nix rename to modules/nixos/hyprland.nix diff --git a/server-modules/mealie.nix b/modules/nixos/mealie.nix similarity index 100% rename from server-modules/mealie.nix rename to modules/nixos/mealie.nix diff --git a/server-modules/nginx.nix b/modules/nixos/nginx.nix similarity index 100% rename from server-modules/nginx.nix rename to modules/nixos/nginx.nix diff --git a/nixos/nix.nix b/modules/nixos/nix.nix similarity index 100% rename from nixos/nix.nix rename to modules/nixos/nix.nix diff --git a/nixos/omen.nix b/modules/nixos/omen.nix similarity index 100% rename from nixos/omen.nix rename to modules/nixos/omen.nix diff --git a/server-modules/radicale.nix b/modules/nixos/radicale.nix similarity index 100% rename from server-modules/radicale.nix rename to modules/nixos/radicale.nix diff --git a/nixos/sddm.nix b/modules/nixos/sddm.nix similarity index 100% rename from nixos/sddm.nix rename to modules/nixos/sddm.nix diff --git a/server-modules/ssh.nix b/modules/nixos/ssh.nix similarity index 100% rename from server-modules/ssh.nix rename to modules/nixos/ssh.nix diff --git a/nixos/systemd-boot.nix b/modules/nixos/systemd-boot.nix similarity index 100% rename from nixos/systemd-boot.nix rename to modules/nixos/systemd-boot.nix diff --git a/nixos/users.nix b/modules/nixos/users.nix similarity index 100% rename from nixos/users.nix rename to modules/nixos/users.nix diff --git a/nixos/utils.nix b/modules/nixos/utils.nix similarity index 100% rename from nixos/utils.nix rename to modules/nixos/utils.nix diff --git a/themes/catppuccin.nix b/modules/themes/catppuccin.nix similarity index 100% rename from themes/catppuccin.nix rename to modules/themes/catppuccin.nix