From bc16b994a0b8570df4c2c4fd32ffa9bf3819c45b Mon Sep 17 00:00:00 2001 From: Armel van Ravels Date: Thu, 23 Jul 2026 17:55:54 +0200 Subject: [PATCH] Reorganize modules --- {systems => hosts}/balrog/default.nix | 30 +++--- .../balrog/hardware-configuration.nix | 0 {systems => hosts}/frodo/default.nix | 10 +- .../frodo/hardware-configuration.nix | 0 {systems => hosts}/gandalf/default.nix | 56 +++++----- .../gandalf/hardware-configuration.nix | 0 {systems => hosts}/gandalf/mtp-fix.nix | 0 {systems => hosts}/legolas/default.nix | 12 +-- .../legolas/hardware-configuration.nix | 0 {systems => hosts}/work/default.nix | 48 ++++----- .../work/hardware-configuration.nix | 0 {systems/modules => modules}/arduino-ide.nix | 0 {systems/modules => modules}/audacity.nix | 0 .../modules => modules}/azure-data-studio.nix | 0 .../bambu-studio-flatpak.nix | 0 {systems/modules => modules}/bitwarden.nix | 0 {systems/modules => modules}/btop.nix | 0 {systems/modules => modules}/common.nix | 0 {systems/modules => modules}/devenv.nix | 0 {systems/modules => modules}/discord.nix | 0 {systems/modules => modules}/docker.nix | 0 {systems/modules => modules}/enova.nix | 0 {systems/modules => modules}/filezilla.nix | 0 {systems/modules => modules}/gaming.nix | 0 .../garbage-collection.nix | 0 {systems/modules => modules}/gimp.nix | 0 {systems/modules => modules}/home-manager.nix | 0 .../home/backgrounds/bird.jpg | Bin .../home/backgrounds/catppucin.png | Bin .../home/backgrounds/monkey.jpg | Bin .../home/backgrounds/nix.png | Bin {systems/modules => modules}/home/home.nix | 0 .../modules => modules}/home/other/fonts.nix | 0 .../home/programs/bitwarden.nix | 0 .../home/programs/direnv.nix | 0 .../home/programs/direnv/direnvrc | 0 .../home/programs/fastfetch/config.jsonc | 0 .../home/programs/firefox.nix | 0 .../modules => modules}/home/programs/git.nix | 0 .../home/programs/kitty.nix | 0 .../home/programs/libreoffice.nix | 0 .../home/programs/nvim.nix | 0 .../home/programs/ripgrep.nix | 0 .../home/programs/tmux.nix | 0 .../home/programs/vscode.nix | 0 .../modules => modules}/home/programs/zsh.nix | 0 .../home/programs/zsh/functions/dex.zsh | 0 .../modules => modules}/home/wm/cursor.nix | 0 .../modules => modules}/home/wm/dconf.nix | 0 {systems/modules => modules}/home/wm/gtk.nix | 0 .../modules => modules}/home/wm/hyprland.nix | 0 .../modules => modules}/home/wm/hyprpaper.nix | 0 {systems/modules => modules}/home/wm/rofi.nix | 0 .../home/wm/scripts/toggle-recorder.nix | 0 .../modules => modules}/home/wm/waybar.nix | 0 .../home/wm/waybar/waybar-style.css | 0 {systems/modules => modules}/jq.nix | 0 {systems/modules => modules}/kdenlive.nix | 0 {systems/modules => modules}/lazygit.nix | 0 {systems/modules => modules}/locales.nix | 0 {systems/modules => modules}/matrix.nix | 0 {systems/modules => modules}/obs-studio.nix | 0 {systems/modules => modules}/ollama.nix | 0 {systems/modules => modules}/openscad.nix | 0 {systems/modules => modules}/postman.nix | 0 {systems/modules => modules}/printing.nix | 0 {systems/modules => modules}/programs.nix | 0 {systems/modules => modules}/qbittorrent.nix | 0 {systems/modules => modules}/remmina.nix | 0 {systems/modules => modules}/services.nix | 0 .../modules => modules}/teams-for-linux.nix | 0 {systems/modules => modules}/users.nix | 0 {systems/modules => modules}/vlc.nix | 0 {systems/modules => modules}/wireguard.nix | 0 {systems/modules => modules}/yazi.nix | 0 outputs.nix | 96 ++++++------------ 76 files changed, 107 insertions(+), 145 deletions(-) rename {systems => hosts}/balrog/default.nix (75%) rename {systems => hosts}/balrog/hardware-configuration.nix (100%) rename {systems => hosts}/frodo/default.nix (79%) rename {systems => hosts}/frodo/hardware-configuration.nix (100%) rename {systems => hosts}/gandalf/default.nix (55%) rename {systems => hosts}/gandalf/hardware-configuration.nix (100%) rename {systems => hosts}/gandalf/mtp-fix.nix (100%) rename {systems => hosts}/legolas/default.nix (77%) rename {systems => hosts}/legolas/hardware-configuration.nix (100%) rename {systems => hosts}/work/default.nix (68%) rename {systems => hosts}/work/hardware-configuration.nix (100%) rename {systems/modules => modules}/arduino-ide.nix (100%) rename {systems/modules => modules}/audacity.nix (100%) rename {systems/modules => modules}/azure-data-studio.nix (100%) rename {systems/modules => modules}/bambu-studio-flatpak.nix (100%) rename {systems/modules => modules}/bitwarden.nix (100%) rename {systems/modules => modules}/btop.nix (100%) rename {systems/modules => modules}/common.nix (100%) rename {systems/modules => modules}/devenv.nix (100%) rename {systems/modules => modules}/discord.nix (100%) rename {systems/modules => modules}/docker.nix (100%) rename {systems/modules => modules}/enova.nix (100%) rename {systems/modules => modules}/filezilla.nix (100%) rename {systems/modules => modules}/gaming.nix (100%) rename {systems/modules => modules}/garbage-collection.nix (100%) rename {systems/modules => modules}/gimp.nix (100%) rename {systems/modules => modules}/home-manager.nix (100%) rename {systems/modules => modules}/home/backgrounds/bird.jpg (100%) rename {systems/modules => modules}/home/backgrounds/catppucin.png (100%) rename {systems/modules => modules}/home/backgrounds/monkey.jpg (100%) rename {systems/modules => modules}/home/backgrounds/nix.png (100%) rename {systems/modules => modules}/home/home.nix (100%) rename {systems/modules => modules}/home/other/fonts.nix (100%) rename {systems/modules => modules}/home/programs/bitwarden.nix (100%) rename {systems/modules => modules}/home/programs/direnv.nix (100%) rename {systems/modules => modules}/home/programs/direnv/direnvrc (100%) rename {systems/modules => modules}/home/programs/fastfetch/config.jsonc (100%) rename {systems/modules => modules}/home/programs/firefox.nix (100%) rename {systems/modules => modules}/home/programs/git.nix (100%) rename {systems/modules => modules}/home/programs/kitty.nix (100%) rename {systems/modules => modules}/home/programs/libreoffice.nix (100%) rename {systems/modules => modules}/home/programs/nvim.nix (100%) rename {systems/modules => modules}/home/programs/ripgrep.nix (100%) rename {systems/modules => modules}/home/programs/tmux.nix (100%) rename {systems/modules => modules}/home/programs/vscode.nix (100%) rename {systems/modules => modules}/home/programs/zsh.nix (100%) rename {systems/modules => modules}/home/programs/zsh/functions/dex.zsh (100%) rename {systems/modules => modules}/home/wm/cursor.nix (100%) rename {systems/modules => modules}/home/wm/dconf.nix (100%) rename {systems/modules => modules}/home/wm/gtk.nix (100%) rename {systems/modules => modules}/home/wm/hyprland.nix (100%) rename {systems/modules => modules}/home/wm/hyprpaper.nix (100%) rename {systems/modules => modules}/home/wm/rofi.nix (100%) rename {systems/modules => modules}/home/wm/scripts/toggle-recorder.nix (100%) rename {systems/modules => modules}/home/wm/waybar.nix (100%) rename {systems/modules => modules}/home/wm/waybar/waybar-style.css (100%) rename {systems/modules => modules}/jq.nix (100%) rename {systems/modules => modules}/kdenlive.nix (100%) rename {systems/modules => modules}/lazygit.nix (100%) rename {systems/modules => modules}/locales.nix (100%) rename {systems/modules => modules}/matrix.nix (100%) rename {systems/modules => modules}/obs-studio.nix (100%) rename {systems/modules => modules}/ollama.nix (100%) rename {systems/modules => modules}/openscad.nix (100%) rename {systems/modules => modules}/postman.nix (100%) rename {systems/modules => modules}/printing.nix (100%) rename {systems/modules => modules}/programs.nix (100%) rename {systems/modules => modules}/qbittorrent.nix (100%) rename {systems/modules => modules}/remmina.nix (100%) rename {systems/modules => modules}/services.nix (100%) rename {systems/modules => modules}/teams-for-linux.nix (100%) rename {systems/modules => modules}/users.nix (100%) rename {systems/modules => modules}/vlc.nix (100%) rename {systems/modules => modules}/wireguard.nix (100%) rename {systems/modules => modules}/yazi.nix (100%) diff --git a/systems/balrog/default.nix b/hosts/balrog/default.nix similarity index 75% rename from systems/balrog/default.nix rename to hosts/balrog/default.nix index 81a8c89..94df9a3 100644 --- a/systems/balrog/default.nix +++ b/hosts/balrog/default.nix @@ -12,21 +12,21 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../modules/home-manager.nix - ../modules/common.nix - ../modules/users.nix - ../modules/locales.nix - ../modules/services.nix - ../modules/programs.nix - ../modules/docker.nix - ../modules/printing.nix - ../modules/bambu-studio-flatpak.nix - ../modules/arduino-ide.nix - ../modules/devenv.nix - ../modules/vlc.nix - ../modules/btop.nix - ../modules/lazygit.nix - # ../modules/bitwarden.nix + ../../modules/home-manager.nix + ../../modules/common.nix + ../../modules/users.nix + ../../modules/locales.nix + ../../modules/services.nix + ../../modules/programs.nix + ../../modules/docker.nix + ../../modules/printing.nix + ../../modules/bambu-studio-flatpak.nix + ../../modules/arduino-ide.nix + ../../modules/devenv.nix + ../../modules/vlc.nix + ../../modules/btop.nix + ../../modules/lazygit.nix + # ../../modules/bitwarden.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/systems/balrog/hardware-configuration.nix b/hosts/balrog/hardware-configuration.nix similarity index 100% rename from systems/balrog/hardware-configuration.nix rename to hosts/balrog/hardware-configuration.nix diff --git a/systems/frodo/default.nix b/hosts/frodo/default.nix similarity index 79% rename from systems/frodo/default.nix rename to hosts/frodo/default.nix index 26b7a6d..a1d1ed2 100644 --- a/systems/frodo/default.nix +++ b/hosts/frodo/default.nix @@ -8,11 +8,11 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../modules/common.nix - ../modules/users.nix - ../modules/locales.nix - ../modules/services.nix - ../modules/programs.nix + ../../modules/common.nix + ../../modules/users.nix + ../../modules/locales.nix + ../../modules/services.nix + ../../modules/programs.nix ]; # Bootloader. diff --git a/systems/frodo/hardware-configuration.nix b/hosts/frodo/hardware-configuration.nix similarity index 100% rename from systems/frodo/hardware-configuration.nix rename to hosts/frodo/hardware-configuration.nix diff --git a/systems/gandalf/default.nix b/hosts/gandalf/default.nix similarity index 55% rename from systems/gandalf/default.nix rename to hosts/gandalf/default.nix index d5f77e5..841ed46 100644 --- a/systems/gandalf/default.nix +++ b/hosts/gandalf/default.nix @@ -3,34 +3,34 @@ { imports = [ ./hardware-configuration.nix - ../modules/home-manager.nix - ../modules/common.nix - ../modules/users.nix - ../modules/locales.nix - ../modules/services.nix - ../modules/programs.nix - ../modules/gaming.nix - ../modules/obs-studio.nix - ../modules/garbage-collection.nix - ../modules/printing.nix - ../modules/docker.nix - ../modules/matrix.nix - ../modules/kdenlive.nix - ../modules/audacity.nix - ../modules/ollama.nix - ../modules/wireguard.nix - ../modules/qbittorrent.nix - ../modules/gimp.nix - ../modules/openscad.nix - ../modules/bambu-studio-flatpak.nix - ../modules/arduino-ide.nix - ../modules/bitwarden.nix - ../modules/vlc.nix - ../modules/devenv.nix - ../modules/btop.nix - ../modules/discord.nix - ../modules/lazygit.nix - ../modules/yazi.nix + ../../modules/home-manager.nix + ../../modules/common.nix + ../../modules/users.nix + ../../modules/locales.nix + ../../modules/services.nix + ../../modules/programs.nix + ../../modules/gaming.nix + ../../modules/obs-studio.nix + ../../modules/garbage-collection.nix + ../../modules/printing.nix + ../../modules/docker.nix + ../../modules/matrix.nix + ../../modules/kdenlive.nix + ../../modules/audacity.nix + ../../modules/ollama.nix + ../../modules/wireguard.nix + ../../modules/qbittorrent.nix + ../../modules/gimp.nix + ../../modules/openscad.nix + ../../modules/bambu-studio-flatpak.nix + ../../modules/arduino-ide.nix + ../../modules/bitwarden.nix + ../../modules/vlc.nix + ../../modules/devenv.nix + ../../modules/btop.nix + ../../modules/discord.nix + ../../modules/lazygit.nix + ../../modules/yazi.nix ./mtp-fix.nix ]; diff --git a/systems/gandalf/hardware-configuration.nix b/hosts/gandalf/hardware-configuration.nix similarity index 100% rename from systems/gandalf/hardware-configuration.nix rename to hosts/gandalf/hardware-configuration.nix diff --git a/systems/gandalf/mtp-fix.nix b/hosts/gandalf/mtp-fix.nix similarity index 100% rename from systems/gandalf/mtp-fix.nix rename to hosts/gandalf/mtp-fix.nix diff --git a/systems/legolas/default.nix b/hosts/legolas/default.nix similarity index 77% rename from systems/legolas/default.nix rename to hosts/legolas/default.nix index 4e25cd0..ba5b7b0 100644 --- a/systems/legolas/default.nix +++ b/hosts/legolas/default.nix @@ -3,12 +3,12 @@ { imports = [ ./hardware-configuration.nix - ../modules/common.nix - ../modules/users.nix - ../modules/locales.nix - ../modules/services.nix - ../modules/programs.nix - ../modules/gaming.nix + ../../modules/common.nix + ../../modules/users.nix + ../../modules/locales.nix + ../../modules/services.nix + ../../modules/programs.nix + ../../modules/gaming.nix ]; boot.loader.systemd-boot.enable = true; diff --git a/systems/legolas/hardware-configuration.nix b/hosts/legolas/hardware-configuration.nix similarity index 100% rename from systems/legolas/hardware-configuration.nix rename to hosts/legolas/hardware-configuration.nix diff --git a/systems/work/default.nix b/hosts/work/default.nix similarity index 68% rename from systems/work/default.nix rename to hosts/work/default.nix index f5dde83..ac3b865 100644 --- a/systems/work/default.nix +++ b/hosts/work/default.nix @@ -3,30 +3,30 @@ { imports = [ ./hardware-configuration.nix - ../modules/home-manager.nix - ../modules/common.nix - ../modules/users.nix - ../modules/locales.nix - ../modules/services.nix - ../modules/programs.nix - ../modules/garbage-collection.nix - ../modules/printing.nix - ../modules/docker.nix - ../modules/teams-for-linux.nix - ../modules/azure-data-studio.nix - ../modules/filezilla.nix - ../modules/wireguard.nix - ../modules/remmina.nix - ../modules/postman.nix - ../modules/gimp.nix - ../modules/jq.nix - ../modules/enova.nix - ../modules/devenv.nix - ../modules/bitwarden.nix - ../modules/btop.nix - ../modules/vlc.nix - ../modules/lazygit.nix - ../modules/yazi.nix + ../../modules/home-manager.nix + ../../modules/common.nix + ../../modules/users.nix + ../../modules/locales.nix + ../../modules/services.nix + ../../modules/programs.nix + ../../modules/garbage-collection.nix + ../../modules/printing.nix + ../../modules/docker.nix + ../../modules/teams-for-linux.nix + ../../modules/azure-data-studio.nix + ../../modules/filezilla.nix + ../../modules/wireguard.nix + ../../modules/remmina.nix + ../../modules/postman.nix + ../../modules/gimp.nix + ../../modules/jq.nix + ../../modules/enova.nix + ../../modules/devenv.nix + ../../modules/bitwarden.nix + ../../modules/btop.nix + ../../modules/vlc.nix + ../../modules/lazygit.nix + ../../modules/yazi.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/systems/work/hardware-configuration.nix b/hosts/work/hardware-configuration.nix similarity index 100% rename from systems/work/hardware-configuration.nix rename to hosts/work/hardware-configuration.nix diff --git a/systems/modules/arduino-ide.nix b/modules/arduino-ide.nix similarity index 100% rename from systems/modules/arduino-ide.nix rename to modules/arduino-ide.nix diff --git a/systems/modules/audacity.nix b/modules/audacity.nix similarity index 100% rename from systems/modules/audacity.nix rename to modules/audacity.nix diff --git a/systems/modules/azure-data-studio.nix b/modules/azure-data-studio.nix similarity index 100% rename from systems/modules/azure-data-studio.nix rename to modules/azure-data-studio.nix diff --git a/systems/modules/bambu-studio-flatpak.nix b/modules/bambu-studio-flatpak.nix similarity index 100% rename from systems/modules/bambu-studio-flatpak.nix rename to modules/bambu-studio-flatpak.nix diff --git a/systems/modules/bitwarden.nix b/modules/bitwarden.nix similarity index 100% rename from systems/modules/bitwarden.nix rename to modules/bitwarden.nix diff --git a/systems/modules/btop.nix b/modules/btop.nix similarity index 100% rename from systems/modules/btop.nix rename to modules/btop.nix diff --git a/systems/modules/common.nix b/modules/common.nix similarity index 100% rename from systems/modules/common.nix rename to modules/common.nix diff --git a/systems/modules/devenv.nix b/modules/devenv.nix similarity index 100% rename from systems/modules/devenv.nix rename to modules/devenv.nix diff --git a/systems/modules/discord.nix b/modules/discord.nix similarity index 100% rename from systems/modules/discord.nix rename to modules/discord.nix diff --git a/systems/modules/docker.nix b/modules/docker.nix similarity index 100% rename from systems/modules/docker.nix rename to modules/docker.nix diff --git a/systems/modules/enova.nix b/modules/enova.nix similarity index 100% rename from systems/modules/enova.nix rename to modules/enova.nix diff --git a/systems/modules/filezilla.nix b/modules/filezilla.nix similarity index 100% rename from systems/modules/filezilla.nix rename to modules/filezilla.nix diff --git a/systems/modules/gaming.nix b/modules/gaming.nix similarity index 100% rename from systems/modules/gaming.nix rename to modules/gaming.nix diff --git a/systems/modules/garbage-collection.nix b/modules/garbage-collection.nix similarity index 100% rename from systems/modules/garbage-collection.nix rename to modules/garbage-collection.nix diff --git a/systems/modules/gimp.nix b/modules/gimp.nix similarity index 100% rename from systems/modules/gimp.nix rename to modules/gimp.nix diff --git a/systems/modules/home-manager.nix b/modules/home-manager.nix similarity index 100% rename from systems/modules/home-manager.nix rename to modules/home-manager.nix diff --git a/systems/modules/home/backgrounds/bird.jpg b/modules/home/backgrounds/bird.jpg similarity index 100% rename from systems/modules/home/backgrounds/bird.jpg rename to modules/home/backgrounds/bird.jpg diff --git a/systems/modules/home/backgrounds/catppucin.png b/modules/home/backgrounds/catppucin.png similarity index 100% rename from systems/modules/home/backgrounds/catppucin.png rename to modules/home/backgrounds/catppucin.png diff --git a/systems/modules/home/backgrounds/monkey.jpg b/modules/home/backgrounds/monkey.jpg similarity index 100% rename from systems/modules/home/backgrounds/monkey.jpg rename to modules/home/backgrounds/monkey.jpg diff --git a/systems/modules/home/backgrounds/nix.png b/modules/home/backgrounds/nix.png similarity index 100% rename from systems/modules/home/backgrounds/nix.png rename to modules/home/backgrounds/nix.png diff --git a/systems/modules/home/home.nix b/modules/home/home.nix similarity index 100% rename from systems/modules/home/home.nix rename to modules/home/home.nix diff --git a/systems/modules/home/other/fonts.nix b/modules/home/other/fonts.nix similarity index 100% rename from systems/modules/home/other/fonts.nix rename to modules/home/other/fonts.nix diff --git a/systems/modules/home/programs/bitwarden.nix b/modules/home/programs/bitwarden.nix similarity index 100% rename from systems/modules/home/programs/bitwarden.nix rename to modules/home/programs/bitwarden.nix diff --git a/systems/modules/home/programs/direnv.nix b/modules/home/programs/direnv.nix similarity index 100% rename from systems/modules/home/programs/direnv.nix rename to modules/home/programs/direnv.nix diff --git a/systems/modules/home/programs/direnv/direnvrc b/modules/home/programs/direnv/direnvrc similarity index 100% rename from systems/modules/home/programs/direnv/direnvrc rename to modules/home/programs/direnv/direnvrc diff --git a/systems/modules/home/programs/fastfetch/config.jsonc b/modules/home/programs/fastfetch/config.jsonc similarity index 100% rename from systems/modules/home/programs/fastfetch/config.jsonc rename to modules/home/programs/fastfetch/config.jsonc diff --git a/systems/modules/home/programs/firefox.nix b/modules/home/programs/firefox.nix similarity index 100% rename from systems/modules/home/programs/firefox.nix rename to modules/home/programs/firefox.nix diff --git a/systems/modules/home/programs/git.nix b/modules/home/programs/git.nix similarity index 100% rename from systems/modules/home/programs/git.nix rename to modules/home/programs/git.nix diff --git a/systems/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix similarity index 100% rename from systems/modules/home/programs/kitty.nix rename to modules/home/programs/kitty.nix diff --git a/systems/modules/home/programs/libreoffice.nix b/modules/home/programs/libreoffice.nix similarity index 100% rename from systems/modules/home/programs/libreoffice.nix rename to modules/home/programs/libreoffice.nix diff --git a/systems/modules/home/programs/nvim.nix b/modules/home/programs/nvim.nix similarity index 100% rename from systems/modules/home/programs/nvim.nix rename to modules/home/programs/nvim.nix diff --git a/systems/modules/home/programs/ripgrep.nix b/modules/home/programs/ripgrep.nix similarity index 100% rename from systems/modules/home/programs/ripgrep.nix rename to modules/home/programs/ripgrep.nix diff --git a/systems/modules/home/programs/tmux.nix b/modules/home/programs/tmux.nix similarity index 100% rename from systems/modules/home/programs/tmux.nix rename to modules/home/programs/tmux.nix diff --git a/systems/modules/home/programs/vscode.nix b/modules/home/programs/vscode.nix similarity index 100% rename from systems/modules/home/programs/vscode.nix rename to modules/home/programs/vscode.nix diff --git a/systems/modules/home/programs/zsh.nix b/modules/home/programs/zsh.nix similarity index 100% rename from systems/modules/home/programs/zsh.nix rename to modules/home/programs/zsh.nix diff --git a/systems/modules/home/programs/zsh/functions/dex.zsh b/modules/home/programs/zsh/functions/dex.zsh similarity index 100% rename from systems/modules/home/programs/zsh/functions/dex.zsh rename to modules/home/programs/zsh/functions/dex.zsh diff --git a/systems/modules/home/wm/cursor.nix b/modules/home/wm/cursor.nix similarity index 100% rename from systems/modules/home/wm/cursor.nix rename to modules/home/wm/cursor.nix diff --git a/systems/modules/home/wm/dconf.nix b/modules/home/wm/dconf.nix similarity index 100% rename from systems/modules/home/wm/dconf.nix rename to modules/home/wm/dconf.nix diff --git a/systems/modules/home/wm/gtk.nix b/modules/home/wm/gtk.nix similarity index 100% rename from systems/modules/home/wm/gtk.nix rename to modules/home/wm/gtk.nix diff --git a/systems/modules/home/wm/hyprland.nix b/modules/home/wm/hyprland.nix similarity index 100% rename from systems/modules/home/wm/hyprland.nix rename to modules/home/wm/hyprland.nix diff --git a/systems/modules/home/wm/hyprpaper.nix b/modules/home/wm/hyprpaper.nix similarity index 100% rename from systems/modules/home/wm/hyprpaper.nix rename to modules/home/wm/hyprpaper.nix diff --git a/systems/modules/home/wm/rofi.nix b/modules/home/wm/rofi.nix similarity index 100% rename from systems/modules/home/wm/rofi.nix rename to modules/home/wm/rofi.nix diff --git a/systems/modules/home/wm/scripts/toggle-recorder.nix b/modules/home/wm/scripts/toggle-recorder.nix similarity index 100% rename from systems/modules/home/wm/scripts/toggle-recorder.nix rename to modules/home/wm/scripts/toggle-recorder.nix diff --git a/systems/modules/home/wm/waybar.nix b/modules/home/wm/waybar.nix similarity index 100% rename from systems/modules/home/wm/waybar.nix rename to modules/home/wm/waybar.nix diff --git a/systems/modules/home/wm/waybar/waybar-style.css b/modules/home/wm/waybar/waybar-style.css similarity index 100% rename from systems/modules/home/wm/waybar/waybar-style.css rename to modules/home/wm/waybar/waybar-style.css diff --git a/systems/modules/jq.nix b/modules/jq.nix similarity index 100% rename from systems/modules/jq.nix rename to modules/jq.nix diff --git a/systems/modules/kdenlive.nix b/modules/kdenlive.nix similarity index 100% rename from systems/modules/kdenlive.nix rename to modules/kdenlive.nix diff --git a/systems/modules/lazygit.nix b/modules/lazygit.nix similarity index 100% rename from systems/modules/lazygit.nix rename to modules/lazygit.nix diff --git a/systems/modules/locales.nix b/modules/locales.nix similarity index 100% rename from systems/modules/locales.nix rename to modules/locales.nix diff --git a/systems/modules/matrix.nix b/modules/matrix.nix similarity index 100% rename from systems/modules/matrix.nix rename to modules/matrix.nix diff --git a/systems/modules/obs-studio.nix b/modules/obs-studio.nix similarity index 100% rename from systems/modules/obs-studio.nix rename to modules/obs-studio.nix diff --git a/systems/modules/ollama.nix b/modules/ollama.nix similarity index 100% rename from systems/modules/ollama.nix rename to modules/ollama.nix diff --git a/systems/modules/openscad.nix b/modules/openscad.nix similarity index 100% rename from systems/modules/openscad.nix rename to modules/openscad.nix diff --git a/systems/modules/postman.nix b/modules/postman.nix similarity index 100% rename from systems/modules/postman.nix rename to modules/postman.nix diff --git a/systems/modules/printing.nix b/modules/printing.nix similarity index 100% rename from systems/modules/printing.nix rename to modules/printing.nix diff --git a/systems/modules/programs.nix b/modules/programs.nix similarity index 100% rename from systems/modules/programs.nix rename to modules/programs.nix diff --git a/systems/modules/qbittorrent.nix b/modules/qbittorrent.nix similarity index 100% rename from systems/modules/qbittorrent.nix rename to modules/qbittorrent.nix diff --git a/systems/modules/remmina.nix b/modules/remmina.nix similarity index 100% rename from systems/modules/remmina.nix rename to modules/remmina.nix diff --git a/systems/modules/services.nix b/modules/services.nix similarity index 100% rename from systems/modules/services.nix rename to modules/services.nix diff --git a/systems/modules/teams-for-linux.nix b/modules/teams-for-linux.nix similarity index 100% rename from systems/modules/teams-for-linux.nix rename to modules/teams-for-linux.nix diff --git a/systems/modules/users.nix b/modules/users.nix similarity index 100% rename from systems/modules/users.nix rename to modules/users.nix diff --git a/systems/modules/vlc.nix b/modules/vlc.nix similarity index 100% rename from systems/modules/vlc.nix rename to modules/vlc.nix diff --git a/systems/modules/wireguard.nix b/modules/wireguard.nix similarity index 100% rename from systems/modules/wireguard.nix rename to modules/wireguard.nix diff --git a/systems/modules/yazi.nix b/modules/yazi.nix similarity index 100% rename from systems/modules/yazi.nix rename to modules/yazi.nix diff --git a/outputs.nix b/outputs.nix index 8c382c1..fe399d6 100644 --- a/outputs.nix +++ b/outputs.nix @@ -6,75 +6,37 @@ }: let - mkPkgsUnstable = - system: - import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; -in + system = "x86_64-linux"; + pkgsUnstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + + mkHost = + name: + nixpkgs.lib.nixosSystem { + inherit system; + + specialArgs = { + inherit pkgsUnstable; + nixFlatpak = nix-flatpak; + }; + + modules = [ + nix-flatpak.nixosModules.nix-flatpak + home-manager.nixosModules.home-manager + ./hosts/${name} + ]; + }; + +in { nixosConfigurations = { - "gandalf" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - pkgsUnstable = mkPkgsUnstable "x86_64-linux"; - nixFlatpak = nix-flatpak; - }; - modules = [ - nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - ./systems/gandalf - ]; - }; - "frodo" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - pkgsUnstable = mkPkgsUnstable "x86_64-linux"; - nixFlatpak = nix-flatpak; - }; - modules = [ - nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - ./systems/frodo - ]; - }; - "legolas" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - pkgsUnstable = mkPkgsUnstable "x86_64-linux"; - nixFlatpak = nix-flatpak; - }; - modules = [ - nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - ./systems/legolas - ]; - }; - "balrog" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - pkgsUnstable = mkPkgsUnstable "x86_64-linux"; - nixFlatpak = nix-flatpak; - }; - modules = [ - nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - ./systems/balrog - ]; - }; - "work" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - pkgsUnstable = mkPkgsUnstable "x86_64-linux"; - nixFlatpak = nix-flatpak; - }; - modules = [ - nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - ./systems/work - ]; - }; + gandalf = mkHost "gandalf"; + frodo = mkHost "frodo"; + legolas = mkHost "legolas"; + balrog = mkHost "balrog"; + work = mkHost "work"; }; }