From 9af73f65f4998df3d5f11aada2495a77f6f5e67d Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Wed, 25 Sep 2024 08:35:08 +0200 Subject: [PATCH] modules: split into categories --- modules/default.nix | 12 ++++-------- modules/gui/default.nix | 6 ++++++ modules/{ => gui}/gnome.nix | 0 modules/{ => gui}/wezterm.nix | 0 modules/other/default.nix | 7 +++++++ modules/{ => other}/gaming.nix | 0 modules/{ => other}/nvidia.nix | 0 modules/{ => other}/stylix.nix | 2 +- modules/services/default.nix | 6 ++++++ modules/{ => services}/docker.nix | 0 modules/{ => services}/pipewire.nix | 0 modules/tui/default.nix | 5 +++++ modules/{ => tui}/neovim.nix | 0 13 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 modules/gui/default.nix rename modules/{ => gui}/gnome.nix (100%) rename modules/{ => gui}/wezterm.nix (100%) create mode 100644 modules/other/default.nix rename modules/{ => other}/gaming.nix (100%) rename modules/{ => other}/nvidia.nix (100%) rename modules/{ => other}/stylix.nix (92%) create mode 100644 modules/services/default.nix rename modules/{ => services}/docker.nix (100%) rename modules/{ => services}/pipewire.nix (100%) create mode 100644 modules/tui/default.nix rename modules/{ => tui}/neovim.nix (100%) diff --git a/modules/default.nix b/modules/default.nix index f3f6215..bd2cd6d 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,12 +1,8 @@ _: { imports = [ - ./docker.nix - ./pipewire.nix - ./nvidia.nix - ./gnome.nix - ./gaming.nix - ./wezterm.nix - ./stylix.nix - ./neovim.nix + ./gui + ./other + ./services + ./tui ]; } diff --git a/modules/gui/default.nix b/modules/gui/default.nix new file mode 100644 index 0000000..2950c16 --- /dev/null +++ b/modules/gui/default.nix @@ -0,0 +1,6 @@ +_: { + imports = [ + ./gnome.nix + ./wezterm.nix + ]; +} diff --git a/modules/gnome.nix b/modules/gui/gnome.nix similarity index 100% rename from modules/gnome.nix rename to modules/gui/gnome.nix diff --git a/modules/wezterm.nix b/modules/gui/wezterm.nix similarity index 100% rename from modules/wezterm.nix rename to modules/gui/wezterm.nix diff --git a/modules/other/default.nix b/modules/other/default.nix new file mode 100644 index 0000000..70b3346 --- /dev/null +++ b/modules/other/default.nix @@ -0,0 +1,7 @@ +_: { + imports = [ + ./gaming.nix + ./nvidia.nix + ./stylix.nix + ]; +} diff --git a/modules/gaming.nix b/modules/other/gaming.nix similarity index 100% rename from modules/gaming.nix rename to modules/other/gaming.nix diff --git a/modules/nvidia.nix b/modules/other/nvidia.nix similarity index 100% rename from modules/nvidia.nix rename to modules/other/nvidia.nix diff --git a/modules/stylix.nix b/modules/other/stylix.nix similarity index 92% rename from modules/stylix.nix rename to modules/other/stylix.nix index c8ca771..72da748 100644 --- a/modules/stylix.nix +++ b/modules/other/stylix.nix @@ -48,7 +48,7 @@ in { gtk.enable = false; gnome.enable = false; }; - image = lib.mkDefault ../wallpapers/nix-wallpaper-nineish-catppuccin-frappe-alt.svg; + image = lib.mkDefault ../../wallpapers/nix-wallpaper-nineish-catppuccin-frappe-alt.svg; }; }; } diff --git a/modules/services/default.nix b/modules/services/default.nix new file mode 100644 index 0000000..db377c3 --- /dev/null +++ b/modules/services/default.nix @@ -0,0 +1,6 @@ +_: { + imports = [ + ./docker.nix + ./pipewire.nix + ]; +} diff --git a/modules/docker.nix b/modules/services/docker.nix similarity index 100% rename from modules/docker.nix rename to modules/services/docker.nix diff --git a/modules/pipewire.nix b/modules/services/pipewire.nix similarity index 100% rename from modules/pipewire.nix rename to modules/services/pipewire.nix diff --git a/modules/tui/default.nix b/modules/tui/default.nix new file mode 100644 index 0000000..d5187eb --- /dev/null +++ b/modules/tui/default.nix @@ -0,0 +1,5 @@ +_: { + imports = [ + ./neovim.nix + ]; +} diff --git a/modules/neovim.nix b/modules/tui/neovim.nix similarity index 100% rename from modules/neovim.nix rename to modules/tui/neovim.nix