diff --git a/hosts/main-homelab/configuration.nix b/hosts/main-homelab/configuration.nix index 3a1c228..07f004b 100644 --- a/hosts/main-homelab/configuration.nix +++ b/hosts/main-homelab/configuration.nix @@ -9,7 +9,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../nixosModules/default.nix + ../../modules/nixos ]; settings = { diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix index 7e65712..b29f9ce 100644 --- a/hosts/main-laptop/configuration.nix +++ b/hosts/main-laptop/configuration.nix @@ -2,7 +2,7 @@ { imports = [ ./hardware-configuration.nix - ../../nixosModules/default.nix + ../../modules/nixos ]; qt.style = "adwaita"; diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix index 3f8b332..8c8bd70 100644 --- a/hosts/main-laptop/home.nix +++ b/hosts/main-laptop/home.nix @@ -6,7 +6,7 @@ }: { - imports = [ ../../homeManagerModules ]; + imports = [ ../../modules/home ]; settings = { development = { diff --git a/homeManagerModules/cliPrograms/fastfetch/config.jsonc b/modules/home/cliPrograms/fastfetch/config.jsonc similarity index 100% rename from homeManagerModules/cliPrograms/fastfetch/config.jsonc rename to modules/home/cliPrograms/fastfetch/config.jsonc diff --git a/homeManagerModules/cliPrograms/fastfetch/default.nix b/modules/home/cliPrograms/fastfetch/default.nix similarity index 100% rename from homeManagerModules/cliPrograms/fastfetch/default.nix rename to modules/home/cliPrograms/fastfetch/default.nix diff --git a/homeManagerModules/cliPrograms/git.nix b/modules/home/cliPrograms/git.nix similarity index 100% rename from homeManagerModules/cliPrograms/git.nix rename to modules/home/cliPrograms/git.nix diff --git a/homeManagerModules/cliPrograms/helix/config.toml b/modules/home/cliPrograms/helix/config.toml similarity index 100% rename from homeManagerModules/cliPrograms/helix/config.toml rename to modules/home/cliPrograms/helix/config.toml diff --git a/homeManagerModules/cliPrograms/helix/default.nix b/modules/home/cliPrograms/helix/default.nix similarity index 100% rename from homeManagerModules/cliPrograms/helix/default.nix rename to modules/home/cliPrograms/helix/default.nix diff --git a/homeManagerModules/cliPrograms/hyfetch.nix b/modules/home/cliPrograms/hyfetch.nix similarity index 100% rename from homeManagerModules/cliPrograms/hyfetch.nix rename to modules/home/cliPrograms/hyfetch.nix diff --git a/homeManagerModules/cliPrograms/neovim/default.nix b/modules/home/cliPrograms/neovim/default.nix similarity index 100% rename from homeManagerModules/cliPrograms/neovim/default.nix rename to modules/home/cliPrograms/neovim/default.nix diff --git a/homeManagerModules/cliPrograms/pass.nix b/modules/home/cliPrograms/pass.nix similarity index 100% rename from homeManagerModules/cliPrograms/pass.nix rename to modules/home/cliPrograms/pass.nix diff --git a/homeManagerModules/cliPrograms/starship/default.nix b/modules/home/cliPrograms/starship/default.nix similarity index 100% rename from homeManagerModules/cliPrograms/starship/default.nix rename to modules/home/cliPrograms/starship/default.nix diff --git a/homeManagerModules/cliPrograms/starship/starship.toml b/modules/home/cliPrograms/starship/starship.toml similarity index 100% rename from homeManagerModules/cliPrograms/starship/starship.toml rename to modules/home/cliPrograms/starship/starship.toml diff --git a/homeManagerModules/default.nix b/modules/home/default.nix similarity index 100% rename from homeManagerModules/default.nix rename to modules/home/default.nix diff --git a/homeManagerModules/desktopPrograms/amberol.nix b/modules/home/desktopPrograms/amberol.nix similarity index 100% rename from homeManagerModules/desktopPrograms/amberol.nix rename to modules/home/desktopPrograms/amberol.nix diff --git a/homeManagerModules/desktopPrograms/firefox.nix b/modules/home/desktopPrograms/firefox.nix similarity index 100% rename from homeManagerModules/desktopPrograms/firefox.nix rename to modules/home/desktopPrograms/firefox.nix diff --git a/homeManagerModules/desktopPrograms/vscodium/default.nix b/modules/home/desktopPrograms/vscodium/default.nix similarity index 100% rename from homeManagerModules/desktopPrograms/vscodium/default.nix rename to modules/home/desktopPrograms/vscodium/default.nix diff --git a/homeManagerModules/desktopPrograms/vscodium/settings.json b/modules/home/desktopPrograms/vscodium/settings.json similarity index 100% rename from homeManagerModules/desktopPrograms/vscodium/settings.json rename to modules/home/desktopPrograms/vscodium/settings.json diff --git a/homeManagerModules/desktopPrograms/wezterm/default.nix b/modules/home/desktopPrograms/wezterm/default.nix similarity index 100% rename from homeManagerModules/desktopPrograms/wezterm/default.nix rename to modules/home/desktopPrograms/wezterm/default.nix diff --git a/homeManagerModules/desktopPrograms/wezterm/wezterm.lua b/modules/home/desktopPrograms/wezterm/wezterm.lua similarity index 100% rename from homeManagerModules/desktopPrograms/wezterm/wezterm.lua rename to modules/home/desktopPrograms/wezterm/wezterm.lua diff --git a/homeManagerModules/desktopPrograms/zed/default.nix b/modules/home/desktopPrograms/zed/default.nix similarity index 100% rename from homeManagerModules/desktopPrograms/zed/default.nix rename to modules/home/desktopPrograms/zed/default.nix diff --git a/homeManagerModules/desktopPrograms/zed/settings.json b/modules/home/desktopPrograms/zed/settings.json similarity index 100% rename from homeManagerModules/desktopPrograms/zed/settings.json rename to modules/home/desktopPrograms/zed/settings.json diff --git a/homeManagerModules/development/bun.nix b/modules/home/development/bun.nix similarity index 100% rename from homeManagerModules/development/bun.nix rename to modules/home/development/bun.nix diff --git a/homeManagerModules/development/rust.nix b/modules/home/development/rust.nix similarity index 100% rename from homeManagerModules/development/rust.nix rename to modules/home/development/rust.nix diff --git a/homeManagerModules/niri/config.kdl b/modules/home/niri/config.kdl similarity index 100% rename from homeManagerModules/niri/config.kdl rename to modules/home/niri/config.kdl diff --git a/homeManagerModules/niri/mako.conf b/modules/home/niri/mako.conf similarity index 100% rename from homeManagerModules/niri/mako.conf rename to modules/home/niri/mako.conf diff --git a/homeManagerModules/niri/niri.nix b/modules/home/niri/niri.nix similarity index 100% rename from homeManagerModules/niri/niri.nix rename to modules/home/niri/niri.nix diff --git a/homeManagerModules/niri/swaylock.json b/modules/home/niri/swaylock.json similarity index 100% rename from homeManagerModules/niri/swaylock.json rename to modules/home/niri/swaylock.json diff --git a/homeManagerModules/niri/waybar.css b/modules/home/niri/waybar.css similarity index 100% rename from homeManagerModules/niri/waybar.css rename to modules/home/niri/waybar.css diff --git a/homeManagerModules/niri/waybar.json b/modules/home/niri/waybar.json similarity index 100% rename from homeManagerModules/niri/waybar.json rename to modules/home/niri/waybar.json diff --git a/homeManagerModules/shells/fish.nix b/modules/home/shells/fish.nix similarity index 100% rename from homeManagerModules/shells/fish.nix rename to modules/home/shells/fish.nix diff --git a/homeManagerModules/shells/zsh.nix b/modules/home/shells/zsh.nix similarity index 100% rename from homeManagerModules/shells/zsh.nix rename to modules/home/shells/zsh.nix diff --git a/nixosModules/default.nix b/modules/nixos/default.nix similarity index 100% rename from nixosModules/default.nix rename to modules/nixos/default.nix diff --git a/nixosModules/drivers/gpu/amd.nix b/modules/nixos/drivers/gpu/amd.nix similarity index 100% rename from nixosModules/drivers/gpu/amd.nix rename to modules/nixos/drivers/gpu/amd.nix diff --git a/nixosModules/drivers/gpu/disableNvidia.nix b/modules/nixos/drivers/gpu/disableNvidia.nix similarity index 100% rename from nixosModules/drivers/gpu/disableNvidia.nix rename to modules/nixos/drivers/gpu/disableNvidia.nix diff --git a/nixosModules/drivers/gpu/nvidia.nix b/modules/nixos/drivers/gpu/nvidia.nix similarity index 100% rename from nixosModules/drivers/gpu/nvidia.nix rename to modules/nixos/drivers/gpu/nvidia.nix diff --git a/nixosModules/drivers/ipod.nix b/modules/nixos/drivers/ipod.nix similarity index 100% rename from nixosModules/drivers/ipod.nix rename to modules/nixos/drivers/ipod.nix diff --git a/nixosModules/drivers/openrazer.nix b/modules/nixos/drivers/openrazer.nix similarity index 100% rename from nixosModules/drivers/openrazer.nix rename to modules/nixos/drivers/openrazer.nix diff --git a/nixosModules/drivers/samsung-printer.nix b/modules/nixos/drivers/samsung-printer.nix similarity index 100% rename from nixosModules/drivers/samsung-printer.nix rename to modules/nixos/drivers/samsung-printer.nix diff --git a/nixosModules/locale.nix b/modules/nixos/locale.nix similarity index 100% rename from nixosModules/locale.nix rename to modules/nixos/locale.nix diff --git a/nixosModules/programs/docker.nix b/modules/nixos/programs/docker.nix similarity index 100% rename from nixosModules/programs/docker.nix rename to modules/nixos/programs/docker.nix diff --git a/nixosModules/programs/gnupg.nix b/modules/nixos/programs/gnupg.nix similarity index 100% rename from nixosModules/programs/gnupg.nix rename to modules/nixos/programs/gnupg.nix diff --git a/nixosModules/programs/niri.nix b/modules/nixos/programs/niri.nix similarity index 100% rename from nixosModules/programs/niri.nix rename to modules/nixos/programs/niri.nix diff --git a/nixosModules/programs/powertop.nix b/modules/nixos/programs/powertop.nix similarity index 100% rename from nixosModules/programs/powertop.nix rename to modules/nixos/programs/powertop.nix diff --git a/nixosModules/programs/tailscale.nix b/modules/nixos/programs/tailscale.nix similarity index 100% rename from nixosModules/programs/tailscale.nix rename to modules/nixos/programs/tailscale.nix diff --git a/nixosModules/programs/tuigreet.nix b/modules/nixos/programs/tuigreet.nix similarity index 100% rename from nixosModules/programs/tuigreet.nix rename to modules/nixos/programs/tuigreet.nix diff --git a/nixosModules/services/fstrim.nix b/modules/nixos/services/fstrim.nix similarity index 100% rename from nixosModules/services/fstrim.nix rename to modules/nixos/services/fstrim.nix diff --git a/nixosModules/services/gnome.nix b/modules/nixos/services/gnome.nix similarity index 100% rename from nixosModules/services/gnome.nix rename to modules/nixos/services/gnome.nix diff --git a/nixosModules/services/openssh.nix b/modules/nixos/services/openssh.nix similarity index 100% rename from nixosModules/services/openssh.nix rename to modules/nixos/services/openssh.nix diff --git a/nixosModules/services/pam.nix b/modules/nixos/services/pam.nix similarity index 100% rename from nixosModules/services/pam.nix rename to modules/nixos/services/pam.nix diff --git a/nixosModules/services/pipewire.nix b/modules/nixos/services/pipewire.nix similarity index 100% rename from nixosModules/services/pipewire.nix rename to modules/nixos/services/pipewire.nix diff --git a/nixosModules/services/printing.nix b/modules/nixos/services/printing.nix similarity index 100% rename from nixosModules/services/printing.nix rename to modules/nixos/services/printing.nix diff --git a/nixosModules/services/switcheroo.nix b/modules/nixos/services/switcheroo.nix similarity index 100% rename from nixosModules/services/switcheroo.nix rename to modules/nixos/services/switcheroo.nix diff --git a/nixosModules/services/tlp.nix b/modules/nixos/services/tlp.nix similarity index 100% rename from nixosModules/services/tlp.nix rename to modules/nixos/services/tlp.nix diff --git a/nixosModules/users/fedfer.nix b/modules/nixos/users/fedfer.nix similarity index 100% rename from nixosModules/users/fedfer.nix rename to modules/nixos/users/fedfer.nix diff --git a/nixosModules/users/veneficium.nix b/modules/nixos/users/veneficium.nix similarity index 100% rename from nixosModules/users/veneficium.nix rename to modules/nixos/users/veneficium.nix