From 1242e0d62e75e5f3c2a8c9d7b1ffd1dd095bd1a8 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Wed, 17 Apr 2024 22:39:00 -0400 Subject: [PATCH] reorganized and renamed modules wiht alyraffauf prefix to avoid collisions with nixpkgs modules --- .../{guiApps => apps}/alacritty/default.nix | 4 +- .../{cliApps => apps}/bash/default.nix | 4 +- .../{guiApps => apps}/chromium/default.nix | 4 +- homeManagerModules/apps/default.nix | 68 +++++++++++++++++++ .../{cliApps => apps}/emacs/default.nix | 4 +- .../{cliApps => apps}/emacs/emacs.el | 0 .../{cliApps => apps}/eza/default.nix | 4 +- homeManagerModules/apps/firefox/default.nix | 12 ++++ .../{guiApps => apps}/fractal/default.nix | 4 +- .../{guiApps => apps}/fuzzel/default.nix | 4 +- .../{cliApps => apps}/fzf/default.nix | 4 +- .../apps/google-chrome/default.nix | 14 ++++ .../{guiApps => apps}/kanshi/default.nix | 4 +- .../{guiApps => apps}/librewolf/default.nix | 4 +- .../{guiApps => apps}/mako/default.nix | 4 +- .../{cliApps => apps}/neofetch/config.conf | 0 .../{cliApps => apps}/neofetch/default.nix | 4 +- .../{cliApps => apps}/neovim/default.nix | 4 +- homeManagerModules/apps/obsidian/default.nix | 14 ++++ homeManagerModules/apps/tauon/default.nix | 12 ++++ .../apps/thunderbird/default.nix | 12 ++++ .../{cliApps => apps}/tmux/default.nix | 4 +- .../{guiApps => apps}/vsCodium/default.nix | 6 +- .../{guiApps => apps}/waybar/default.nix | 4 +- .../{guiApps => apps}/waybar/waybar.css | 0 homeManagerModules/apps/webCord/default.nix | 12 ++++ .../{guiApps => apps}/wlogout/default.nix | 4 +- homeManagerModules/apps/zoom/default.nix | 12 ++++ homeManagerModules/cliApps/default.nix | 31 --------- homeManagerModules/default.nix | 2 +- .../{desktopEnv => desktop}/default.nix | 2 +- .../{desktopEnv => desktop}/gnome/default.nix | 4 +- .../{desktopEnv => desktop}/hypr/default.nix | 26 +++---- .../hypr/hypridle/default.nix | 4 +- .../hypr/hyprlock/default.nix | 4 +- .../hypr/hyprlock/hyprlock.conf | 0 .../hypr/hyprpaper/default.nix | 6 +- .../hypr/hyprpaper/hyprpaper-random.nix | 4 +- .../hypr/hyprpaper/hyprpaper.conf | 0 .../hypr/hyprshade/default.nix | 4 +- .../river => desktop/hypr}/theme.nix | 4 +- .../{desktopEnv => desktop}/river/default.nix | 20 +++--- .../river/randomWallpaper.nix | 4 +- .../hypr => desktop/river}/theme.nix | 4 +- .../{desktopEnv => desktop}/sway/config | 0 .../{desktopEnv => desktop}/sway/default.nix | 18 ++--- homeManagerModules/guiApps/default.nix | 38 ----------- .../guiApps/firefox/default.nix | 12 ---- .../guiApps/google-chrome/default.nix | 14 ---- .../guiApps/obsidian/default.nix | 14 ---- homeManagerModules/guiApps/tauon/default.nix | 12 ---- .../guiApps/thunderbird/default.nix | 12 ---- .../guiApps/webCord/default.nix | 12 ---- homeManagerModules/guiApps/zoom/default.nix | 12 ---- .../{userServices => services}/default.nix | 2 +- .../easyeffects/LoudnessEqualizer.json | 0 .../easyeffects/default.nix | 8 +-- .../easyeffects/framework13.json | 0 .../mpd/default.nix | 8 +-- .../syncthing/default.nix | 4 +- hosts/lavaridge/default.nix | 8 +-- hosts/lavaridge/home.nix | 2 +- hosts/mauville/default.nix | 13 ++-- hosts/petalburg/default.nix | 6 +- hosts/rustboro/default.nix | 6 +- hosts/rustboro/home.nix | 8 +-- nixosModules/apps/flatpak/default.nix | 4 +- nixosModules/apps/nicotine-plus/default.nix | 4 +- nixosModules/apps/podman/default.nix | 4 +- nixosModules/apps/steam/default.nix | 4 +- nixosModules/apps/virt-manager/default.nix | 4 +- nixosModules/default.nix | 2 +- nixosModules/desktop/default.nix | 6 +- nixosModules/desktop/gnome/default.nix | 4 +- nixosModules/desktop/gnome/fprintdFix.nix | 4 +- nixosModules/desktop/hyprland/default.nix | 4 +- nixosModules/desktop/lightdm/default.nix | 4 +- nixosModules/desktop/plasma/default.nix | 4 +- nixosModules/homeLab/binaryCache/default.nix | 4 +- nixosModules/homeLab/default.nix | 14 ++-- .../homeLab/nixContainers/default.nix | 4 +- .../homeLab/ociContainers/default.nix | 6 +- nixosModules/homeLab/reverseProxy/default.nix | 4 +- nixosModules/homeLab/samba/default.nix | 4 +- .../{systemConfig => system}/default.nix | 2 +- .../plymouth/default.nix | 4 +- .../power-profiles-daemon/default.nix | 4 +- nixosModules/system/zramSwap/default.nix | 22 ++++++ .../systemConfig/zramSwap/default.nix | 22 ------ .../{userConfig => user}/aly/default.nix | 4 +- nixosModules/{userConfig => user}/default.nix | 2 +- .../{userConfig => user}/dustin/default.nix | 4 +- 92 files changed, 348 insertions(+), 354 deletions(-) rename homeManagerModules/{guiApps => apps}/alacritty/default.nix (83%) rename homeManagerModules/{cliApps => apps}/bash/default.nix (79%) rename homeManagerModules/{guiApps => apps}/chromium/default.nix (84%) create mode 100644 homeManagerModules/apps/default.nix rename homeManagerModules/{cliApps => apps}/emacs/default.nix (81%) rename homeManagerModules/{cliApps => apps}/emacs/emacs.el (100%) rename homeManagerModules/{cliApps => apps}/eza/default.nix (59%) create mode 100644 homeManagerModules/apps/firefox/default.nix rename homeManagerModules/{guiApps => apps}/fractal/default.nix (63%) rename homeManagerModules/{guiApps => apps}/fuzzel/default.nix (84%) rename homeManagerModules/{cliApps => apps}/fzf/default.nix (50%) create mode 100644 homeManagerModules/apps/google-chrome/default.nix rename homeManagerModules/{guiApps => apps}/kanshi/default.nix (90%) rename homeManagerModules/{guiApps => apps}/librewolf/default.nix (90%) rename homeManagerModules/{guiApps => apps}/mako/default.nix (78%) rename homeManagerModules/{cliApps => apps}/neofetch/config.conf (100%) rename homeManagerModules/{cliApps => apps}/neofetch/default.nix (54%) rename homeManagerModules/{cliApps => apps}/neovim/default.nix (54%) create mode 100644 homeManagerModules/apps/obsidian/default.nix create mode 100644 homeManagerModules/apps/tauon/default.nix create mode 100644 homeManagerModules/apps/thunderbird/default.nix rename homeManagerModules/{cliApps => apps}/tmux/default.nix (88%) rename homeManagerModules/{guiApps => apps}/vsCodium/default.nix (89%) rename homeManagerModules/{guiApps => apps}/waybar/default.nix (97%) rename homeManagerModules/{guiApps => apps}/waybar/waybar.css (100%) create mode 100644 homeManagerModules/apps/webCord/default.nix rename homeManagerModules/{guiApps => apps}/wlogout/default.nix (80%) create mode 100644 homeManagerModules/apps/zoom/default.nix delete mode 100644 homeManagerModules/cliApps/default.nix rename homeManagerModules/{desktopEnv => desktop}/default.nix (59%) rename homeManagerModules/{desktopEnv => desktop}/gnome/default.nix (95%) rename homeManagerModules/{desktopEnv => desktop}/hypr/default.nix (94%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hypridle/default.nix (94%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hyprlock/default.nix (69%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hyprlock/hyprlock.conf (100%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hyprpaper/default.nix (62%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hyprpaper/hyprpaper-random.nix (86%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hyprpaper/hyprpaper.conf (100%) rename homeManagerModules/{desktopEnv => desktop}/hypr/hyprshade/default.nix (95%) rename homeManagerModules/{desktopEnv/river => desktop/hypr}/theme.nix (92%) rename homeManagerModules/{desktopEnv => desktop}/river/default.nix (95%) rename homeManagerModules/{desktopEnv => desktop}/river/randomWallpaper.nix (85%) rename homeManagerModules/{desktopEnv/hypr => desktop/river}/theme.nix (92%) rename homeManagerModules/{desktopEnv => desktop}/sway/config (100%) rename homeManagerModules/{desktopEnv => desktop}/sway/default.nix (93%) delete mode 100644 homeManagerModules/guiApps/default.nix delete mode 100644 homeManagerModules/guiApps/firefox/default.nix delete mode 100644 homeManagerModules/guiApps/google-chrome/default.nix delete mode 100644 homeManagerModules/guiApps/obsidian/default.nix delete mode 100644 homeManagerModules/guiApps/tauon/default.nix delete mode 100644 homeManagerModules/guiApps/thunderbird/default.nix delete mode 100644 homeManagerModules/guiApps/webCord/default.nix delete mode 100644 homeManagerModules/guiApps/zoom/default.nix rename homeManagerModules/{userServices => services}/default.nix (59%) rename homeManagerModules/{userServices => services}/easyeffects/LoudnessEqualizer.json (100%) rename homeManagerModules/{userServices => services}/easyeffects/default.nix (67%) rename homeManagerModules/{userServices => services}/easyeffects/framework13.json (100%) rename homeManagerModules/{userServices => services}/mpd/default.nix (63%) rename homeManagerModules/{userServices => services}/syncthing/default.nix (59%) rename nixosModules/{systemConfig => system}/default.nix (97%) rename nixosModules/{systemConfig => system}/plymouth/default.nix (71%) rename nixosModules/{systemConfig => system}/power-profiles-daemon/default.nix (62%) create mode 100644 nixosModules/system/zramSwap/default.nix delete mode 100644 nixosModules/systemConfig/zramSwap/default.nix rename nixosModules/{userConfig => user}/aly/default.nix (71%) rename nixosModules/{userConfig => user}/default.nix (74%) rename nixosModules/{userConfig => user}/dustin/default.nix (69%) diff --git a/homeManagerModules/guiApps/alacritty/default.nix b/homeManagerModules/apps/alacritty/default.nix similarity index 83% rename from homeManagerModules/guiApps/alacritty/default.nix rename to homeManagerModules/apps/alacritty/default.nix index e80c777c..322eeefe 100644 --- a/homeManagerModules/guiApps/alacritty/default.nix +++ b/homeManagerModules/apps/alacritty/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - guiApps.alacritty.enable = lib.mkEnableOption "Enables alacritty."; + alyraffauf.apps.alacritty.enable = lib.mkEnableOption "Enables alacritty."; }; - config = lib.mkIf config.guiApps.alacritty.enable { + config = lib.mkIf config.alyraffauf.apps.alacritty.enable { programs.alacritty = { enable = true; settings = { diff --git a/homeManagerModules/cliApps/bash/default.nix b/homeManagerModules/apps/bash/default.nix similarity index 79% rename from homeManagerModules/cliApps/bash/default.nix rename to homeManagerModules/apps/bash/default.nix index 8c76c5f9..bd340fb1 100644 --- a/homeManagerModules/cliApps/bash/default.nix +++ b/homeManagerModules/apps/bash/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {cliApps.bash.enable = lib.mkEnableOption "Enables bash.";}; + options = {alyraffauf.apps.bash.enable = lib.mkEnableOption "Enables bash.";}; - config = lib.mkIf config.cliApps.bash.enable { + config = lib.mkIf config.alyraffauf.apps.bash.enable { programs.bash = { enable = true; enableCompletion = true; diff --git a/homeManagerModules/guiApps/chromium/default.nix b/homeManagerModules/apps/chromium/default.nix similarity index 84% rename from homeManagerModules/guiApps/chromium/default.nix rename to homeManagerModules/apps/chromium/default.nix index 4056fb4f..1d52bf2d 100644 --- a/homeManagerModules/guiApps/chromium/default.nix +++ b/homeManagerModules/apps/chromium/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - guiApps.chromium.enable = lib.mkEnableOption "Enables Chromium."; + alyraffauf.apps.chromium.enable = lib.mkEnableOption "Enables Chromium."; }; - config = lib.mkIf config.guiApps.chromium.enable { + config = lib.mkIf config.alyraffauf.apps.chromium.enable { programs.chromium = { enable = true; extensions = [ diff --git a/homeManagerModules/apps/default.nix b/homeManagerModules/apps/default.nix new file mode 100644 index 00000000..3648c8d2 --- /dev/null +++ b/homeManagerModules/apps/default.nix @@ -0,0 +1,68 @@ +{ + config, + lib, + pkgs, + ... +}: { + imports = [ + ./alacritty + ./bash + ./chromium + ./emacs + ./eza + ./firefox + ./fractal + ./fuzzel + ./fzf + ./google-chrome + ./kanshi + ./librewolf + ./mako + ./neofetch + ./neovim + ./obsidian + ./tauon + ./thunderbird + ./tmux + ./vsCodium + ./waybar + ./webCord + ./wlogout + ./zoom + ]; + + home.packages = with pkgs; [ + # backblaze-b2 + browsh + curl + gh + git + python3 + ruby + wget + ]; + + programs.nnn.enable = lib.mkDefault true; + + programs.rbw.enable = lib.mkDefault true; + + alyraffauf.apps.bash.enable = lib.mkDefault true; + alyraffauf.apps.emacs.enable = lib.mkDefault true; + alyraffauf.apps.eza.enable = lib.mkDefault true; + alyraffauf.apps.fzf.enable = lib.mkDefault true; + alyraffauf.apps.neofetch.enable = lib.mkDefault true; + alyraffauf.apps.neovim.enable = lib.mkDefault true; + alyraffauf.apps.tmux.enable = lib.mkDefault true; + + alyraffauf.apps.alacritty.enable = lib.mkDefault true; + alyraffauf.apps.chromium.enable = lib.mkDefault false; + alyraffauf.apps.firefox.enable = lib.mkDefault true; + alyraffauf.apps.fractal.enable = lib.mkDefault true; + alyraffauf.apps.google-chrome.enable = lib.mkDefault true; + alyraffauf.apps.obsidian.enable = lib.mkDefault true; + alyraffauf.apps.tauon.enable = lib.mkDefault true; + alyraffauf.apps.thunderbird.enable = lib.mkDefault true; + alyraffauf.apps.vsCodium.enable = lib.mkDefault true; + alyraffauf.apps.webCord.enable = lib.mkDefault true; + alyraffauf.apps.zoom.enable = lib.mkDefault true; +} diff --git a/homeManagerModules/cliApps/emacs/default.nix b/homeManagerModules/apps/emacs/default.nix similarity index 81% rename from homeManagerModules/cliApps/emacs/default.nix rename to homeManagerModules/apps/emacs/default.nix index 902616fa..df2067fd 100644 --- a/homeManagerModules/cliApps/emacs/default.nix +++ b/homeManagerModules/apps/emacs/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {cliApps.emacs.enable = lib.mkEnableOption "Enables emacs.";}; + options = {alyraffauf.apps.emacs.enable = lib.mkEnableOption "Enables emacs.";}; - config = lib.mkIf config.cliApps.emacs.enable { + config = lib.mkIf config.alyraffauf.apps.emacs.enable { home.packages = with pkgs; [python3]; programs.emacs = { diff --git a/homeManagerModules/cliApps/emacs/emacs.el b/homeManagerModules/apps/emacs/emacs.el similarity index 100% rename from homeManagerModules/cliApps/emacs/emacs.el rename to homeManagerModules/apps/emacs/emacs.el diff --git a/homeManagerModules/cliApps/eza/default.nix b/homeManagerModules/apps/eza/default.nix similarity index 59% rename from homeManagerModules/cliApps/eza/default.nix rename to homeManagerModules/apps/eza/default.nix index 23b77237..83a0d94a 100644 --- a/homeManagerModules/cliApps/eza/default.nix +++ b/homeManagerModules/apps/eza/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {cliApps.eza.enable = lib.mkEnableOption "Enables eza.";}; + options = {alyraffauf.apps.eza.enable = lib.mkEnableOption "Enables eza.";}; - config = lib.mkIf config.cliApps.eza.enable { + config = lib.mkIf config.alyraffauf.apps.eza.enable { programs.eza = { enable = true; git = true; diff --git a/homeManagerModules/apps/firefox/default.nix b/homeManagerModules/apps/firefox/default.nix new file mode 100644 index 00000000..03e16dc5 --- /dev/null +++ b/homeManagerModules/apps/firefox/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = {alyraffauf.apps.firefox.enable = lib.mkEnableOption "Enables Firefox.";}; + + config = lib.mkIf config.alyraffauf.apps.firefox.enable { + programs.firefox = {enable = true;}; + }; +} diff --git a/homeManagerModules/guiApps/fractal/default.nix b/homeManagerModules/apps/fractal/default.nix similarity index 63% rename from homeManagerModules/guiApps/fractal/default.nix rename to homeManagerModules/apps/fractal/default.nix index 79d4eacc..18ddcad0 100644 --- a/homeManagerModules/guiApps/fractal/default.nix +++ b/homeManagerModules/apps/fractal/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - guiApps.fractal.enable = + alyraffauf.apps.fractal.enable = lib.mkEnableOption "Enables Fractal Matrix client."; }; - config = lib.mkIf config.guiApps.fractal.enable { + config = lib.mkIf config.alyraffauf.apps.fractal.enable { home.packages = with pkgs; [fractal]; }; } diff --git a/homeManagerModules/guiApps/fuzzel/default.nix b/homeManagerModules/apps/fuzzel/default.nix similarity index 84% rename from homeManagerModules/guiApps/fuzzel/default.nix rename to homeManagerModules/apps/fuzzel/default.nix index 8a2c7ada..230dd911 100644 --- a/homeManagerModules/guiApps/fuzzel/default.nix +++ b/homeManagerModules/apps/fuzzel/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {guiApps.fuzzel.enable = lib.mkEnableOption "Enables fuzzel.";}; + options = {alyraffauf.apps.fuzzel.enable = lib.mkEnableOption "Enables fuzzel.";}; - config = lib.mkIf config.guiApps.fuzzel.enable { + config = lib.mkIf config.alyraffauf.apps.fuzzel.enable { home.packages = with pkgs; [ (nerdfonts.override {fonts = ["Noto"];}) (catppuccin-papirus-folders.override { diff --git a/homeManagerModules/cliApps/fzf/default.nix b/homeManagerModules/apps/fzf/default.nix similarity index 50% rename from homeManagerModules/cliApps/fzf/default.nix rename to homeManagerModules/apps/fzf/default.nix index ce572492..bda71c2b 100644 --- a/homeManagerModules/cliApps/fzf/default.nix +++ b/homeManagerModules/apps/fzf/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {cliApps.fzf.enable = lib.mkEnableOption "Enables fzf.";}; + options = {alyraffauf.apps.fzf.enable = lib.mkEnableOption "Enables fzf.";}; - config = lib.mkIf config.cliApps.fzf.enable { + config = lib.mkIf config.alyraffauf.apps.fzf.enable { programs.fzf = { enable = true; tmux.enableShellIntegration = true; diff --git a/homeManagerModules/apps/google-chrome/default.nix b/homeManagerModules/apps/google-chrome/default.nix new file mode 100644 index 00000000..b28229d2 --- /dev/null +++ b/homeManagerModules/apps/google-chrome/default.nix @@ -0,0 +1,14 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + alyraffauf.apps.google-chrome.enable = lib.mkEnableOption "Enable Google Chrome."; + }; + + config = lib.mkIf config.alyraffauf.apps.google-chrome.enable { + home.packages = with pkgs; [google-chrome]; + }; +} diff --git a/homeManagerModules/guiApps/kanshi/default.nix b/homeManagerModules/apps/kanshi/default.nix similarity index 90% rename from homeManagerModules/guiApps/kanshi/default.nix rename to homeManagerModules/apps/kanshi/default.nix index 4f7c49ae..c7ce7fa5 100644 --- a/homeManagerModules/guiApps/kanshi/default.nix +++ b/homeManagerModules/apps/kanshi/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - guiApps.kanshi.enable = + alyraffauf.apps.kanshi.enable = lib.mkEnableOption "Enable kanshi monitor profiles"; }; - config = lib.mkIf config.guiApps.kanshi.enable { + config = lib.mkIf config.alyraffauf.apps.kanshi.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [ kanshi diff --git a/homeManagerModules/guiApps/librewolf/default.nix b/homeManagerModules/apps/librewolf/default.nix similarity index 90% rename from homeManagerModules/guiApps/librewolf/default.nix rename to homeManagerModules/apps/librewolf/default.nix index 5b2b4def..8ef35f19 100644 --- a/homeManagerModules/guiApps/librewolf/default.nix +++ b/homeManagerModules/apps/librewolf/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - guiApps.librewolf.enable = lib.mkEnableOption "Enables librewolf."; + alyraffauf.apps.librewolf.enable = lib.mkEnableOption "Enables librewolf."; }; - config = lib.mkIf config.guiApps.librewolf.enable { + config = lib.mkIf config.alyraffauf.apps.librewolf.enable { programs.librewolf = { enable = true; settings = { diff --git a/homeManagerModules/guiApps/mako/default.nix b/homeManagerModules/apps/mako/default.nix similarity index 78% rename from homeManagerModules/guiApps/mako/default.nix rename to homeManagerModules/apps/mako/default.nix index b1e4c84a..4ff2fdba 100644 --- a/homeManagerModules/guiApps/mako/default.nix +++ b/homeManagerModules/apps/mako/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {guiApps.mako.enable = lib.mkEnableOption "Enables mako.";}; + options = {alyraffauf.apps.mako.enable = lib.mkEnableOption "Enables mako.";}; - config = lib.mkIf config.guiApps.mako.enable { + config = lib.mkIf config.alyraffauf.apps.mako.enable { home.packages = with pkgs; [(nerdfonts.override {fonts = ["Noto"];})]; services.mako = { diff --git a/homeManagerModules/cliApps/neofetch/config.conf b/homeManagerModules/apps/neofetch/config.conf similarity index 100% rename from homeManagerModules/cliApps/neofetch/config.conf rename to homeManagerModules/apps/neofetch/config.conf diff --git a/homeManagerModules/cliApps/neofetch/default.nix b/homeManagerModules/apps/neofetch/default.nix similarity index 54% rename from homeManagerModules/cliApps/neofetch/default.nix rename to homeManagerModules/apps/neofetch/default.nix index d39ed950..4a6357f7 100644 --- a/homeManagerModules/cliApps/neofetch/default.nix +++ b/homeManagerModules/apps/neofetch/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - cliApps.neofetch.enable = lib.mkEnableOption "Enable neofetch."; + alyraffauf.apps.neofetch.enable = lib.mkEnableOption "Enable neofetch."; }; - config = lib.mkIf config.cliApps.neofetch.enable { + config = lib.mkIf config.alyraffauf.apps.neofetch.enable { home.packages = [pkgs.neofetch]; xdg.configFile."neofetch/config.conf".source = ./config.conf; }; diff --git a/homeManagerModules/cliApps/neovim/default.nix b/homeManagerModules/apps/neovim/default.nix similarity index 54% rename from homeManagerModules/cliApps/neovim/default.nix rename to homeManagerModules/apps/neovim/default.nix index 7c7fbb1e..65ce290d 100644 --- a/homeManagerModules/cliApps/neovim/default.nix +++ b/homeManagerModules/apps/neovim/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {cliApps.neovim.enable = lib.mkEnableOption "Enables neovim.";}; + options = {alyraffauf.apps.neovim.enable = lib.mkEnableOption "Enables neovim.";}; - config = lib.mkIf config.cliApps.neovim.enable { + config = lib.mkIf config.alyraffauf.apps.neovim.enable { programs.neovim = { enable = true; viAlias = true; diff --git a/homeManagerModules/apps/obsidian/default.nix b/homeManagerModules/apps/obsidian/default.nix new file mode 100644 index 00000000..3515d8f7 --- /dev/null +++ b/homeManagerModules/apps/obsidian/default.nix @@ -0,0 +1,14 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + alyraffauf.apps.obsidian.enable = lib.mkEnableOption "Enables Obsidian."; + }; + + config = lib.mkIf config.alyraffauf.apps.obsidian.enable { + home.packages = with pkgs; [obsidian]; + }; +} diff --git a/homeManagerModules/apps/tauon/default.nix b/homeManagerModules/apps/tauon/default.nix new file mode 100644 index 00000000..74fd6e84 --- /dev/null +++ b/homeManagerModules/apps/tauon/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = {alyraffauf.apps.tauon.enable = lib.mkEnableOption "Enables Tauon.";}; + + config = lib.mkIf config.alyraffauf.apps.tauon.enable { + home.packages = with pkgs; [tauon]; + }; +} diff --git a/homeManagerModules/apps/thunderbird/default.nix b/homeManagerModules/apps/thunderbird/default.nix new file mode 100644 index 00000000..4602f708 --- /dev/null +++ b/homeManagerModules/apps/thunderbird/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = {alyraffauf.apps.thunderbird.enable = lib.mkEnableOption "Enable Thunderbird.";}; + + config = lib.mkIf config.alyraffauf.apps.thunderbird.enable { + home.packages = [pkgs.thunderbird]; + }; +} diff --git a/homeManagerModules/cliApps/tmux/default.nix b/homeManagerModules/apps/tmux/default.nix similarity index 88% rename from homeManagerModules/cliApps/tmux/default.nix rename to homeManagerModules/apps/tmux/default.nix index f115a931..dea248c6 100644 --- a/homeManagerModules/cliApps/tmux/default.nix +++ b/homeManagerModules/apps/tmux/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {cliApps.tmux.enable = lib.mkEnableOption "Enables tmux.";}; + options = {alyraffauf.apps.tmux.enable = lib.mkEnableOption "Enables tmux.";}; - config = lib.mkIf config.cliApps.tmux.enable { + config = lib.mkIf config.alyraffauf.apps.tmux.enable { programs.tmux = { enable = true; mouse = true; diff --git a/homeManagerModules/guiApps/vsCodium/default.nix b/homeManagerModules/apps/vsCodium/default.nix similarity index 89% rename from homeManagerModules/guiApps/vsCodium/default.nix rename to homeManagerModules/apps/vsCodium/default.nix index b6b95634..96150f11 100644 --- a/homeManagerModules/guiApps/vsCodium/default.nix +++ b/homeManagerModules/apps/vsCodium/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - guiApps.vsCodium.enable = lib.mkEnableOption "Enables VSCodium."; + alyraffauf.apps.vsCodium.enable = lib.mkEnableOption "Enables VSCodium."; }; - config = lib.mkIf config.guiApps.vsCodium.enable { - guiApps.alacritty.enable = lib.mkDefault true; + config = lib.mkIf config.alyraffauf.apps.vsCodium.enable { + alyraffauf.apps.alacritty.enable = lib.mkDefault true; # Necessary fonts. home.packages = with pkgs; [ diff --git a/homeManagerModules/guiApps/waybar/default.nix b/homeManagerModules/apps/waybar/default.nix similarity index 97% rename from homeManagerModules/guiApps/waybar/default.nix rename to homeManagerModules/apps/waybar/default.nix index 7bab0c46..ec5cd189 100644 --- a/homeManagerModules/guiApps/waybar/default.nix +++ b/homeManagerModules/apps/waybar/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {guiApps.waybar.enable = lib.mkEnableOption "Enables waybar.";}; + options = {alyraffauf.apps.waybar.enable = lib.mkEnableOption "Enables waybar.";}; - config = lib.mkIf config.guiApps.waybar.enable { + config = lib.mkIf config.alyraffauf.apps.waybar.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [ blueberry diff --git a/homeManagerModules/guiApps/waybar/waybar.css b/homeManagerModules/apps/waybar/waybar.css similarity index 100% rename from homeManagerModules/guiApps/waybar/waybar.css rename to homeManagerModules/apps/waybar/waybar.css diff --git a/homeManagerModules/apps/webCord/default.nix b/homeManagerModules/apps/webCord/default.nix new file mode 100644 index 00000000..549e64c8 --- /dev/null +++ b/homeManagerModules/apps/webCord/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = {alyraffauf.apps.webCord.enable = lib.mkEnableOption "Enables WebCord.";}; + + config = lib.mkIf config.alyraffauf.apps.webCord.enable { + home.packages = with pkgs; [webcord]; + }; +} diff --git a/homeManagerModules/guiApps/wlogout/default.nix b/homeManagerModules/apps/wlogout/default.nix similarity index 80% rename from homeManagerModules/guiApps/wlogout/default.nix rename to homeManagerModules/apps/wlogout/default.nix index f0c58681..3e47268f 100644 --- a/homeManagerModules/guiApps/wlogout/default.nix +++ b/homeManagerModules/apps/wlogout/default.nix @@ -4,9 +4,9 @@ config, ... }: { - options = {guiApps.wlogout.enable = lib.mkEnableOption "Enables wlogout.";}; + options = {alyraffauf.apps.wlogout.enable = lib.mkEnableOption "Enables wlogout.";}; - config = lib.mkIf config.guiApps.wlogout.enable { + config = lib.mkIf config.alyraffauf.apps.wlogout.enable { programs.wlogout = { enable = true; layout = [ diff --git a/homeManagerModules/apps/zoom/default.nix b/homeManagerModules/apps/zoom/default.nix new file mode 100644 index 00000000..8ed41d93 --- /dev/null +++ b/homeManagerModules/apps/zoom/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = {alyraffauf.apps.zoom.enable = lib.mkEnableOption "Enables Zoom.";}; + + config = lib.mkIf config.alyraffauf.apps.zoom.enable { + home.packages = with pkgs; [zoom-us]; + }; +} diff --git a/homeManagerModules/cliApps/default.nix b/homeManagerModules/cliApps/default.nix deleted file mode 100644 index e2f58d83..00000000 --- a/homeManagerModules/cliApps/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - imports = [./bash ./emacs ./eza ./fzf ./neovim ./tmux ./neofetch]; - - home.packages = with pkgs; [ - # backblaze-b2 - browsh - curl - gh - git - python3 - ruby - wget - ]; - - programs.nnn.enable = lib.mkDefault true; - - programs.rbw.enable = lib.mkDefault true; - - cliApps.bash.enable = lib.mkDefault true; - cliApps.emacs.enable = lib.mkDefault true; - cliApps.eza.enable = lib.mkDefault true; - cliApps.fzf.enable = lib.mkDefault true; - cliApps.neofetch.enable = lib.mkDefault true; - cliApps.neovim.enable = lib.mkDefault true; - cliApps.tmux.enable = lib.mkDefault true; -} diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix index 19956f45..0f2b2d72 100644 --- a/homeManagerModules/default.nix +++ b/homeManagerModules/default.nix @@ -4,7 +4,7 @@ lib, ... }: { - imports = [./cliApps ./guiApps ./desktopEnv ./userServices]; + imports = [./apps ./desktop ./services]; nixpkgs = { # Configure nixpkgs instance diff --git a/homeManagerModules/desktopEnv/default.nix b/homeManagerModules/desktop/default.nix similarity index 59% rename from homeManagerModules/desktopEnv/default.nix rename to homeManagerModules/desktop/default.nix index 4e6664ed..be666139 100644 --- a/homeManagerModules/desktopEnv/default.nix +++ b/homeManagerModules/desktop/default.nix @@ -6,5 +6,5 @@ }: { imports = [./gnome ./hypr ./sway ./river]; - desktopEnv.hyprland.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.enable = lib.mkDefault true; } diff --git a/homeManagerModules/desktopEnv/gnome/default.nix b/homeManagerModules/desktop/gnome/default.nix similarity index 95% rename from homeManagerModules/desktopEnv/gnome/default.nix rename to homeManagerModules/desktop/gnome/default.nix index bba710c9..30a50aa9 100644 --- a/homeManagerModules/desktopEnv/gnome/default.nix +++ b/homeManagerModules/desktop/gnome/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopEnv.gnome.enable = + alyraffauf.desktop.gnome.enable = lib.mkEnableOption "Enables GNOME with basic settings configuration."; }; - config = lib.mkIf config.desktopEnv.gnome.enable { + config = lib.mkIf config.alyraffauf.desktop.gnome.enable { dconf.enable = true; dconf.settings = { "org/gnome/desktop/datetime".automatic-timezone = true; diff --git a/homeManagerModules/desktopEnv/hypr/default.nix b/homeManagerModules/desktop/hypr/default.nix similarity index 94% rename from homeManagerModules/desktopEnv/hypr/default.nix rename to homeManagerModules/desktop/hypr/default.nix index 0d67e0fc..b2618e5c 100644 --- a/homeManagerModules/desktopEnv/hypr/default.nix +++ b/homeManagerModules/desktop/hypr/default.nix @@ -7,26 +7,26 @@ imports = [./hypridle ./hyprlock ./hyprpaper ./hyprshade ./theme.nix]; options = { - desktopEnv.hyprland.enable = + alyraffauf.desktop.hyprland.enable = lib.mkEnableOption "Enables hyprland with extra apps."; }; - config = lib.mkIf config.desktopEnv.hyprland.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.enable { # Hypr* modules, plguins, and tools. - desktopEnv.hyprland.hypridle.enable = lib.mkDefault true; - desktopEnv.hyprland.hyprlock.enable = lib.mkDefault true; - desktopEnv.hyprland.hyprpaper.enable = lib.mkDefault true; - desktopEnv.hyprland.hyprshade.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.hypridle.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.hyprlock.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.hyprpaper.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.hyprshade.enable = lib.mkDefault true; - desktopEnv.hyprland.theme.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.theme.enable = lib.mkDefault true; # Basic apps needed to run a hyprland desktop. - guiApps.waybar.enable = lib.mkDefault true; - guiApps.mako.enable = lib.mkDefault true; - guiApps.fuzzel.enable = lib.mkDefault true; - guiApps.wlogout.enable = lib.mkDefault true; - guiApps.alacritty.enable = lib.mkDefault true; - guiApps.firefox.enable = lib.mkDefault true; + alyraffauf.apps.waybar.enable = lib.mkDefault true; + alyraffauf.apps.mako.enable = lib.mkDefault true; + alyraffauf.apps.fuzzel.enable = lib.mkDefault true; + alyraffauf.apps.wlogout.enable = lib.mkDefault true; + alyraffauf.apps.alacritty.enable = lib.mkDefault true; + alyraffauf.apps.firefox.enable = lib.mkDefault true; # Packages that should be installed to the user profile. home.packages = with pkgs; [ diff --git a/homeManagerModules/desktopEnv/hypr/hypridle/default.nix b/homeManagerModules/desktop/hypr/hypridle/default.nix similarity index 94% rename from homeManagerModules/desktopEnv/hypr/hypridle/default.nix rename to homeManagerModules/desktop/hypr/hypridle/default.nix index bf0f09c2..b8a73da5 100644 --- a/homeManagerModules/desktopEnv/hypr/hypridle/default.nix +++ b/homeManagerModules/desktop/hypr/hypridle/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopEnv.hyprland.hypridle.enable = + alyraffauf.desktop.hyprland.hypridle.enable = lib.mkEnableOption "Enables hypridle."; }; - config = lib.mkIf config.desktopEnv.hyprland.hypridle.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.hypridle.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [hypridle brightnessctl]; diff --git a/homeManagerModules/desktopEnv/hypr/hyprlock/default.nix b/homeManagerModules/desktop/hypr/hyprlock/default.nix similarity index 69% rename from homeManagerModules/desktopEnv/hypr/hyprlock/default.nix rename to homeManagerModules/desktop/hypr/hyprlock/default.nix index 47737daa..e9fad8ca 100644 --- a/homeManagerModules/desktopEnv/hypr/hyprlock/default.nix +++ b/homeManagerModules/desktop/hypr/hyprlock/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopEnv.hyprland.hyprlock.enable = + alyraffauf.desktop.hyprland.hyprlock.enable = lib.mkEnableOption "Enables hyprlock."; }; - config = lib.mkIf config.desktopEnv.hyprland.hyprlock.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.hyprlock.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [hyprlock]; diff --git a/homeManagerModules/desktopEnv/hypr/hyprlock/hyprlock.conf b/homeManagerModules/desktop/hypr/hyprlock/hyprlock.conf similarity index 100% rename from homeManagerModules/desktopEnv/hypr/hyprlock/hyprlock.conf rename to homeManagerModules/desktop/hypr/hyprlock/hyprlock.conf diff --git a/homeManagerModules/desktopEnv/hypr/hyprpaper/default.nix b/homeManagerModules/desktop/hypr/hyprpaper/default.nix similarity index 62% rename from homeManagerModules/desktopEnv/hypr/hyprpaper/default.nix rename to homeManagerModules/desktop/hypr/hyprpaper/default.nix index ddcf3b71..182a42bf 100644 --- a/homeManagerModules/desktopEnv/hypr/hyprpaper/default.nix +++ b/homeManagerModules/desktop/hypr/hyprpaper/default.nix @@ -7,15 +7,15 @@ imports = [./hyprpaper-random.nix]; options = { - desktopEnv.hyprland.hyprpaper.enable = + alyraffauf.desktop.hyprland.hyprpaper.enable = lib.mkEnableOption "Enables hyprpaper and assorted wallpapers."; }; - config = lib.mkIf config.desktopEnv.hyprland.hyprpaper.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.hyprpaper.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [hyprpaper]; - desktopEnv.hyprland.hyprpaper.randomWallpaper.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.hyprpaper.randomWallpaper.enable = lib.mkDefault true; xdg.configFile."hypr/hyprpaper.conf".source = ./hyprpaper.conf; }; diff --git a/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper-random.nix b/homeManagerModules/desktop/hypr/hyprpaper/hyprpaper-random.nix similarity index 86% rename from homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper-random.nix rename to homeManagerModules/desktop/hypr/hyprpaper/hyprpaper-random.nix index 3f624d02..7eb809cc 100644 --- a/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper-random.nix +++ b/homeManagerModules/desktop/hypr/hyprpaper/hyprpaper-random.nix @@ -23,11 +23,11 @@ ''; in { options = { - desktopEnv.hyprland.hyprpaper.randomWallpaper.enable = + alyraffauf.desktop.hyprland.hyprpaper.randomWallpaper.enable = lib.mkEnableOption "Enables hyprpaper random wallpaper script."; }; - config = lib.mkIf config.desktopEnv.hyprland.hyprpaper.randomWallpaper.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.hyprpaper.randomWallpaper.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [hyprpaper-random]; diff --git a/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper.conf b/homeManagerModules/desktop/hypr/hyprpaper/hyprpaper.conf similarity index 100% rename from homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper.conf rename to homeManagerModules/desktop/hypr/hyprpaper/hyprpaper.conf diff --git a/homeManagerModules/desktopEnv/hypr/hyprshade/default.nix b/homeManagerModules/desktop/hypr/hyprshade/default.nix similarity index 95% rename from homeManagerModules/desktopEnv/hypr/hyprshade/default.nix rename to homeManagerModules/desktop/hypr/hyprshade/default.nix index ea3a3c85..6daaec6a 100644 --- a/homeManagerModules/desktopEnv/hypr/hyprshade/default.nix +++ b/homeManagerModules/desktop/hypr/hyprshade/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopEnv.hyprland.hyprshade.enable = + alyraffauf.desktop.hyprland.hyprshade.enable = lib.mkEnableOption "Enables hyprshade with blue light filter."; }; - config = lib.mkIf config.desktopEnv.hyprland.hyprshade.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.hyprshade.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [hyprshade]; diff --git a/homeManagerModules/desktopEnv/river/theme.nix b/homeManagerModules/desktop/hypr/theme.nix similarity index 92% rename from homeManagerModules/desktopEnv/river/theme.nix rename to homeManagerModules/desktop/hypr/theme.nix index eed9d562..266d6e06 100644 --- a/homeManagerModules/desktopEnv/river/theme.nix +++ b/homeManagerModules/desktop/hypr/theme.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopEnv.hyprland.theme.enable = + alyraffauf.desktop.hyprland.theme.enable = lib.mkEnableOption "Hyprland GTK and Qt themes."; }; - config = lib.mkIf config.desktopEnv.hyprland.theme.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.theme.enable { home.pointerCursor = { gtk.enable = true; x11.enable = true; diff --git a/homeManagerModules/desktopEnv/river/default.nix b/homeManagerModules/desktop/river/default.nix similarity index 95% rename from homeManagerModules/desktopEnv/river/default.nix rename to homeManagerModules/desktop/river/default.nix index e8007b4d..fa94ad9a 100644 --- a/homeManagerModules/desktopEnv/river/default.nix +++ b/homeManagerModules/desktop/river/default.nix @@ -6,19 +6,19 @@ }: { imports = [./randomWallpaper.nix]; options = { - desktopEnv.river.enable = + alyraffauf.desktop.river.enable = lib.mkEnableOption "Enable riverwm with extra apps."; }; - config = lib.mkIf config.desktopEnv.river.enable { + config = lib.mkIf config.alyraffauf.desktop.river.enable { # Basic apps needed to run a riverwm desktop. - guiApps.waybar.enable = lib.mkDefault true; - guiApps.mako.enable = lib.mkDefault true; - guiApps.fuzzel.enable = lib.mkDefault true; - guiApps.wlogout.enable = lib.mkDefault true; - guiApps.alacritty.enable = lib.mkDefault true; - guiApps.firefox.enable = lib.mkDefault true; - guiApps.kanshi.enable = lib.mkDefault true; + alyraffauf.apps.waybar.enable = lib.mkDefault true; + alyraffauf.apps.mako.enable = lib.mkDefault true; + alyraffauf.apps.fuzzel.enable = lib.mkDefault true; + alyraffauf.apps.wlogout.enable = lib.mkDefault true; + alyraffauf.apps.alacritty.enable = lib.mkDefault true; + alyraffauf.apps.firefox.enable = lib.mkDefault true; + alyraffauf.apps.kanshi.enable = lib.mkDefault true; # Packages that should be installed to the user profile. home.packages = with pkgs; [ @@ -45,7 +45,7 @@ swayidle ]; - desktopEnv.river.randomWallpaper.enable = lib.mkDefault true; + alyraffauf.desktop.river.randomWallpaper.enable = lib.mkDefault true; programs.swaylock.enable = lib.mkDefault true; diff --git a/homeManagerModules/desktopEnv/river/randomWallpaper.nix b/homeManagerModules/desktop/river/randomWallpaper.nix similarity index 85% rename from homeManagerModules/desktopEnv/river/randomWallpaper.nix rename to homeManagerModules/desktop/river/randomWallpaper.nix index 27a1b83e..4c7d0d60 100644 --- a/homeManagerModules/desktopEnv/river/randomWallpaper.nix +++ b/homeManagerModules/desktop/river/randomWallpaper.nix @@ -18,11 +18,11 @@ ''; in { options = { - desktopEnv.river.randomWallpaper.enable = + alyraffauf.desktop.river.randomWallpaper.enable = lib.mkEnableOption "Enables swaybg random wallpaper script."; }; - config = lib.mkIf config.desktopEnv.river.randomWallpaper.enable { + config = lib.mkIf config.alyraffauf.desktop.river.randomWallpaper.enable { # Packages that should be installed to the user profile. home.packages = with pkgs; [swaybg swaybg-random]; diff --git a/homeManagerModules/desktopEnv/hypr/theme.nix b/homeManagerModules/desktop/river/theme.nix similarity index 92% rename from homeManagerModules/desktopEnv/hypr/theme.nix rename to homeManagerModules/desktop/river/theme.nix index eed9d562..266d6e06 100644 --- a/homeManagerModules/desktopEnv/hypr/theme.nix +++ b/homeManagerModules/desktop/river/theme.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopEnv.hyprland.theme.enable = + alyraffauf.desktop.hyprland.theme.enable = lib.mkEnableOption "Hyprland GTK and Qt themes."; }; - config = lib.mkIf config.desktopEnv.hyprland.theme.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.theme.enable { home.pointerCursor = { gtk.enable = true; x11.enable = true; diff --git a/homeManagerModules/desktopEnv/sway/config b/homeManagerModules/desktop/sway/config similarity index 100% rename from homeManagerModules/desktopEnv/sway/config rename to homeManagerModules/desktop/sway/config diff --git a/homeManagerModules/desktopEnv/sway/default.nix b/homeManagerModules/desktop/sway/default.nix similarity index 93% rename from homeManagerModules/desktopEnv/sway/default.nix rename to homeManagerModules/desktop/sway/default.nix index a45d1b39..363122ad 100644 --- a/homeManagerModules/desktopEnv/sway/default.nix +++ b/homeManagerModules/desktop/sway/default.nix @@ -5,18 +5,18 @@ ... }: { options = { - desktopEnv.sway.enable = lib.mkEnableOption "Sway with extra apps."; + alyraffauf.desktop.sway.enable = lib.mkEnableOption "Sway with extra apps."; }; - config = lib.mkIf config.desktopEnv.sway.enable { + config = lib.mkIf config.alyraffauf.desktop.sway.enable { # Basic apps needed to run a hyprland desktop. - guiApps.waybar.enable = lib.mkDefault true; - guiApps.mako.enable = lib.mkDefault true; - guiApps.fuzzel.enable = lib.mkDefault true; - guiApps.wlogout.enable = lib.mkDefault true; - guiApps.alacritty.enable = lib.mkDefault true; - guiApps.firefox.enable = lib.mkDefault true; - guiApps.kanshi.enable = lib.mkDefault true; + alyraffauf.apps.waybar.enable = lib.mkDefault true; + alyraffauf.apps.mako.enable = lib.mkDefault true; + alyraffauf.apps.fuzzel.enable = lib.mkDefault true; + alyraffauf.apps.wlogout.enable = lib.mkDefault true; + alyraffauf.apps.alacritty.enable = lib.mkDefault true; + alyraffauf.apps.firefox.enable = lib.mkDefault true; + alyraffauf.apps.kanshi.enable = lib.mkDefault true; # Packages that should be installed to the user profile. home.packages = with pkgs; [ diff --git a/homeManagerModules/guiApps/default.nix b/homeManagerModules/guiApps/default.nix deleted file mode 100644 index b0ed11bb..00000000 --- a/homeManagerModules/guiApps/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - imports = [ - ./alacritty - ./chromium - ./firefox - ./fractal - ./fuzzel - ./google-chrome - ./kanshi - ./librewolf - ./mako - ./obsidian - ./tauon - ./thunderbird - ./vsCodium - ./waybar - ./webCord - ./wlogout - ./zoom - ]; - - guiApps.alacritty.enable = lib.mkDefault true; - guiApps.chromium.enable = lib.mkDefault false; - guiApps.firefox.enable = lib.mkDefault true; - guiApps.fractal.enable = lib.mkDefault true; - guiApps.google-chrome.enable = lib.mkDefault true; - guiApps.obsidian.enable = lib.mkDefault true; - guiApps.tauon.enable = lib.mkDefault true; - guiApps.thunderbird.enable = lib.mkDefault true; - guiApps.vsCodium.enable = lib.mkDefault true; - guiApps.webCord.enable = lib.mkDefault true; - guiApps.zoom.enable = lib.mkDefault true; -} diff --git a/homeManagerModules/guiApps/firefox/default.nix b/homeManagerModules/guiApps/firefox/default.nix deleted file mode 100644 index 7b57f3ac..00000000 --- a/homeManagerModules/guiApps/firefox/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = {guiApps.firefox.enable = lib.mkEnableOption "Enables Firefox.";}; - - config = lib.mkIf config.guiApps.firefox.enable { - programs.firefox = {enable = true;}; - }; -} diff --git a/homeManagerModules/guiApps/google-chrome/default.nix b/homeManagerModules/guiApps/google-chrome/default.nix deleted file mode 100644 index a699c80c..00000000 --- a/homeManagerModules/guiApps/google-chrome/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = { - guiApps.google-chrome.enable = lib.mkEnableOption "Enable Google Chrome."; - }; - - config = lib.mkIf config.guiApps.google-chrome.enable { - home.packages = with pkgs; [google-chrome]; - }; -} diff --git a/homeManagerModules/guiApps/obsidian/default.nix b/homeManagerModules/guiApps/obsidian/default.nix deleted file mode 100644 index 7225c60f..00000000 --- a/homeManagerModules/guiApps/obsidian/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = { - guiApps.obsidian.enable = lib.mkEnableOption "Enables Obsidian."; - }; - - config = lib.mkIf config.guiApps.obsidian.enable { - home.packages = with pkgs; [obsidian]; - }; -} diff --git a/homeManagerModules/guiApps/tauon/default.nix b/homeManagerModules/guiApps/tauon/default.nix deleted file mode 100644 index 1f004779..00000000 --- a/homeManagerModules/guiApps/tauon/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = {guiApps.tauon.enable = lib.mkEnableOption "Enables Tauon.";}; - - config = lib.mkIf config.guiApps.tauon.enable { - home.packages = with pkgs; [tauon]; - }; -} diff --git a/homeManagerModules/guiApps/thunderbird/default.nix b/homeManagerModules/guiApps/thunderbird/default.nix deleted file mode 100644 index c364f03e..00000000 --- a/homeManagerModules/guiApps/thunderbird/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = {guiApps.thunderbird.enable = lib.mkEnableOption "Enable Thunderbird.";}; - - config = lib.mkIf config.guiApps.thunderbird.enable { - home.packages = [pkgs.thunderbird]; - }; -} diff --git a/homeManagerModules/guiApps/webCord/default.nix b/homeManagerModules/guiApps/webCord/default.nix deleted file mode 100644 index f6a8b944..00000000 --- a/homeManagerModules/guiApps/webCord/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = {guiApps.webCord.enable = lib.mkEnableOption "Enables WebCord.";}; - - config = lib.mkIf config.guiApps.webCord.enable { - home.packages = with pkgs; [webcord]; - }; -} diff --git a/homeManagerModules/guiApps/zoom/default.nix b/homeManagerModules/guiApps/zoom/default.nix deleted file mode 100644 index ceca82ed..00000000 --- a/homeManagerModules/guiApps/zoom/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = {guiApps.zoom.enable = lib.mkEnableOption "Enables Zoom.";}; - - config = lib.mkIf config.guiApps.zoom.enable { - home.packages = with pkgs; [zoom-us]; - }; -} diff --git a/homeManagerModules/userServices/default.nix b/homeManagerModules/services/default.nix similarity index 59% rename from homeManagerModules/userServices/default.nix rename to homeManagerModules/services/default.nix index 628a77b5..99f96960 100644 --- a/homeManagerModules/userServices/default.nix +++ b/homeManagerModules/services/default.nix @@ -6,5 +6,5 @@ }: { imports = [./syncthing ./easyeffects ./mpd]; - userServices.syncthing.enable = lib.mkDefault true; + alyraffauf.services.syncthing.enable = lib.mkDefault true; } diff --git a/homeManagerModules/userServices/easyeffects/LoudnessEqualizer.json b/homeManagerModules/services/easyeffects/LoudnessEqualizer.json similarity index 100% rename from homeManagerModules/userServices/easyeffects/LoudnessEqualizer.json rename to homeManagerModules/services/easyeffects/LoudnessEqualizer.json diff --git a/homeManagerModules/userServices/easyeffects/default.nix b/homeManagerModules/services/easyeffects/default.nix similarity index 67% rename from homeManagerModules/userServices/easyeffects/default.nix rename to homeManagerModules/services/easyeffects/default.nix index ed095aa7..bd931f31 100644 --- a/homeManagerModules/userServices/easyeffects/default.nix +++ b/homeManagerModules/services/easyeffects/default.nix @@ -5,16 +5,16 @@ ... }: { options = { - userServices.easyeffects.enable = + alyraffauf.services.easyeffects.enable = lib.mkEnableOption "EasyEffects user service."; - userServices.easyeffects.preset = lib.mkOption { + alyraffauf.services.easyeffects.preset = lib.mkOption { description = "Name of preset to start with."; default = ""; type = lib.types.str; }; }; - config = lib.mkIf config.userServices.easyeffects.enable { + config = lib.mkIf config.alyraffauf.services.easyeffects.enable { xdg.configFile."easyeffects/output/framework13.json".source = ./framework13.json; @@ -23,7 +23,7 @@ services.easyeffects = { enable = true; - preset = config.userServices.easyeffects.preset; + preset = config.alyraffauf.services.easyeffects.preset; }; }; } diff --git a/homeManagerModules/userServices/easyeffects/framework13.json b/homeManagerModules/services/easyeffects/framework13.json similarity index 100% rename from homeManagerModules/userServices/easyeffects/framework13.json rename to homeManagerModules/services/easyeffects/framework13.json diff --git a/homeManagerModules/userServices/mpd/default.nix b/homeManagerModules/services/mpd/default.nix similarity index 63% rename from homeManagerModules/userServices/mpd/default.nix rename to homeManagerModules/services/mpd/default.nix index e4602cd8..d4539969 100644 --- a/homeManagerModules/userServices/mpd/default.nix +++ b/homeManagerModules/services/mpd/default.nix @@ -5,19 +5,19 @@ ... }: { options = { - userServices.mpd.enable = + alyraffauf.services.mpd.enable = lib.mkEnableOption "MPD user service."; - userServices.mpd.musicDirectory = lib.mkOption { + alyraffauf.services.mpd.musicDirectory = lib.mkOption { description = "Name of music directory"; default = config.xdg.userDirs.music; type = lib.types.str; }; }; - config = lib.mkIf config.userServices.mpd.enable { + config = lib.mkIf config.alyraffauf.services.mpd.enable { services.mpd = { enable = true; - musicDirectory = config.userServices.mpd.musicDirectory; + musicDirectory = config.alyraffauf.services.mpd.musicDirectory; }; services.mpd-mpris = { enable = true; diff --git a/homeManagerModules/userServices/syncthing/default.nix b/homeManagerModules/services/syncthing/default.nix similarity index 59% rename from homeManagerModules/userServices/syncthing/default.nix rename to homeManagerModules/services/syncthing/default.nix index 8c67c190..6f678cf3 100644 --- a/homeManagerModules/userServices/syncthing/default.nix +++ b/homeManagerModules/services/syncthing/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - userServices.syncthing.enable = + alyraffauf.services.syncthing.enable = lib.mkEnableOption "Enables syncthing as user."; }; - config = lib.mkIf config.userServices.syncthing.enable { + config = lib.mkIf config.alyraffauf.services.syncthing.enable { services.syncthing.enable = true; }; } diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index 7595803b..e7b95721 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -29,17 +29,17 @@ }; }; - systemConfig = { + alyraffauf.system = { plymouth.enable = true; - zramSwap = {enable = true;}; + zramSwap.enable = true; }; - desktop = { + alyraffauf.desktop = { enable = true; hyprland.enable = true; }; - apps = { + alyraffauf.apps = { flatpak.enable = true; podman.enable = true; steam.enable = true; diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix index dcb0e14e..b72d00b9 100644 --- a/hosts/lavaridge/home.nix +++ b/hosts/lavaridge/home.nix @@ -13,7 +13,7 @@ home.stateVersion = "23.11"; programs.home-manager.enable = true; - userServices.easyeffects = { + alyraffauf.services.easyeffects = { enable = true; preset = "framework13.json"; }; diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix index 18cddf8c..7527cee9 100644 --- a/hosts/mauville/default.nix +++ b/hosts/mauville/default.nix @@ -13,22 +13,17 @@ networking.hostName = "mauville"; # Define your hostname. - services.xserver = { - # Prevent system sleep after reboot to login screen. - displayManager.gdm.autoSuspend = false; - }; - - systemConfig = { + alyraffauf.system = { zramSwap = { enable = true; size = 100; }; }; - homeLab.enable = true; - desktop.enable = true; + alyraffauf.homeLab.enable = true; + alyraffauf.desktop.enable = true; - apps = { + alyraffauf.apps = { flatpak.enable = true; steam.enable = true; }; diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index 2933bdfe..188b64b6 100644 --- a/hosts/petalburg/default.nix +++ b/hosts/petalburg/default.nix @@ -71,17 +71,17 @@ in { environment.systemPackages = [cs-adjuster cs-adjuster-plasma pp-adjuster]; - desktop = { + alyraffauf.desktop = { enable = true; hyprland.enable = true; }; - systemConfig = { + alyraffauf.system = { plymouth.enable = true; zramSwap = {enable = true;}; }; - apps = { + alyraffauf.apps = { flatpak.enable = true; podman.enable = true; steam.enable = true; diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index da82a2d5..8eccba7c 100644 --- a/hosts/rustboro/default.nix +++ b/hosts/rustboro/default.nix @@ -44,7 +44,7 @@ networking.hostName = "rustboro"; # Define your hostname. - systemConfig = { + alyraffauf.system = { plymouth.enable = true; zramSwap = { enable = true; @@ -52,12 +52,12 @@ }; }; - desktop = { + alyraffauf.desktop = { enable = true; hyprland.enable = true; }; - apps = { + alyraffauf.apps = { flatpak.enable = true; steam.enable = false; }; diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix index d994995d..47a8b1c1 100644 --- a/hosts/rustboro/home.nix +++ b/hosts/rustboro/home.nix @@ -5,7 +5,7 @@ lib, ... }: { - userConfig.dustin.enable = true; + alyraffauf.user.dustin.enable = true; users.users.dustin.hashedPassword = "$y$j9T$OXQYhj4IWjRJWWYsSwcqf.$lCcdq9S7m0EAdej9KMHWj9flH8K2pUb2gitNhLTlLG/"; @@ -17,9 +17,9 @@ home.stateVersion = "23.11"; programs.home-manager.enable = true; - desktopEnv.hyprland.hyprpaper.randomWallpaper.enable = false; + alyraffauf.desktop.hyprland.hyprpaper.randomWallpaper.enable = false; - userServices.easyeffects = { + alyraffauf.services.easyeffects = { enable = true; preset = "LoudnessEqualizer.json"; }; @@ -35,7 +35,7 @@ home.stateVersion = "23.11"; programs.home-manager.enable = true; - userServices.easyeffects = { + alyraffauf.services.easyeffects = { enable = true; preset = "LoudnessEqualizer.json"; }; diff --git a/nixosModules/apps/flatpak/default.nix b/nixosModules/apps/flatpak/default.nix index 3c7c55d9..ba66fa70 100644 --- a/nixosModules/apps/flatpak/default.nix +++ b/nixosModules/apps/flatpak/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - apps.flatpak.enable = + alyraffauf.apps.flatpak.enable = lib.mkEnableOption "Enables flatpak support with GUI."; }; - config = lib.mkIf config.apps.flatpak.enable { + config = lib.mkIf config.alyraffauf.apps.flatpak.enable { # Needed for Flatpaks xdg.portal.enable = true; services.flatpak.enable = true; diff --git a/nixosModules/apps/nicotine-plus/default.nix b/nixosModules/apps/nicotine-plus/default.nix index 3f33f983..30cbac42 100644 --- a/nixosModules/apps/nicotine-plus/default.nix +++ b/nixosModules/apps/nicotine-plus/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - apps.nicotine-plus.enable = + alyraffauf.apps.nicotine-plus.enable = lib.mkEnableOption "Enable Nicotine+ soulseek client."; }; - config = lib.mkIf config.apps.nicotine-plus.enable { + config = lib.mkIf config.alyraffauf.apps.nicotine-plus.enable { environment.systemPackages = [ pkgs.nicotine-plus ]; networking = { firewall.allowedTCPPortRanges = [ diff --git a/nixosModules/apps/podman/default.nix b/nixosModules/apps/podman/default.nix index 54a9e401..2578e74d 100644 --- a/nixosModules/apps/podman/default.nix +++ b/nixosModules/apps/podman/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - apps.podman.enable = + alyraffauf.apps.podman.enable = lib.mkEnableOption "Enables Podman for OCI container support."; }; - config = lib.mkIf config.apps.podman.enable { + config = lib.mkIf config.alyraffauf.apps.podman.enable { virtualisation = { oci-containers = {backend = "podman";}; podman = { diff --git a/nixosModules/apps/steam/default.nix b/nixosModules/apps/steam/default.nix index 142f319a..04a39490 100644 --- a/nixosModules/apps/steam/default.nix +++ b/nixosModules/apps/steam/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - apps.steam.enable = lib.mkEnableOption "Enables Steam for video games."; + alyraffauf.apps.steam.enable = lib.mkEnableOption "Enables Steam for video games."; }; - config = lib.mkIf config.apps.steam.enable { + config = lib.mkIf config.alyraffauf.apps.steam.enable { hardware.steam-hardware.enable = true; programs.steam = { enable = true; diff --git a/nixosModules/apps/virt-manager/default.nix b/nixosModules/apps/virt-manager/default.nix index 77a2a4e6..03c7c336 100644 --- a/nixosModules/apps/virt-manager/default.nix +++ b/nixosModules/apps/virt-manager/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - apps.virt-manager.enable = + alyraffauf.apps.virt-manager.enable = lib.mkEnableOption "Enables virt-manager with TPM and EFI support."; }; - config = lib.mkIf config.apps.virt-manager.enable { + config = lib.mkIf config.alyraffauf.apps.virt-manager.enable { programs.virt-manager.enable = true; virtualisation = {libvirtd.enable = true;}; diff --git a/nixosModules/default.nix b/nixosModules/default.nix index a8d20bdb..29264838 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -3,5 +3,5 @@ pkgs, ... }: { - imports = [./apps ./desktop ./homeLab ./systemConfig ./userConfig]; + imports = [./apps ./desktop ./homeLab ./system ./user]; } diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix index f243ee86..23a1d2f7 100644 --- a/nixosModules/desktop/default.nix +++ b/nixosModules/desktop/default.nix @@ -7,11 +7,11 @@ imports = [./gnome ./hyprland ./lightdm ./plasma]; options = { - desktop.enable = + alyraffauf.desktop.enable = lib.mkEnableOption "Enable basic GUI X11 and Wayland environment."; }; - config = lib.mkIf config.desktop.enable { + config = lib.mkIf config.alyraffauf.desktop.enable { services = { gnome.gnome-keyring.enable = true; gvfs.enable = true; # Mount, trash, etc. @@ -32,6 +32,6 @@ }) ]; - desktop.hyprland.enable = lib.mkDefault true; + alyraffauf.desktop.hyprland.enable = lib.mkDefault true; }; } diff --git a/nixosModules/desktop/gnome/default.nix b/nixosModules/desktop/gnome/default.nix index 32463539..13a0e8cd 100644 --- a/nixosModules/desktop/gnome/default.nix +++ b/nixosModules/desktop/gnome/default.nix @@ -11,11 +11,11 @@ ]; options = { - desktop.gnome.enable = + alyraffauf.desktop.gnome.enable = lib.mkEnableOption "Enable GNOME desktop session."; }; - config = lib.mkIf config.desktop.gnome.enable { + config = lib.mkIf config.alyraffauf.desktop.gnome.enable { environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator gnomeExtensions.blur-my-shell diff --git a/nixosModules/desktop/gnome/fprintdFix.nix b/nixosModules/desktop/gnome/fprintdFix.nix index 8f608ba3..f884e451 100644 --- a/nixosModules/desktop/gnome/fprintdFix.nix +++ b/nixosModules/desktop/gnome/fprintdFix.nix @@ -5,12 +5,12 @@ ... }: { options = { - desktop.gnome.fprintdFix.enable = + alyraffauf.desktop.gnome.fprintdFix.enable = lib.mkEnableOption "Fixes fprintd and pam issues with GNOME Display Manager."; }; - config = lib.mkIf config.desktop.gnome.fprintdFix.enable { + config = lib.mkIf config.alyraffauf.desktop.gnome.fprintdFix.enable { # Need to change the order pam loads its modules # to get proper fingerprint behavior on GDM and the lockscreen. security.pam.services.login.fprintAuth = false; diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix index fbc1ab17..d5393aca 100644 --- a/nixosModules/desktop/hyprland/default.nix +++ b/nixosModules/desktop/hyprland/default.nix @@ -6,11 +6,11 @@ ... }: { options = { - desktop.hyprland.enable = + alyraffauf.desktop.hyprland.enable = lib.mkEnableOption "Enable hyprland and greetd."; }; - config = lib.mkIf config.desktop.hyprland.enable { + config = lib.mkIf config.alyraffauf.desktop.hyprland.enable { services.greetd = { enable = true; settings = rec { diff --git a/nixosModules/desktop/lightdm/default.nix b/nixosModules/desktop/lightdm/default.nix index 741e4dc0..bd4cfb26 100644 --- a/nixosModules/desktop/lightdm/default.nix +++ b/nixosModules/desktop/lightdm/default.nix @@ -5,12 +5,12 @@ ... }: { options = { - desktop.lightdm.enable = + alyraffauf.desktop.lightdm.enable = lib.mkEnableOption "Enables lightdm and slick greeter with Catppuccin theme."; }; - config = lib.mkIf config.desktop.lightdm.enable { + config = lib.mkIf config.alyraffauf.desktop.lightdm.enable { security.pam.services.lightdm.enableKwallet = true; security.pam.services.lightdm.enableGnomeKeyring = true; diff --git a/nixosModules/desktop/plasma/default.nix b/nixosModules/desktop/plasma/default.nix index adb12548..200e74d7 100644 --- a/nixosModules/desktop/plasma/default.nix +++ b/nixosModules/desktop/plasma/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktop.plasma.enable = + alyraffauf.desktop.plasma.enable = lib.mkEnableOption "Enable plasma desktop session."; }; - config = lib.mkIf config.desktop.plasma.enable { + config = lib.mkIf config.alyraffauf.desktop.plasma.enable { # Enable SDDM + Plasma Desktop. services = { desktopManager.plasma6.enable = true; diff --git a/nixosModules/homeLab/binaryCache/default.nix b/nixosModules/homeLab/binaryCache/default.nix index 9e578626..4d0eae28 100644 --- a/nixosModules/homeLab/binaryCache/default.nix +++ b/nixosModules/homeLab/binaryCache/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - homeLab.binaryCache.enable = lib.mkEnableOption "Enables nixpkgs cache."; + alyraffauf.homeLab.binaryCache.enable = lib.mkEnableOption "Enables nixpkgs cache."; }; - config = lib.mkIf config.homeLab.binaryCache.enable { + config = lib.mkIf config.alyraffauf.homeLab.binaryCache.enable { services.nix-serve = { enable = true; secretKeyFile = "/var/cache-priv-key.pem"; diff --git a/nixosModules/homeLab/default.nix b/nixosModules/homeLab/default.nix index e9caf176..e2fc1563 100644 --- a/nixosModules/homeLab/default.nix +++ b/nixosModules/homeLab/default.nix @@ -7,14 +7,14 @@ imports = [./binaryCache ./reverseProxy ./nixContainers ./ociContainers ./samba]; options = { - homeLab.enable = lib.mkEnableOption "Enables fully functional Home Lab."; + alyraffauf.homeLab.enable = lib.mkEnableOption "Enables fully functional Home Lab."; }; - config = lib.mkIf config.homeLab.enable { - homeLab.binaryCache.enable = lib.mkDefault true; - homeLab.nixContainers.enable = lib.mkDefault true; - homeLab.ociContainers.enable = lib.mkDefault true; - homeLab.reverseProxy.enable = lib.mkDefault true; - homeLab.samba.enable = lib.mkDefault true; + config = lib.mkIf config.alyraffauf.homeLab.enable { + alyraffauf.homeLab.binaryCache.enable = lib.mkDefault true; + alyraffauf.homeLab.nixContainers.enable = lib.mkDefault true; + alyraffauf.homeLab.ociContainers.enable = lib.mkDefault true; + alyraffauf.homeLab.reverseProxy.enable = lib.mkDefault true; + alyraffauf.homeLab.samba.enable = lib.mkDefault true; }; } diff --git a/nixosModules/homeLab/nixContainers/default.nix b/nixosModules/homeLab/nixContainers/default.nix index c377e858..ae332bba 100644 --- a/nixosModules/homeLab/nixContainers/default.nix +++ b/nixosModules/homeLab/nixContainers/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - homeLab.nixContainers.enable = + alyraffauf.homeLab.nixContainers.enable = lib.mkEnableOption "Enables select nix containers."; }; - config = lib.mkIf config.homeLab.nixContainers.enable { + config = lib.mkIf config.alyraffauf.homeLab.nixContainers.enable { containers.navidrome = { autoStart = true; bindMounts."/Music".hostPath = "/mnt/Media/Music"; diff --git a/nixosModules/homeLab/ociContainers/default.nix b/nixosModules/homeLab/ociContainers/default.nix index 2995d3e6..3de9afb6 100644 --- a/nixosModules/homeLab/ociContainers/default.nix +++ b/nixosModules/homeLab/ociContainers/default.nix @@ -5,12 +5,12 @@ ... }: { options = { - homeLab.ociContainers.enable = + alyraffauf.homeLab.ociContainers.enable = lib.mkEnableOption "Enables select OCI containers."; }; - config = lib.mkIf config.homeLab.ociContainers.enable { - apps.podman.enable = lib.mkDefault true; + config = lib.mkIf config.alyraffauf.homeLab.ociContainers.enable { + alyraffauf.apps.podman.enable = lib.mkDefault true; virtualisation.oci-containers.containers = { audiobookshelf = { diff --git a/nixosModules/homeLab/reverseProxy/default.nix b/nixosModules/homeLab/reverseProxy/default.nix index ff58e22f..dcb069d8 100644 --- a/nixosModules/homeLab/reverseProxy/default.nix +++ b/nixosModules/homeLab/reverseProxy/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - homeLab.reverseProxy.enable = + alyraffauf.homeLab.reverseProxy.enable = lib.mkEnableOption "Enables nginx reverse proxy."; }; - config = lib.mkIf config.homeLab.reverseProxy.enable { + config = lib.mkIf config.alyraffauf.homeLab.reverseProxy.enable { # services.ddclient.enable = true; # services.ddclient.configFile = "/etc/ddclient/ddclient.conf"; diff --git a/nixosModules/homeLab/samba/default.nix b/nixosModules/homeLab/samba/default.nix index da6bbcf0..19df73d3 100644 --- a/nixosModules/homeLab/samba/default.nix +++ b/nixosModules/homeLab/samba/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - homeLab.samba.enable = + alyraffauf.homeLab.samba.enable = lib.mkEnableOption "Enables /Archive and /Media samba shares."; }; - config = lib.mkIf config.homeLab.samba.enable { + config = lib.mkIf config.alyraffauf.homeLab.samba.enable { services = { samba = { enable = true; diff --git a/nixosModules/systemConfig/default.nix b/nixosModules/system/default.nix similarity index 97% rename from nixosModules/systemConfig/default.nix rename to nixosModules/system/default.nix index 3b8e48c9..734211a9 100644 --- a/nixosModules/systemConfig/default.nix +++ b/nixosModules/system/default.nix @@ -6,7 +6,7 @@ }: { imports = [./plymouth ./power-profiles-daemon ./zramSwap]; - systemConfig.power-profiles-daemon.enable = lib.mkDefault true; + alyraffauf.system.power-profiles-daemon.enable = lib.mkDefault true; time.timeZone = "America/New_York"; diff --git a/nixosModules/systemConfig/plymouth/default.nix b/nixosModules/system/plymouth/default.nix similarity index 71% rename from nixosModules/systemConfig/plymouth/default.nix rename to nixosModules/system/plymouth/default.nix index 48a73200..cce5ebe7 100644 --- a/nixosModules/systemConfig/plymouth/default.nix +++ b/nixosModules/system/plymouth/default.nix @@ -5,12 +5,12 @@ ... }: { options = { - systemConfig.plymouth.enable = + alyraffauf.system.plymouth.enable = lib.mkEnableOption "Enables plymouth boot screen with reduced text verbosity."; }; - config = lib.mkIf config.systemConfig.plymouth.enable { + config = lib.mkIf config.alyraffauf.system.plymouth.enable { boot = { consoleLogLevel = 0; initrd.verbose = false; diff --git a/nixosModules/systemConfig/power-profiles-daemon/default.nix b/nixosModules/system/power-profiles-daemon/default.nix similarity index 62% rename from nixosModules/systemConfig/power-profiles-daemon/default.nix rename to nixosModules/system/power-profiles-daemon/default.nix index 159a7653..a430069b 100644 --- a/nixosModules/systemConfig/power-profiles-daemon/default.nix +++ b/nixosModules/system/power-profiles-daemon/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - systemConfig.power-profiles-daemon.enable = + alyraffauf.system.power-profiles-daemon.enable = lib.mkEnableOption "Enables power-profiles-daemon."; }; - config = lib.mkIf config.systemConfig.power-profiles-daemon.enable { + config = lib.mkIf config.alyraffauf.system.power-profiles-daemon.enable { services = { power-profiles-daemon.enable = true; upower.enable = true; diff --git a/nixosModules/system/zramSwap/default.nix b/nixosModules/system/zramSwap/default.nix new file mode 100644 index 00000000..eb2dbafe --- /dev/null +++ b/nixosModules/system/zramSwap/default.nix @@ -0,0 +1,22 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + alyraffauf.system.zramSwap.enable = lib.mkEnableOption "Enables zram swap."; + alyraffauf.system.zramSwap.size = lib.mkOption { + description = "Percent size of the zram swap."; + default = 50; + type = lib.types.int; + }; + }; + + config = lib.mkIf config.alyraffauf.system.zramSwap.enable { + zramSwap = { + enable = true; + memoryPercent = config.alyraffauf.system.zramSwap.size; + }; + }; +} diff --git a/nixosModules/systemConfig/zramSwap/default.nix b/nixosModules/systemConfig/zramSwap/default.nix deleted file mode 100644 index d8b60979..00000000 --- a/nixosModules/systemConfig/zramSwap/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - options = { - systemConfig.zramSwap.enable = lib.mkEnableOption "Enables zram swap."; - systemConfig.zramSwap.size = lib.mkOption { - description = "Percent size of the zram swap."; - default = 50; - type = lib.types.int; - }; - }; - - config = lib.mkIf config.systemConfig.zramSwap.enable { - zramSwap = { - enable = true; - memoryPercent = config.systemConfig.zramSwap.size; - }; - }; -} diff --git a/nixosModules/userConfig/aly/default.nix b/nixosModules/user/aly/default.nix similarity index 71% rename from nixosModules/userConfig/aly/default.nix rename to nixosModules/user/aly/default.nix index 4724e0e5..44a00096 100644 --- a/nixosModules/userConfig/aly/default.nix +++ b/nixosModules/user/aly/default.nix @@ -6,10 +6,10 @@ ... }: { options = { - userConfig.aly.enable = lib.mkEnableOption "Enables Aly's user."; + alyraffauf.user.aly.enable = lib.mkEnableOption "Enables Aly's user."; }; - config = lib.mkIf config.userConfig.aly.enable { + config = lib.mkIf config.alyraffauf.user.aly.enable { # Define a user account. Don't forget to set a password with ‘passwd’. users.users.aly = { isNormalUser = true; diff --git a/nixosModules/userConfig/default.nix b/nixosModules/user/default.nix similarity index 74% rename from nixosModules/userConfig/default.nix rename to nixosModules/user/default.nix index 312c8c87..6c14dc10 100644 --- a/nixosModules/userConfig/default.nix +++ b/nixosModules/user/default.nix @@ -6,7 +6,7 @@ }: { imports = [./aly ./dustin]; - userConfig.aly.enable = lib.mkDefault true; + alyraffauf.user.aly.enable = lib.mkDefault true; home-manager = { useGlobalPkgs = true; diff --git a/nixosModules/userConfig/dustin/default.nix b/nixosModules/user/dustin/default.nix similarity index 69% rename from nixosModules/userConfig/dustin/default.nix rename to nixosModules/user/dustin/default.nix index 506cc7e0..d22c06ee 100644 --- a/nixosModules/userConfig/dustin/default.nix +++ b/nixosModules/user/dustin/default.nix @@ -5,10 +5,10 @@ ... }: { options = { - userConfig.dustin.enable = lib.mkEnableOption "Enables Dustin's user."; + alyraffauf.user.dustin.enable = lib.mkEnableOption "Enables Dustin's user."; }; - config = lib.mkIf config.userConfig.dustin.enable { + config = lib.mkIf config.alyraffauf.user.dustin.enable { # Define a user account. Don't forget to set a password with ‘passwd’. users.users.dustin = { isNormalUser = true;