From 084bc3b34f890ef4e1019c772fe300d304adbea3 Mon Sep 17 00:00:00 2001 From: cnst Date: Sun, 13 Oct 2024 18:09:15 +0200 Subject: [PATCH] some refactoring --- home/modules/browsers/chromium/default.nix | 4 +- home/modules/browsers/firefox/default.nix | 4 +- home/modules/comm/discord/default.nix | 4 +- home/modules/default.nix | 66 ++++++------ home/modules/devtools/helix/default.nix | 4 +- home/modules/devtools/neovim/default.nix | 4 +- home/modules/devtools/nixvim/default.nix | 4 +- .../devtools/nixvim/plugins/barbar.nix | 4 +- home/modules/devtools/nixvim/plugins/cmp.nix | 4 +- .../devtools/nixvim/plugins/comment.nix | 4 +- .../devtools/nixvim/plugins/conform.nix | 4 +- .../devtools/nixvim/plugins/copilot.nix | 4 +- .../devtools/nixvim/plugins/default.nix | 44 ++++---- home/modules/devtools/nixvim/plugins/efm.nix | 4 +- .../devtools/nixvim/plugins/floaterm.nix | 4 +- .../devtools/nixvim/plugins/harpoon.nix | 4 +- .../devtools/nixvim/plugins/lightline.nix | 4 +- .../devtools/nixvim/plugins/lsp-format.nix | 4 +- home/modules/devtools/nixvim/plugins/lsp.nix | 4 +- .../devtools/nixvim/plugins/lualine.nix | 4 +- .../nixvim/plugins/markdown-preview.nix | 4 +- .../devtools/nixvim/plugins/neo-tree.nix | 4 +- .../devtools/nixvim/plugins/nonels.nix | 4 +- .../devtools/nixvim/plugins/rustaceanvim.nix | 4 +- .../devtools/nixvim/plugins/startify.nix | 4 +- .../devtools/nixvim/plugins/tagbar.nix | 4 +- .../devtools/nixvim/plugins/telescope.nix | 4 +- .../devtools/nixvim/plugins/treesitter.nix | 4 +- .../devtools/nixvim/plugins/vimtex.nix | 4 +- .../modules/devtools/nixvim/plugins/yanky.nix | 4 +- home/modules/devtools/vscode/default.nix | 4 +- home/modules/display/monitors/default.nix | 60 +++++++++++ home/modules/gaming/lutris/default.nix | 4 +- home/modules/gaming/mangohud/default.nix | 4 +- home/modules/terminal/alacritty/default.nix | 4 +- home/modules/terminal/foot/default.nix | 4 +- home/modules/terminal/kitty/default.nix | 4 +- home/modules/terminal/wezterm/default.nix | 4 +- home/modules/terminal/zellij/default.nix | 4 +- home/modules/userd/blueman-applet/default.nix | 4 +- home/modules/userd/copyq/default.nix | 4 +- home/modules/userd/gpg/default.nix | 4 +- home/modules/userd/mako/default.nix | 4 +- home/modules/userd/syncthing/default.nix | 4 +- home/modules/userd/udiskie/default.nix | 4 +- home/modules/utils/anyrun/default.nix | 4 +- home/modules/utils/eza/default.nix | 4 +- home/modules/utils/misc/default.nix | 4 +- home/modules/utils/rofi/default.nix | 4 +- home/modules/utils/ssh/default.nix | 4 +- home/modules/utils/tuirun/default.nix | 4 +- home/modules/utils/waybar/default.nix | 4 +- home/modules/utils/yazi/default.nix | 4 +- home/modules/utils/zathura/default.nix | 4 +- home/modules/wm/hyprland/cnst/appearance.nix | 4 +- home/modules/wm/hyprland/cnst/default.nix | 18 ++-- home/modules/wm/hyprland/cnst/inputs.nix | 8 +- home/modules/wm/hyprland/cnst/keybinds.nix | 4 +- home/modules/wm/hyprland/cnst/rules.nix | 4 +- home/modules/wm/hyprland/cnst/startup.nix | 4 +- home/modules/wm/hyprland/default.nix | 6 +- .../wm/hyprland/toothpick/appearance.nix | 4 +- .../modules/wm/hyprland/toothpick/default.nix | 18 ++-- home/modules/wm/hyprland/toothpick/inputs.nix | 4 +- .../wm/hyprland/toothpick/keybinds.nix | 4 +- home/modules/wm/hyprland/toothpick/rules.nix | 4 +- .../modules/wm/hyprland/toothpick/startup.nix | 4 +- home/modules/wm/utils/hypridle/default.nix | 4 +- home/modules/wm/utils/hyprlock/default.nix | 4 +- home/modules/wm/utils/hyprpaper/default.nix | 4 +- home/users/cnst/default.nix | 1 + home/users/cnst/modules.nix | 12 ++- hosts/cnix/modules.nix | 6 +- hosts/default.nix | 7 +- system/modules/boot/kernel/default.nix | 6 +- system/modules/boot/loader/default.nix | 6 +- system/modules/default.nix | 102 +++++++++--------- system/modules/gaming/gamemode/default.nix | 6 +- system/modules/gaming/gamescope/default.nix | 4 +- system/modules/gaming/lutris/default.nix | 4 +- system/modules/gaming/steam/default.nix | 4 +- system/modules/gui/gnome/default.nix | 4 +- system/modules/gui/hyprland/default.nix | 4 +- system/modules/hardware/bluetooth/default.nix | 4 +- .../modules/hardware/graphics/amd/default.nix | 4 +- .../hardware/graphics/nvidia/default.nix | 4 +- system/modules/hardware/logitech/default.nix | 4 +- system/modules/hardware/network/default.nix | 4 +- system/modules/nix/nh/default.nix | 4 +- system/modules/studio/beekeeper/default.nix | 4 +- system/modules/studio/blender/default.nix | 4 +- system/modules/studio/gimp/default.nix | 4 +- system/modules/studio/inkscape/default.nix | 4 +- .../studio/mysql-workbench/default.nix | 4 +- .../modules/sysd/network/blueman/default.nix | 4 +- .../modules/sysd/network/mullvad/default.nix | 4 +- .../modules/sysd/network/openssh/default.nix | 4 +- system/modules/sysd/network/samba/default.nix | 4 +- .../modules/sysd/security/agenix/default.nix | 4 +- .../sysd/security/gnome-keyring/default.nix | 4 +- system/modules/sysd/session/dbus/default.nix | 4 +- system/modules/sysd/session/dconf/default.nix | 4 +- .../modules/sysd/session/xserver/default.nix | 4 +- system/modules/sysd/system/fwupd/default.nix | 4 +- system/modules/sysd/system/greetd/default.nix | 4 +- system/modules/sysd/system/gvfs/default.nix | 4 +- system/modules/sysd/system/kanata/default.nix | 4 +- system/modules/sysd/system/locate/default.nix | 4 +- system/modules/sysd/system/nix-ld/default.nix | 4 +- system/modules/sysd/system/pcscd/default.nix | 4 +- .../modules/sysd/system/pipewire/default.nix | 4 +- system/modules/sysd/system/powerd/default.nix | 4 +- system/modules/sysd/system/udisks/default.nix | 4 +- system/modules/sysd/system/zram/default.nix | 4 +- system/modules/utils/android/default.nix | 4 +- system/modules/utils/anyrun/default.nix | 4 +- .../modules/utils/brightnessctl/default.nix | 4 +- system/modules/utils/chaotic/default.nix | 5 +- system/modules/utils/corectrl/default.nix | 4 +- system/modules/utils/microfetch/default.nix | 4 +- system/modules/utils/misc/default.nix | 4 +- system/modules/utils/npm/default.nix | 4 +- system/modules/utils/obsidian/default.nix | 4 +- system/modules/utils/yubikey/default.nix | 4 +- system/modules/utils/zsh/default.nix | 4 +- 125 files changed, 437 insertions(+), 370 deletions(-) create mode 100644 home/modules/display/monitors/default.nix diff --git a/home/modules/browsers/chromium/default.nix b/home/modules/browsers/chromium/default.nix index 475f2c41..70870d08 100644 --- a/home/modules/browsers/chromium/default.nix +++ b/home/modules/browsers/chromium/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.browsers.chromium; + cfg = config.userModules.browsers.chromium; in { options = { - modules.browsers.chromium.enable = mkEnableOption "Enables chromium"; + userModules.browsers.chromium.enable = mkEnableOption "Enables chromium"; }; config = mkIf cfg.enable { programs.chromium = { diff --git a/home/modules/browsers/firefox/default.nix b/home/modules/browsers/firefox/default.nix index fe49fc4f..150d63bd 100644 --- a/home/modules/browsers/firefox/default.nix +++ b/home/modules/browsers/firefox/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.browsers.firefox; + cfg = config.userModules.browsers.firefox; in { imports = [ inputs.nur.hmModules.nur ]; options = { - modules.browsers.firefox.enable = mkEnableOption "Enables firefox"; + userModules.browsers.firefox.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.firefox = { diff --git a/home/modules/comm/discord/default.nix b/home/modules/comm/discord/default.nix index c20194b2..4af7aedc 100644 --- a/home/modules/comm/discord/default.nix +++ b/home/modules/comm/discord/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.comm.discord; + cfg = config.userModules.comm.discord; in { options = { - modules.comm.discord.enable = mkEnableOption "Enables discord"; + userModules.comm.discord.enable = mkEnableOption "Enables discord"; }; config = mkIf cfg.enable { home.packages = with pkgs; [vesktop]; diff --git a/home/modules/default.nix b/home/modules/default.nix index de760751..63627e92 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,36 +1,36 @@ -{userModules, ...}: { +{umodPath, ...}: { imports = [ - "${userModules}/browsers/chromium" - "${userModules}/browsers/firefox" - "${userModules}/comm/discord" - "${userModules}/devtools/neovim" - "${userModules}/devtools/vscode" - "${userModules}/devtools/helix" - "${userModules}/gaming/lutris" - "${userModules}/gaming/mangohud" - "${userModules}/terminal/alacritty" - "${userModules}/terminal/foot" - "${userModules}/terminal/kitty" - "${userModules}/terminal/wezterm" - "${userModules}/terminal/zellij" - "${userModules}/userd/copyq" - "${userModules}/userd/blueman-applet" - "${userModules}/userd/mako" - "${userModules}/userd/udiskie" - "${userModules}/userd/gpg" - "${userModules}/userd/syncthing" - "${userModules}/utils/anyrun" - "${userModules}/utils/misc" - "${userModules}/utils/rofi" - "${userModules}/utils/waybar" - "${userModules}/utils/yazi" - "${userModules}/utils/zathura" - "${userModules}/utils/tuirun" - "${userModules}/utils/eza" - "${userModules}/utils/ssh" - "${userModules}/wm/hyprland" - "${userModules}/wm/utils/hypridle" - "${userModules}/wm/utils/hyprlock" - "${userModules}/wm/utils/hyprpaper" + "${umodPath}/browsers/chromium" + "${umodPath}/browsers/firefox" + "${umodPath}/comm/discord" + "${umodPath}/devtools/neovim" + "${umodPath}/devtools/vscode" + "${umodPath}/devtools/helix" + "${umodPath}/gaming/lutris" + "${umodPath}/gaming/mangohud" + "${umodPath}/terminal/alacritty" + "${umodPath}/terminal/foot" + "${umodPath}/terminal/kitty" + "${umodPath}/terminal/wezterm" + "${umodPath}/terminal/zellij" + "${umodPath}/userd/copyq" + "${umodPath}/userd/blueman-applet" + "${umodPath}/userd/mako" + "${umodPath}/userd/udiskie" + "${umodPath}/userd/gpg" + "${umodPath}/userd/syncthing" + "${umodPath}/utils/anyrun" + "${umodPath}/utils/misc" + "${umodPath}/utils/rofi" + "${umodPath}/utils/waybar" + "${umodPath}/utils/yazi" + "${umodPath}/utils/zathura" + "${umodPath}/utils/tuirun" + "${umodPath}/utils/eza" + "${umodPath}/utils/ssh" + "${umodPath}/wm/hyprland" + "${umodPath}/wm/utils/hypridle" + "${umodPath}/wm/utils/hyprlock" + "${umodPath}/wm/utils/hyprpaper" ]; } diff --git a/home/modules/devtools/helix/default.nix b/home/modules/devtools/helix/default.nix index b496d953..89e2d11e 100644 --- a/home/modules/devtools/helix/default.nix +++ b/home/modules/devtools/helix/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.devtools.helix; + cfg = config.userModules.devtools.helix; in { imports = [ ./lang.nix @@ -14,7 +14,7 @@ in { ]; options = { - modules.devtools.helix.enable = mkEnableOption "Enable helix"; + userModules.devtools.helix.enable = mkEnableOption "Enable helix"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/neovim/default.nix b/home/modules/devtools/neovim/default.nix index 7797af13..500bd208 100644 --- a/home/modules/devtools/neovim/default.nix +++ b/home/modules/devtools/neovim/default.nix @@ -5,7 +5,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.devtools.neovim; + cfg = config.userModules.devtools.neovim; in { imports = [ ./plugins @@ -15,7 +15,7 @@ in { ]; options = { - modules.devtools.neovim.enable = mkEnableOption "Enable neovim"; + userModules.devtools.neovim.enable = mkEnableOption "Enable neovim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/default.nix b/home/modules/devtools/nixvim/default.nix index e6e59a7d..379f16cf 100644 --- a/home/modules/devtools/nixvim/default.nix +++ b/home/modules/devtools/nixvim/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.devtools.nixvim; + cfg = config.userModules.devtools.nixvim; in { imports = [ inputs.nixvim.homeManagerModules.nixvim @@ -18,7 +18,7 @@ in { ]; options = { - modules.devtools.nixvim.enable = mkEnableOption "Enable nixvim"; + userModules.devtools.nixvim.enable = mkEnableOption "Enable nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/barbar.nix b/home/modules/devtools/nixvim/plugins/barbar.nix index 55e00285..818db01d 100644 --- a/home/modules/devtools/nixvim/plugins/barbar.nix +++ b/home/modules/devtools/nixvim/plugins/barbar.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.barbar; + cfg = config.userModules.devtools.nixvim.plugins.barbar; in { options = { - modules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim"; + userModules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/cmp.nix b/home/modules/devtools/nixvim/plugins/cmp.nix index 46b7d841..204eb10f 100644 --- a/home/modules/devtools/nixvim/plugins/cmp.nix +++ b/home/modules/devtools/nixvim/plugins/cmp.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.cmp; + cfg = config.userModules.devtools.nixvim.plugins.cmp; in { options = { - modules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim"; + userModules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/comment.nix b/home/modules/devtools/nixvim/plugins/comment.nix index c133772d..04a9b6d3 100644 --- a/home/modules/devtools/nixvim/plugins/comment.nix +++ b/home/modules/devtools/nixvim/plugins/comment.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.comment; + cfg = config.userModules.devtools.nixvim.plugins.comment; in { options = { - modules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim"; + userModules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/conform.nix b/home/modules/devtools/nixvim/plugins/conform.nix index d17da91b..7fa00d81 100644 --- a/home/modules/devtools/nixvim/plugins/conform.nix +++ b/home/modules/devtools/nixvim/plugins/conform.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.conform; + cfg = config.userModules.devtools.nixvim.plugins.conform; in { options = { - modules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim"; + userModules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/copilot.nix b/home/modules/devtools/nixvim/plugins/copilot.nix index c156fb1c..f0a8ae53 100644 --- a/home/modules/devtools/nixvim/plugins/copilot.nix +++ b/home/modules/devtools/nixvim/plugins/copilot.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.copilot; + cfg = config.userModules.devtools.nixvim.plugins.copilot; in { options = { - modules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim"; + userModules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/default.nix b/home/modules/devtools/nixvim/plugins/default.nix index b6bbac48..d33c6026 100644 --- a/home/modules/devtools/nixvim/plugins/default.nix +++ b/home/modules/devtools/nixvim/plugins/default.nix @@ -1,25 +1,25 @@ -{userModules, ...}: { +{umodPath, ...}: { imports = [ - "${userModules}/devtools/nixvim/plugins/barbar.nix" - "${userModules}/devtools/nixvim/plugins/comment.nix" - "${userModules}/devtools/nixvim/plugins/conform.nix" - "${userModules}/devtools/nixvim/plugins/cmp.nix" - "${userModules}/devtools/nixvim/plugins/copilot.nix" - "${userModules}/devtools/nixvim/plugins/efm.nix" - "${userModules}/devtools/nixvim/plugins/floaterm.nix" - "${userModules}/devtools/nixvim/plugins/harpoon.nix" - "${userModules}/devtools/nixvim/plugins/lsp.nix" - "${userModules}/devtools/nixvim/plugins/lualine.nix" - "${userModules}/devtools/nixvim/plugins/lightline.nix" - "${userModules}/devtools/nixvim/plugins/markdown-preview.nix" - "${userModules}/devtools/nixvim/plugins/neo-tree.nix" - "${userModules}/devtools/nixvim/plugins/nonels.nix" - "${userModules}/devtools/nixvim/plugins/rustaceanvim.nix" - "${userModules}/devtools/nixvim/plugins/startify.nix" - "${userModules}/devtools/nixvim/plugins/tagbar.nix" - "${userModules}/devtools/nixvim/plugins/telescope.nix" - "${userModules}/devtools/nixvim/plugins/treesitter.nix" - "${userModules}/devtools/nixvim/plugins/vimtex.nix" - "${userModules}/devtools/nixvim/plugins/yanky.nix" + "${umodPath}/devtools/nixvim/plugins/barbar.nix" + "${umodPath}/devtools/nixvim/plugins/comment.nix" + "${umodPath}/devtools/nixvim/plugins/conform.nix" + "${umodPath}/devtools/nixvim/plugins/cmp.nix" + "${umodPath}/devtools/nixvim/plugins/copilot.nix" + "${umodPath}/devtools/nixvim/plugins/efm.nix" + "${umodPath}/devtools/nixvim/plugins/floaterm.nix" + "${umodPath}/devtools/nixvim/plugins/harpoon.nix" + "${umodPath}/devtools/nixvim/plugins/lsp.nix" + "${umodPath}/devtools/nixvim/plugins/lualine.nix" + "${umodPath}/devtools/nixvim/plugins/lightline.nix" + "${umodPath}/devtools/nixvim/plugins/markdown-preview.nix" + "${umodPath}/devtools/nixvim/plugins/neo-tree.nix" + "${umodPath}/devtools/nixvim/plugins/nonels.nix" + "${umodPath}/devtools/nixvim/plugins/rustaceanvim.nix" + "${umodPath}/devtools/nixvim/plugins/startify.nix" + "${umodPath}/devtools/nixvim/plugins/tagbar.nix" + "${umodPath}/devtools/nixvim/plugins/telescope.nix" + "${umodPath}/devtools/nixvim/plugins/treesitter.nix" + "${umodPath}/devtools/nixvim/plugins/vimtex.nix" + "${umodPath}/devtools/nixvim/plugins/yanky.nix" ]; } diff --git a/home/modules/devtools/nixvim/plugins/efm.nix b/home/modules/devtools/nixvim/plugins/efm.nix index 56d7afb3..7663e4d4 100644 --- a/home/modules/devtools/nixvim/plugins/efm.nix +++ b/home/modules/devtools/nixvim/plugins/efm.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.efm; + cfg = config.userModules.devtools.nixvim.plugins.efm; in { options = { - modules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim"; + userModules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/floaterm.nix b/home/modules/devtools/nixvim/plugins/floaterm.nix index 5dfe6f17..e09fd22e 100644 --- a/home/modules/devtools/nixvim/plugins/floaterm.nix +++ b/home/modules/devtools/nixvim/plugins/floaterm.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.floaterm; + cfg = config.userModules.devtools.nixvim.plugins.floaterm; in { options = { - modules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim"; + userModules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/harpoon.nix b/home/modules/devtools/nixvim/plugins/harpoon.nix index c930eb76..d48c659a 100644 --- a/home/modules/devtools/nixvim/plugins/harpoon.nix +++ b/home/modules/devtools/nixvim/plugins/harpoon.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.harpoon; + cfg = config.userModules.devtools.nixvim.plugins.harpoon; in { options = { - modules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim"; + userModules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/lightline.nix b/home/modules/devtools/nixvim/plugins/lightline.nix index 12f35f11..08052418 100644 --- a/home/modules/devtools/nixvim/plugins/lightline.nix +++ b/home/modules/devtools/nixvim/plugins/lightline.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.lightline; + cfg = config.userModules.devtools.nixvim.plugins.lightline; in { options = { - modules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim"; + userModules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/lsp-format.nix b/home/modules/devtools/nixvim/plugins/lsp-format.nix index 493c98f8..f27c1b3e 100644 --- a/home/modules/devtools/nixvim/plugins/lsp-format.nix +++ b/home/modules/devtools/nixvim/plugins/lsp-format.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.lsp-format; + cfg = config.userModules.devtools.nixvim.plugins.lsp-format; in { options = { - modules.devtools.nixvim.plugins.lsp-format = { + userModules.devtools.nixvim.plugins.lsp-format = { enable = mkEnableOption "Enables LSP formatting support for nixvim"; }; }; diff --git a/home/modules/devtools/nixvim/plugins/lsp.nix b/home/modules/devtools/nixvim/plugins/lsp.nix index 99a256f7..b944762b 100644 --- a/home/modules/devtools/nixvim/plugins/lsp.nix +++ b/home/modules/devtools/nixvim/plugins/lsp.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.lsp; + cfg = config.userModules.devtools.nixvim.plugins.lsp; in { options = { - modules.devtools.nixvim.plugins.lsp = { + userModules.devtools.nixvim.plugins.lsp = { enable = mkEnableOption "Enables LSP support for nixvim"; }; }; diff --git a/home/modules/devtools/nixvim/plugins/lualine.nix b/home/modules/devtools/nixvim/plugins/lualine.nix index 1016f69e..7a13defd 100644 --- a/home/modules/devtools/nixvim/plugins/lualine.nix +++ b/home/modules/devtools/nixvim/plugins/lualine.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.lualine; + cfg = config.userModules.devtools.nixvim.plugins.lualine; in { options = { - modules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim"; + userModules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/markdown-preview.nix b/home/modules/devtools/nixvim/plugins/markdown-preview.nix index 22012ec2..f8b5e936 100644 --- a/home/modules/devtools/nixvim/plugins/markdown-preview.nix +++ b/home/modules/devtools/nixvim/plugins/markdown-preview.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.markdown-preview; + cfg = config.userModules.devtools.nixvim.plugins.markdown-preview; in { options = { - modules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim"; + userModules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/neo-tree.nix b/home/modules/devtools/nixvim/plugins/neo-tree.nix index 9dd7b065..d28e0e92 100644 --- a/home/modules/devtools/nixvim/plugins/neo-tree.nix +++ b/home/modules/devtools/nixvim/plugins/neo-tree.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.neo-tree; + cfg = config.userModules.devtools.nixvim.plugins.neo-tree; in { options = { - modules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim"; + userModules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/nonels.nix b/home/modules/devtools/nixvim/plugins/nonels.nix index fe1d1b9f..466dbb16 100644 --- a/home/modules/devtools/nixvim/plugins/nonels.nix +++ b/home/modules/devtools/nixvim/plugins/nonels.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.none-ls; + cfg = config.userModules.devtools.nixvim.plugins.none-ls; in { options = { - modules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim"; + userModules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/rustaceanvim.nix b/home/modules/devtools/nixvim/plugins/rustaceanvim.nix index 88394825..488aa21f 100644 --- a/home/modules/devtools/nixvim/plugins/rustaceanvim.nix +++ b/home/modules/devtools/nixvim/plugins/rustaceanvim.nix @@ -4,9 +4,9 @@ ... }: with lib; let - cfg = config.modules.devtools.nixvim.plugins.rustaceanvim; + cfg = config.userModules.devtools.nixvim.plugins.rustaceanvim; in { - options.modules.devtools.nixvim.plugins.rustaceanvim = { + options.userModules.devtools.nixvim.plugins.rustaceanvim = { enable = mkEnableOption "Whether to enable rustaceanvim."; }; diff --git a/home/modules/devtools/nixvim/plugins/startify.nix b/home/modules/devtools/nixvim/plugins/startify.nix index f107cb21..184b6902 100644 --- a/home/modules/devtools/nixvim/plugins/startify.nix +++ b/home/modules/devtools/nixvim/plugins/startify.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.startify; + cfg = config.userModules.devtools.nixvim.plugins.startify; in { options = { - modules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim"; + userModules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/tagbar.nix b/home/modules/devtools/nixvim/plugins/tagbar.nix index ee37c69a..bdcca0bc 100644 --- a/home/modules/devtools/nixvim/plugins/tagbar.nix +++ b/home/modules/devtools/nixvim/plugins/tagbar.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.tagbar; + cfg = config.userModules.devtools.nixvim.plugins.tagbar; in { options = { - modules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim"; + userModules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/telescope.nix b/home/modules/devtools/nixvim/plugins/telescope.nix index e408cec9..ef33161d 100644 --- a/home/modules/devtools/nixvim/plugins/telescope.nix +++ b/home/modules/devtools/nixvim/plugins/telescope.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.telescope; + cfg = config.userModules.devtools.nixvim.plugins.telescope; in { options = { - modules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim"; + userModules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/treesitter.nix b/home/modules/devtools/nixvim/plugins/treesitter.nix index 682d36d7..499ad1c7 100644 --- a/home/modules/devtools/nixvim/plugins/treesitter.nix +++ b/home/modules/devtools/nixvim/plugins/treesitter.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.treesitter; + cfg = config.userModules.devtools.nixvim.plugins.treesitter; in { options = { - modules.devtools.nixvim.plugins = { + userModules.devtools.nixvim.plugins = { treesitter.enable = mkEnableOption "Enables Treesitter plugin for nixvim"; }; }; diff --git a/home/modules/devtools/nixvim/plugins/vimtex.nix b/home/modules/devtools/nixvim/plugins/vimtex.nix index 71356192..6d5ee55f 100644 --- a/home/modules/devtools/nixvim/plugins/vimtex.nix +++ b/home/modules/devtools/nixvim/plugins/vimtex.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.vimtex; + cfg = config.userModules.devtools.nixvim.plugins.vimtex; in { options = { - modules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim"; + userModules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/yanky.nix b/home/modules/devtools/nixvim/plugins/yanky.nix index f6c153a5..1d2764ca 100644 --- a/home/modules/devtools/nixvim/plugins/yanky.nix +++ b/home/modules/devtools/nixvim/plugins/yanky.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.modules.devtools.nixvim.plugins.yanky; + cfg = config.userModules.devtools.nixvim.plugins.yanky; in { options = { - modules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim"; + userModules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/vscode/default.nix b/home/modules/devtools/vscode/default.nix index 1a5f475c..9078558b 100644 --- a/home/modules/devtools/vscode/default.nix +++ b/home/modules/devtools/vscode/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.devtools.vscode; + cfg = config.userModules.devtools.vscode; in { options = { - modules.devtools.vscode.enable = mkEnableOption "Enables vscode"; + userModules.devtools.vscode.enable = mkEnableOption "Enables vscode"; }; config = mkIf cfg.enable { programs.vscode = { diff --git a/home/modules/display/monitors/default.nix b/home/modules/display/monitors/default.nix new file mode 100644 index 00000000..0255a4cd --- /dev/null +++ b/home/modules/display/monitors/default.nix @@ -0,0 +1,60 @@ +{ + lib, + config, + ... +}: let + inherit (lib) mkOption types; + cfg = config.userModules.display.monitors; +in { + options.userModules.display.monitors = mkOption { + type = types.listOf ( + types.submodule { + options = { + name = mkOption { + type = types.str; + example = "DP-1"; + }; + primary = mkOption { + type = types.bool; + default = false; + }; + width = mkOption { + type = types.int; + example = 1920; + }; + height = mkOption { + type = types.int; + example = 1080; + }; + refreshRate = mkOption { + type = types.int; + default = 60; + }; + position = mkOption { + type = types.str; + default = "auto"; + }; + enabled = mkOption { + type = types.bool; + default = true; + }; + workspace = mkOption { + type = types.nullOr types.str; + default = null; + }; + }; + } + ); + default = []; + }; + config = { + assertions = [ + { + assertion = + ((lib.length cfg) != 0) + -> ((lib.length (lib.filter (m: m.primary) cfg)) == 1); + message = "Exactly one monitor must be set to primary."; + } + ]; + }; +} diff --git a/home/modules/gaming/lutris/default.nix b/home/modules/gaming/lutris/default.nix index 7451a824..8103d773 100644 --- a/home/modules/gaming/lutris/default.nix +++ b/home/modules/gaming/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gaming.lutris; + cfg = config.userModules.gaming.lutris; in { options = { - modules.gaming.lutris.enable = mkEnableOption "Enables lutris"; + userModules.gaming.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { home.packages = [ diff --git a/home/modules/gaming/mangohud/default.nix b/home/modules/gaming/mangohud/default.nix index 1daec3c5..99b77de5 100644 --- a/home/modules/gaming/mangohud/default.nix +++ b/home/modules/gaming/mangohud/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gaming.mangohud; + cfg = config.userModules.gaming.mangohud; in { options = { - modules.gaming.mangohud.enable = mkEnableOption "Enables mangohud"; + userModules.gaming.mangohud.enable = mkEnableOption "Enables mangohud"; }; config = mkIf cfg.enable { programs.mangohud = { diff --git a/home/modules/terminal/alacritty/default.nix b/home/modules/terminal/alacritty/default.nix index 692aef1f..eb4be755 100644 --- a/home/modules/terminal/alacritty/default.nix +++ b/home/modules/terminal/alacritty/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.terminal.alacritty; + cfg = config.userModules.terminal.alacritty; in { options = { - modules.terminal.alacritty.enable = mkEnableOption "Enables firefox"; + userModules.terminal.alacritty.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.alacritty = { diff --git a/home/modules/terminal/foot/default.nix b/home/modules/terminal/foot/default.nix index f8fd7765..0882be7d 100644 --- a/home/modules/terminal/foot/default.nix +++ b/home/modules/terminal/foot/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.terminal.foot; + cfg = config.userModules.terminal.foot; in { options = { - modules.terminal.foot.enable = mkEnableOption "Enables foot terminal"; + userModules.terminal.foot.enable = mkEnableOption "Enables foot terminal"; }; config = mkIf cfg.enable { programs.foot = { diff --git a/home/modules/terminal/kitty/default.nix b/home/modules/terminal/kitty/default.nix index 7980507b..d6503e32 100644 --- a/home/modules/terminal/kitty/default.nix +++ b/home/modules/terminal/kitty/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.terminal.kitty; + cfg = config.userModules.terminal.kitty; in { options = { - modules.terminal.kitty.enable = mkEnableOption "Enables kitty terminal"; + userModules.terminal.kitty.enable = mkEnableOption "Enables kitty terminal"; }; config = mkIf cfg.enable { programs.kitty = { diff --git a/home/modules/terminal/wezterm/default.nix b/home/modules/terminal/wezterm/default.nix index 237ca6f5..00dd06ed 100644 --- a/home/modules/terminal/wezterm/default.nix +++ b/home/modules/terminal/wezterm/default.nix @@ -9,10 +9,10 @@ weztermPkg = pkgs.wezterm; # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default; inherit (lib) mkIf mkEnableOption; - cfg = config.modules.terminal.wezterm; + cfg = config.userModules.terminal.wezterm; in { options = { - modules.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal"; + userModules.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal"; }; config = mkIf cfg.enable { programs.wezterm = { diff --git a/home/modules/terminal/zellij/default.nix b/home/modules/terminal/zellij/default.nix index 5c401de3..b5a070e1 100644 --- a/home/modules/terminal/zellij/default.nix +++ b/home/modules/terminal/zellij/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.terminal.zellij; + cfg = config.userModules.terminal.zellij; in { options = { - modules.terminal.zellij.enable = mkEnableOption "Enables zellij"; + userModules.terminal.zellij.enable = mkEnableOption "Enables zellij"; }; config = mkIf cfg.enable { programs.zellij = { diff --git a/home/modules/userd/blueman-applet/default.nix b/home/modules/userd/blueman-applet/default.nix index 33db38f4..b458d78a 100644 --- a/home/modules/userd/blueman-applet/default.nix +++ b/home/modules/userd/blueman-applet/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.userd.blueman-applet; + cfg = config.userModules.userd.blueman-applet; in { options = { - modules.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet"; + userModules.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet"; }; config = mkIf cfg.enable { services.blueman-applet = { diff --git a/home/modules/userd/copyq/default.nix b/home/modules/userd/copyq/default.nix index e6e78a67..a4de728e 100644 --- a/home/modules/userd/copyq/default.nix +++ b/home/modules/userd/copyq/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.userd.copyq; + cfg = config.userModules.userd.copyq; in { options = { - modules.userd.copyq.enable = mkEnableOption "Enables copyq"; + userModules.userd.copyq.enable = mkEnableOption "Enables copyq"; }; config = mkIf cfg.enable { services.copyq = { diff --git a/home/modules/userd/gpg/default.nix b/home/modules/userd/gpg/default.nix index 59cfa8a3..8fe21227 100644 --- a/home/modules/userd/gpg/default.nix +++ b/home/modules/userd/gpg/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.userd.gpg; + cfg = config.userModules.userd.gpg; in { options = { - modules.userd.gpg.enable = mkEnableOption "Enables gpg"; + userModules.userd.gpg.enable = mkEnableOption "Enables gpg"; }; config = mkIf cfg.enable { services.gpg-agent = { diff --git a/home/modules/userd/mako/default.nix b/home/modules/userd/mako/default.nix index 304e008c..b7b80077 100644 --- a/home/modules/userd/mako/default.nix +++ b/home/modules/userd/mako/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.userd.mako; + cfg = config.userModules.userd.mako; in { options = { - modules.userd.mako.enable = mkEnableOption "Enables mako"; + userModules.userd.mako.enable = mkEnableOption "Enables mako"; }; config = mkIf cfg.enable { services.mako = { diff --git a/home/modules/userd/syncthing/default.nix b/home/modules/userd/syncthing/default.nix index 75f746fe..ac1ffe66 100644 --- a/home/modules/userd/syncthing/default.nix +++ b/home/modules/userd/syncthing/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.userd.syncthing; + cfg = config.userModules.userd.syncthing; in { options = { - modules.userd.syncthing.enable = mkEnableOption "Enables syncthing"; + userModules.userd.syncthing.enable = mkEnableOption "Enables syncthing"; }; config = mkIf cfg.enable { services.syncthing = { diff --git a/home/modules/userd/udiskie/default.nix b/home/modules/userd/udiskie/default.nix index 9e9029a7..789baadf 100644 --- a/home/modules/userd/udiskie/default.nix +++ b/home/modules/userd/udiskie/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.userd.udiskie; + cfg = config.userModules.userd.udiskie; in { options = { - modules.userd.udiskie.enable = mkEnableOption "Enables udiskie"; + userModules.userd.udiskie.enable = mkEnableOption "Enables udiskie"; }; config = mkIf cfg.enable { services.udiskie = { diff --git a/home/modules/utils/anyrun/default.nix b/home/modules/utils/anyrun/default.nix index 74d6f8e1..765efe59 100644 --- a/home/modules/utils/anyrun/default.nix +++ b/home/modules/utils/anyrun/default.nix @@ -5,13 +5,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.anyrun; + cfg = config.userModules.utils.anyrun; in { imports = [ inputs.anyrun.homeManagerModules.default ]; options = { - modules.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + userModules.utils.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { programs.anyrun = { diff --git a/home/modules/utils/eza/default.nix b/home/modules/utils/eza/default.nix index 2a22dd6b..c6ee37fc 100644 --- a/home/modules/utils/eza/default.nix +++ b/home/modules/utils/eza/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.eza; + cfg = config.userModules.utils.eza; in { options = { - modules.utils.eza.enable = mkEnableOption "Enables eza"; + userModules.utils.eza.enable = mkEnableOption "Enables eza"; }; config = mkIf cfg.enable { programs.eza = { diff --git a/home/modules/utils/misc/default.nix b/home/modules/utils/misc/default.nix index 5f9bc6f7..0d687e32 100644 --- a/home/modules/utils/misc/default.nix +++ b/home/modules/utils/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.misc; + cfg = config.userModules.utils.misc; in { options = { - modules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; + userModules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; }; config = mkIf cfg.enable { programs = { diff --git a/home/modules/utils/rofi/default.nix b/home/modules/utils/rofi/default.nix index 9d948e0a..2c0407ab 100644 --- a/home/modules/utils/rofi/default.nix +++ b/home/modules/utils/rofi/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.rofi; + cfg = config.userModules.utils.rofi; in { options = { - modules.utils.rofi.enable = mkEnableOption "Enables firefox"; + userModules.utils.rofi.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.rofi = { diff --git a/home/modules/utils/ssh/default.nix b/home/modules/utils/ssh/default.nix index dd9a3a1b..38d42ea4 100644 --- a/home/modules/utils/ssh/default.nix +++ b/home/modules/utils/ssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.ssh; + cfg = config.userModules.utils.ssh; in { options = { - modules.utils.ssh.enable = mkEnableOption "Enables ssh"; + userModules.utils.ssh.enable = mkEnableOption "Enables ssh"; }; config = mkIf cfg.enable { programs.ssh = { diff --git a/home/modules/utils/tuirun/default.nix b/home/modules/utils/tuirun/default.nix index b939f886..2490f0ab 100644 --- a/home/modules/utils/tuirun/default.nix +++ b/home/modules/utils/tuirun/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.tuirun; + cfg = config.userModules.utils.tuirun; in { imports = [ inputs.tuirun.homeManagerModules.default ]; options = { - modules.utils.tuirun.enable = mkEnableOption "Enables tuirun"; + userModules.utils.tuirun.enable = mkEnableOption "Enables tuirun"; }; config = mkIf cfg.enable { programs.tuirun = { diff --git a/home/modules/utils/waybar/default.nix b/home/modules/utils/waybar/default.nix index 967a53ec..1a80a68f 100644 --- a/home/modules/utils/waybar/default.nix +++ b/home/modules/utils/waybar/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.waybar; + cfg = config.userModules.utils.waybar; in { options = { - modules.utils.waybar.enable = mkEnableOption "Enables waybar"; + userModules.utils.waybar.enable = mkEnableOption "Enables waybar"; }; config = mkIf cfg.enable { systemd.user.services.waybar = { diff --git a/home/modules/utils/yazi/default.nix b/home/modules/utils/yazi/default.nix index f004d1d5..97b97331 100644 --- a/home/modules/utils/yazi/default.nix +++ b/home/modules/utils/yazi/default.nix @@ -5,14 +5,14 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.yazi; + cfg = config.userModules.utils.yazi; in { imports = [ ./theme ]; options = { - modules.utils.yazi.enable = mkEnableOption "Enables yazi"; + userModules.utils.yazi.enable = mkEnableOption "Enables yazi"; }; config = mkIf cfg.enable { programs.yazi = { diff --git a/home/modules/utils/zathura/default.nix b/home/modules/utils/zathura/default.nix index 673e49d1..a730cff8 100644 --- a/home/modules/utils/zathura/default.nix +++ b/home/modules/utils/zathura/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.zathura; + cfg = config.userModules.utils.zathura; in { options = { - modules.utils.zathura.enable = mkEnableOption "Enables zathura"; + userModules.utils.zathura.enable = mkEnableOption "Enables zathura"; }; config = mkIf cfg.enable { programs.zathura = { diff --git a/home/modules/wm/hyprland/cnst/appearance.nix b/home/modules/wm/hyprland/cnst/appearance.nix index 42e232da..41fd10ea 100644 --- a/home/modules/wm/hyprland/cnst/appearance.nix +++ b/home/modules/wm/hyprland/cnst/appearance.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.cnst.appearance; + cfg = config.userModules.wm.hyprland.cnst.appearance; in { options = { - modules.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; + userModules.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/default.nix b/home/modules/wm/hyprland/cnst/default.nix index 0c352b9e..a37ca666 100644 --- a/home/modules/wm/hyprland/cnst/default.nix +++ b/home/modules/wm/hyprland/cnst/default.nix @@ -3,26 +3,26 @@ config, lib, pkgs, - userModules, + umodPath, ... }: let inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.modules.wm.hyprland.cnst; + cfg = config.userModules.wm.hyprland.cnst; in { imports = [ - "${userModules}/wm/hyprland/cnst/appearance.nix" - "${userModules}/wm/hyprland/cnst/inputs.nix" - "${userModules}/wm/hyprland/cnst/keybinds.nix" - "${userModules}/wm/hyprland/cnst/rules.nix" - "${userModules}/wm/hyprland/cnst/startup.nix" + "${umodPath}/wm/hyprland/cnst/appearance.nix" + "${umodPath}/wm/hyprland/cnst/inputs.nix" + "${umodPath}/wm/hyprland/cnst/keybinds.nix" + "${umodPath}/wm/hyprland/cnst/rules.nix" + "${umodPath}/wm/hyprland/cnst/startup.nix" ]; options = { - modules.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland"; + userModules.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland"; }; config = mkIf cfg.enable { - modules.wm.hyprland.cnst = { + userModules.wm.hyprland.cnst = { appearance.enable = mkDefault cfg.enable; inputs.enable = mkDefault cfg.enable; keybinds.enable = mkDefault cfg.enable; diff --git a/home/modules/wm/hyprland/cnst/inputs.nix b/home/modules/wm/hyprland/cnst/inputs.nix index a383fd9b..519c166f 100644 --- a/home/modules/wm/hyprland/cnst/inputs.nix +++ b/home/modules/wm/hyprland/cnst/inputs.nix @@ -4,15 +4,15 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.cnst.inputs; + cfg = config.userModules.wm.hyprland.cnst.inputs; in { options = { - modules.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; + userModules.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { monitor = [ - "DP-3, 2560x1440@239.97, auto, auto, bitdepth, 10" + "DP-3, 2560x1440@240, auto, auto, bitdepth, 10" "eDP-1,1920x1200@60.02,auto,1" ]; env = [ @@ -63,7 +63,7 @@ in { workspace_swipe_create_new = true; }; misc = { - vrr = 2; + vrr = 0; mouse_move_enables_dpms = 1; key_press_enables_dpms = 0; force_default_wallpaper = 0; diff --git a/home/modules/wm/hyprland/cnst/keybinds.nix b/home/modules/wm/hyprland/cnst/keybinds.nix index d8c23c02..cd02eb3a 100644 --- a/home/modules/wm/hyprland/cnst/keybinds.nix +++ b/home/modules/wm/hyprland/cnst/keybinds.nix @@ -14,10 +14,10 @@ if osConfig.networking.hostName == "cnixpad" then "foot" else "alacritty"; - cfg = config.modules.wm.hyprland.cnst.keybinds; + cfg = config.userModules.wm.hyprland.cnst.keybinds; in { options = { - modules.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; + userModules.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/rules.nix b/home/modules/wm/hyprland/cnst/rules.nix index 7aefd9bb..8ece15fa 100644 --- a/home/modules/wm/hyprland/cnst/rules.nix +++ b/home/modules/wm/hyprland/cnst/rules.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.cnst.rules; + cfg = config.userModules.wm.hyprland.cnst.rules; in { options = { - modules.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; + userModules.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/startup.nix b/home/modules/wm/hyprland/cnst/startup.nix index 9530ed79..8cc46f64 100644 --- a/home/modules/wm/hyprland/cnst/startup.nix +++ b/home/modules/wm/hyprland/cnst/startup.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.cnst.startup; + cfg = config.userModules.wm.hyprland.cnst.startup; in { options = { - modules.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; + userModules.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/default.nix b/home/modules/wm/hyprland/default.nix index 16bb70e0..a0ec09ac 100644 --- a/home/modules/wm/hyprland/default.nix +++ b/home/modules/wm/hyprland/default.nix @@ -1,6 +1,6 @@ -{userModules, ...}: { +{umodPath, ...}: { imports = [ - "${userModules}/wm/hyprland/cnst" - "${userModules}/wm/hyprland/toothpick" + "${umodPath}/wm/hyprland/cnst" + "${umodPath}/wm/hyprland/toothpick" ]; } diff --git a/home/modules/wm/hyprland/toothpick/appearance.nix b/home/modules/wm/hyprland/toothpick/appearance.nix index c55e707f..c867d900 100644 --- a/home/modules/wm/hyprland/toothpick/appearance.nix +++ b/home/modules/wm/hyprland/toothpick/appearance.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.toothpick.appearance; + cfg = config.userModules.wm.hyprland.toothpick.appearance; in { options = { - modules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; + userModules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/default.nix b/home/modules/wm/hyprland/toothpick/default.nix index afe579a8..b252fc44 100644 --- a/home/modules/wm/hyprland/toothpick/default.nix +++ b/home/modules/wm/hyprland/toothpick/default.nix @@ -3,26 +3,26 @@ config, lib, pkgs, - userModules, + umodPath, ... }: let inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.modules.wm.hyprland.toothpick; + cfg = config.userModules.wm.hyprland.toothpick; in { imports = [ - "${userModules}/wm/hyprland/toothpick/appearance.nix" - "${userModules}/wm/hyprland/toothpick/inputs.nix" - "${userModules}/wm/hyprland/toothpick/keybinds.nix" - "${userModules}/wm/hyprland/toothpick/rules.nix" - "${userModules}/wm/hyprland/toothpick/startup.nix" + "${umodPath}/wm/hyprland/toothpick/appearance.nix" + "${umodPath}/wm/hyprland/toothpick/inputs.nix" + "${umodPath}/wm/hyprland/toothpick/keybinds.nix" + "${umodPath}/wm/hyprland/toothpick/rules.nix" + "${umodPath}/wm/hyprland/toothpick/startup.nix" ]; options = { - modules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; + userModules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; }; config = mkIf cfg.enable { - modules.wm.hyprland.toothpick = { + userModules.wm.hyprland.toothpick = { appearance.enable = mkDefault cfg.enable; inputs.enable = mkDefault cfg.enable; keybinds.enable = mkDefault cfg.enable; diff --git a/home/modules/wm/hyprland/toothpick/inputs.nix b/home/modules/wm/hyprland/toothpick/inputs.nix index 1c96ea32..e46b6223 100644 --- a/home/modules/wm/hyprland/toothpick/inputs.nix +++ b/home/modules/wm/hyprland/toothpick/inputs.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.toothpick.inputs; + cfg = config.userModules.wm.hyprland.toothpick.inputs; in { options = { - modules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; + userModules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/keybinds.nix b/home/modules/wm/hyprland/toothpick/keybinds.nix index db5aba1d..579fee30 100644 --- a/home/modules/wm/hyprland/toothpick/keybinds.nix +++ b/home/modules/wm/hyprland/toothpick/keybinds.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.toothpick.keybinds; + cfg = config.userModules.wm.hyprland.toothpick.keybinds; in { options = { - modules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; + userModules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/rules.nix b/home/modules/wm/hyprland/toothpick/rules.nix index a64d50e4..71abea60 100644 --- a/home/modules/wm/hyprland/toothpick/rules.nix +++ b/home/modules/wm/hyprland/toothpick/rules.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.toothpick.rules; + cfg = config.userModules.wm.hyprland.toothpick.rules; in { options = { - modules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; + userModules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/startup.nix b/home/modules/wm/hyprland/toothpick/startup.nix index e65a4ca5..4ca0366b 100644 --- a/home/modules/wm/hyprland/toothpick/startup.nix +++ b/home/modules/wm/hyprland/toothpick/startup.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.hyprland.toothpick.startup; + cfg = config.userModules.wm.hyprland.toothpick.startup; in { options = { - modules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; + userModules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/utils/hypridle/default.nix b/home/modules/wm/utils/hypridle/default.nix index 6922b9d7..aaf34f32 100644 --- a/home/modules/wm/utils/hypridle/default.nix +++ b/home/modules/wm/utils/hypridle/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.utils.hypridle; + cfg = config.userModules.wm.utils.hypridle; hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle; # hypridlePkg = pkgs.hypridle; in { options = { - modules.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle"; + userModules.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle"; }; config = mkIf cfg.enable { services.hypridle = { diff --git a/home/modules/wm/utils/hyprlock/default.nix b/home/modules/wm/utils/hyprlock/default.nix index 019e3cfe..b968b5ef 100644 --- a/home/modules/wm/utils/hyprlock/default.nix +++ b/home/modules/wm/utils/hyprlock/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.utils.hyprlock; + cfg = config.userModules.wm.utils.hyprlock; hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock; # hyprlockPkg = pkgs.hyprlock; in { options = { - modules.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock"; + userModules.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock"; }; config = mkIf cfg.enable { programs.hyprlock = { diff --git a/home/modules/wm/utils/hyprpaper/default.nix b/home/modules/wm/utils/hyprpaper/default.nix index 5984c9f7..bd22a4da 100644 --- a/home/modules/wm/utils/hyprpaper/default.nix +++ b/home/modules/wm/utils/hyprpaper/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.wm.utils.hyprpaper; + cfg = config.userModules.wm.utils.hyprpaper; hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default; # hyprpaperPkg = pkgs.hyprpaper; in { options = { - modules.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper"; + userModules.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper"; }; config = mkIf cfg.enable { services.hyprpaper = { diff --git a/home/users/cnst/default.nix b/home/users/cnst/default.nix index d3b8f45f..6b5c9b10 100644 --- a/home/users/cnst/default.nix +++ b/home/users/cnst/default.nix @@ -13,6 +13,7 @@ in { ./shell.nix ] ++ lib.optionals isCnixpad [./cpmodules.nix]; + home = { username = "cnst"; homeDirectory = "/home/cnst"; diff --git a/home/users/cnst/modules.nix b/home/users/cnst/modules.nix index 97345538..5a8dcdc4 100644 --- a/home/users/cnst/modules.nix +++ b/home/users/cnst/modules.nix @@ -1,5 +1,15 @@ { - modules = { + # monitors = [ + # { + # name = "DP-3"; + # width = 2560; + # height = 1440; + # refreshRate = 240; + # workspace = "1"; + # primary = true; + # } + # ]; + userModules = { browsers = { firefox = { enable = true; diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index 69510f59..9704a26b 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -1,5 +1,5 @@ { - modules = { + systemModules = { boot = { loader = { default = { @@ -132,10 +132,6 @@ dconf = { enable = true; }; - xserver = { - videoDrivers = ["amdgpu"]; - xkbLayout = "se"; - }; }; system = { fwupd = { diff --git a/hosts/default.nix b/hosts/default.nix index 52f8f50d..0e12e1d0 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -14,8 +14,8 @@ cnstConfig = "${self}/home/users/cnst"; toothpickConfig = "${self}/home/users/toothpick"; - userModules = "${self}/home/modules"; - systemModules = "${self}/system/modules"; + umodPath = "${self}/home/modules"; + smodPath = "${self}/system/modules"; # shorten paths inherit (inputs.nixpkgs.lib) nixosSystem; @@ -25,10 +25,11 @@ inherit (import "${systemConfig}") shared; # get these into the module system - specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig userModules systemModules;}; + specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig umodPath smodPath;}; in { cnix = nixosSystem { inherit specialArgs; + modules = shared ++ [ diff --git a/system/modules/boot/kernel/default.nix b/system/modules/boot/kernel/default.nix index e67e5c37..284dee3e 100644 --- a/system/modules/boot/kernel/default.nix +++ b/system/modules/boot/kernel/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkOption; - cfg = config.modules.boot.kernel; + cfg = config.systemModules.boot.kernel; in { options = { - modules.boot.kernel = { + systemModules.boot.kernel = { variant = mkOption { type = lib.types.enum ["stable" "latest" "cachyos"]; default = "latest"; @@ -30,7 +30,7 @@ in { extraBlacklistedModules = mkOption { type = lib.types.listOf lib.types.str; default = []; - description = "Additional kernel modules to blacklist."; + description = "Additional kernel systemModules to blacklist."; }; }; }; diff --git a/system/modules/boot/loader/default.nix b/system/modules/boot/loader/default.nix index f412c8d7..a5c7babb 100644 --- a/system/modules/boot/loader/default.nix +++ b/system/modules/boot/loader/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkForce; - cfg = config.modules.boot.loader; + cfg = config.systemModules.boot.loader; in { options = { - modules.boot.loader = { + systemModules.boot.loader = { default = { enable = mkEnableOption "Enable default boot loader configuration."; }; @@ -28,7 +28,7 @@ in { assertions = [ { assertion = !(cfg.default.enable && cfg.lanzaboote.enable); - message = "Only one of modules.boot.loader.default.enable and modules.boot.loader.lanzaboote.enable can be set to true."; + message = "Only one of systemModules.boot.loader.default.enable and systemModules.boot.loader.lanzaboote.enable can be set to true."; } ]; } diff --git a/system/modules/default.nix b/system/modules/default.nix index a06e9376..6283d611 100644 --- a/system/modules/default.nix +++ b/system/modules/default.nix @@ -1,54 +1,54 @@ -{systemModules, ...}: { +{smodPath, ...}: { imports = [ - "${systemModules}/boot/loader" - "${systemModules}/boot/kernel" - "${systemModules}/gaming/gamemode" - "${systemModules}/gaming/gamescope" - "${systemModules}/gaming/lutris" - "${systemModules}/gaming/steam" - "${systemModules}/gui/gnome" - "${systemModules}/gui/hyprland" - "${systemModules}/hardware/bluetooth" - "${systemModules}/hardware/graphics/amd" - "${systemModules}/hardware/graphics/nvidia" - "${systemModules}/hardware/logitech" - "${systemModules}/hardware/network" - "${systemModules}/nix/nh" - "${systemModules}/studio/blender" - "${systemModules}/studio/gimp" - "${systemModules}/studio/inkscape" - "${systemModules}/studio/beekeeper" - "${systemModules}/studio/mysql-workbench" - "${systemModules}/sysd/network/blueman" - "${systemModules}/sysd/network/mullvad" - "${systemModules}/sysd/network/samba" - "${systemModules}/sysd/network/openssh" - "${systemModules}/sysd/security/agenix" - "${systemModules}/sysd/security/gnome-keyring" - "${systemModules}/sysd/session/dbus" - "${systemModules}/sysd/session/dconf" - "${systemModules}/sysd/session/xserver" - "${systemModules}/sysd/system/fwupd" - "${systemModules}/sysd/system/greetd" - "${systemModules}/sysd/system/gvfs" - "${systemModules}/sysd/system/locate" - "${systemModules}/sysd/system/nix-ld" - "${systemModules}/sysd/system/pcscd" - "${systemModules}/sysd/system/pipewire" - "${systemModules}/sysd/system/powerd" - "${systemModules}/sysd/system/udisks" - "${systemModules}/sysd/system/zram" - "${systemModules}/sysd/system/kanata" - "${systemModules}/utils/android" - "${systemModules}/utils/anyrun" - "${systemModules}/utils/brightnessctl" - "${systemModules}/utils/chaotic" - "${systemModules}/utils/corectrl" - "${systemModules}/utils/microfetch" - "${systemModules}/utils/misc" - "${systemModules}/utils/npm" - "${systemModules}/utils/obsidian" - "${systemModules}/utils/yubikey" - "${systemModules}/utils/zsh" + "${smodPath}/boot/loader" + "${smodPath}/boot/kernel" + "${smodPath}/gaming/gamemode" + "${smodPath}/gaming/gamescope" + "${smodPath}/gaming/lutris" + "${smodPath}/gaming/steam" + "${smodPath}/gui/gnome" + "${smodPath}/gui/hyprland" + "${smodPath}/hardware/bluetooth" + "${smodPath}/hardware/graphics/amd" + "${smodPath}/hardware/graphics/nvidia" + "${smodPath}/hardware/logitech" + "${smodPath}/hardware/network" + "${smodPath}/nix/nh" + "${smodPath}/studio/blender" + "${smodPath}/studio/gimp" + "${smodPath}/studio/inkscape" + "${smodPath}/studio/beekeeper" + "${smodPath}/studio/mysql-workbench" + "${smodPath}/sysd/network/blueman" + "${smodPath}/sysd/network/mullvad" + "${smodPath}/sysd/network/samba" + "${smodPath}/sysd/network/openssh" + "${smodPath}/sysd/security/agenix" + "${smodPath}/sysd/security/gnome-keyring" + "${smodPath}/sysd/session/dbus" + "${smodPath}/sysd/session/dconf" + "${smodPath}/sysd/session/xserver" + "${smodPath}/sysd/system/fwupd" + "${smodPath}/sysd/system/greetd" + "${smodPath}/sysd/system/gvfs" + "${smodPath}/sysd/system/locate" + "${smodPath}/sysd/system/nix-ld" + "${smodPath}/sysd/system/pcscd" + "${smodPath}/sysd/system/pipewire" + "${smodPath}/sysd/system/powerd" + "${smodPath}/sysd/system/udisks" + "${smodPath}/sysd/system/zram" + "${smodPath}/sysd/system/kanata" + "${smodPath}/utils/android" + "${smodPath}/utils/anyrun" + "${smodPath}/utils/brightnessctl" + "${smodPath}/utils/chaotic" + "${smodPath}/utils/corectrl" + "${smodPath}/utils/microfetch" + "${smodPath}/utils/misc" + "${smodPath}/utils/npm" + "${smodPath}/utils/obsidian" + "${smodPath}/utils/yubikey" + "${smodPath}/utils/zsh" ]; } diff --git a/system/modules/gaming/gamemode/default.nix b/system/modules/gaming/gamemode/default.nix index 35c4c0c5..b5596b79 100644 --- a/system/modules/gaming/gamemode/default.nix +++ b/system/modules/gaming/gamemode/default.nix @@ -6,14 +6,14 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.modules.gaming.gamemode; + cfg = config.systemModules.gaming.gamemode; pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency; in { imports = [ pipewireLowLatencyModule ]; options = { - modules.gaming.gamemode = { + systemModules.gaming.gamemode = { enable = mkEnableOption "Enables gamemode"; optimizeGpu.enable = mkOption { type = lib.types.bool; @@ -29,7 +29,7 @@ in { general = { inhibit_screensaver = 1; softrealtime = "auto"; - renice = 15; + # renice = 15; }; gpu = mkIf cfg.optimizeGpu.enable { apply_gpu_optimisations = "accept-responsibility"; diff --git a/system/modules/gaming/gamescope/default.nix b/system/modules/gaming/gamescope/default.nix index efbbcda4..35a73403 100644 --- a/system/modules/gaming/gamescope/default.nix +++ b/system/modules/gaming/gamescope/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gaming.gamescope; + cfg = config.systemModules.gaming.gamescope; in { options = { - modules.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; + systemModules.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; }; config = mkIf cfg.enable { programs.gamescope = { diff --git a/system/modules/gaming/lutris/default.nix b/system/modules/gaming/lutris/default.nix index c182731c..c460679b 100644 --- a/system/modules/gaming/lutris/default.nix +++ b/system/modules/gaming/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gaming.lutris; + cfg = config.systemModules.gaming.lutris; in { options = { - modules.gaming.lutris.enable = mkEnableOption "Enables lutris"; + systemModules.gaming.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/gaming/steam/default.nix b/system/modules/gaming/steam/default.nix index c23d5258..2fc8bd75 100644 --- a/system/modules/gaming/steam/default.nix +++ b/system/modules/gaming/steam/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gaming.steam; + cfg = config.systemModules.gaming.steam; in { options = { - modules.gaming.steam.enable = mkEnableOption "Enables steam"; + systemModules.gaming.steam.enable = mkEnableOption "Enables steam"; }; config = mkIf cfg.enable { programs = { diff --git a/system/modules/gui/gnome/default.nix b/system/modules/gui/gnome/default.nix index 71a97bb8..2a548b93 100644 --- a/system/modules/gui/gnome/default.nix +++ b/system/modules/gui/gnome/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gui.gnome; + cfg = config.systemModules.gui.gnome; in { options = { - modules.gui.gnome.enable = mkEnableOption "Enables gnome"; + systemModules.gui.gnome.enable = mkEnableOption "Enables gnome"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/gui/hyprland/default.nix b/system/modules/gui/hyprland/default.nix index 7482ba34..d719b86f 100644 --- a/system/modules/gui/hyprland/default.nix +++ b/system/modules/gui/hyprland/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.gui.hyprland; + cfg = config.systemModules.gui.hyprland; in { options = { - modules.gui.hyprland.enable = mkEnableOption "Enables hyprland"; + systemModules.gui.hyprland.enable = mkEnableOption "Enables hyprland"; }; config = mkIf cfg.enable { programs.hyprland = { diff --git a/system/modules/hardware/bluetooth/default.nix b/system/modules/hardware/bluetooth/default.nix index 52513709..d69ea541 100644 --- a/system/modules/hardware/bluetooth/default.nix +++ b/system/modules/hardware/bluetooth/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.hardware.bluetooth; + cfg = config.systemModules.hardware.bluetooth; in { options = { - modules.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth"; + systemModules.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth"; }; config = mkIf cfg.enable { hardware = { diff --git a/system/modules/hardware/graphics/amd/default.nix b/system/modules/hardware/graphics/amd/default.nix index b303b487..317c3ef1 100644 --- a/system/modules/hardware/graphics/amd/default.nix +++ b/system/modules/hardware/graphics/amd/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.hardware.graphics.amd; + cfg = config.systemModules.hardware.graphics.amd; in { options = { - modules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics"; + systemModules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics"; }; config = mkIf cfg.enable { hardware = { diff --git a/system/modules/hardware/graphics/nvidia/default.nix b/system/modules/hardware/graphics/nvidia/default.nix index 0e9cd47c..f54447ca 100644 --- a/system/modules/hardware/graphics/nvidia/default.nix +++ b/system/modules/hardware/graphics/nvidia/default.nix @@ -15,10 +15,10 @@ exec "$@" ''; inherit (lib) types mkIf mkEnableOption mkOption; - cfg = config.modules.hardware.graphics.nvidia; + cfg = config.systemModules.hardware.graphics.nvidia; in { options = { - modules.hardware.graphics.nvidia = { + systemModules.hardware.graphics.nvidia = { enable = mkEnableOption "Enables NVidia graphics"; package = mkOption { type = types.enum ["stable" "beta" "production" "latest"]; diff --git a/system/modules/hardware/logitech/default.nix b/system/modules/hardware/logitech/default.nix index 7de82eaf..cc1ac935 100644 --- a/system/modules/hardware/logitech/default.nix +++ b/system/modules/hardware/logitech/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.hardware.logitech; + cfg = config.systemModules.hardware.logitech; in { options = { - modules.hardware.logitech.enable = mkEnableOption "Enables logitech"; + systemModules.hardware.logitech.enable = mkEnableOption "Enables logitech"; }; config = mkIf cfg.enable { hardware = { diff --git a/system/modules/hardware/network/default.nix b/system/modules/hardware/network/default.nix index 7ff7999e..fa7e8d8d 100644 --- a/system/modules/hardware/network/default.nix +++ b/system/modules/hardware/network/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption types; - cfg = config.modules.hardware.network; + cfg = config.systemModules.hardware.network; in { options = { - modules = { + systemModules = { hardware = { network = { enable = mkEnableOption "Enable the custom networking module"; diff --git a/system/modules/nix/nh/default.nix b/system/modules/nix/nh/default.nix index c1cf198c..ffa51434 100644 --- a/system/modules/nix/nh/default.nix +++ b/system/modules/nix/nh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.modules.nix.nh; + cfg = config.systemModules.nix.nh; in { options = { - modules.nix.nh = { + systemModules.nix.nh = { enable = mkEnableOption "Enables nix helper"; clean = { enable = mkEnableOption "Enables nix helper cleaning"; diff --git a/system/modules/studio/beekeeper/default.nix b/system/modules/studio/beekeeper/default.nix index 36d57665..8d4e1961 100644 --- a/system/modules/studio/beekeeper/default.nix +++ b/system/modules/studio/beekeeper/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.studio.beekeeper; + cfg = config.systemModules.studio.beekeeper; in { options = { - modules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; + systemModules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/studio/blender/default.nix b/system/modules/studio/blender/default.nix index 38a078b4..7d54472f 100644 --- a/system/modules/studio/blender/default.nix +++ b/system/modules/studio/blender/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.modules.studio.blender; + cfg = config.systemModules.studio.blender; in { options = { - modules.studio.blender = { + systemModules.studio.blender = { enable = mkEnableOption "Enables Blender"; hip.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/studio/gimp/default.nix b/system/modules/studio/gimp/default.nix index d92c5265..83e5c110 100644 --- a/system/modules/studio/gimp/default.nix +++ b/system/modules/studio/gimp/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.studio.gimp; + cfg = config.systemModules.studio.gimp; in { options = { - modules.studio.gimp.enable = mkEnableOption "Enables gimp"; + systemModules.studio.gimp.enable = mkEnableOption "Enables gimp"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/studio/inkscape/default.nix b/system/modules/studio/inkscape/default.nix index c028cab9..1c4e9e4b 100644 --- a/system/modules/studio/inkscape/default.nix +++ b/system/modules/studio/inkscape/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.studio.inkscape; + cfg = config.systemModules.studio.inkscape; in { options = { - modules.studio.inkscape.enable = mkEnableOption "Enables inkscape"; + systemModules.studio.inkscape.enable = mkEnableOption "Enables inkscape"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/studio/mysql-workbench/default.nix b/system/modules/studio/mysql-workbench/default.nix index 60fa5719..23e83114 100644 --- a/system/modules/studio/mysql-workbench/default.nix +++ b/system/modules/studio/mysql-workbench/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.studio.mysql-workbench; + cfg = config.systemModules.studio.mysql-workbench; in { options = { - modules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; + systemModules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/sysd/network/blueman/default.nix b/system/modules/sysd/network/blueman/default.nix index 9a16fbe9..9fac56b4 100644 --- a/system/modules/sysd/network/blueman/default.nix +++ b/system/modules/sysd/network/blueman/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.network.blueman; + cfg = config.systemModules.sysd.network.blueman; in { options = { - modules.sysd.network.blueman.enable = mkEnableOption "Enables blueman"; + systemModules.sysd.network.blueman.enable = mkEnableOption "Enables blueman"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/sysd/network/mullvad/default.nix b/system/modules/sysd/network/mullvad/default.nix index 77241756..09de8ea7 100644 --- a/system/modules/sysd/network/mullvad/default.nix +++ b/system/modules/sysd/network/mullvad/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.network.mullvad; + cfg = config.systemModules.sysd.network.mullvad; in { options = { - modules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad"; + systemModules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad"; }; config = mkIf cfg.enable { services.mullvad-vpn = { diff --git a/system/modules/sysd/network/openssh/default.nix b/system/modules/sysd/network/openssh/default.nix index 22ad2843..bf9cd544 100644 --- a/system/modules/sysd/network/openssh/default.nix +++ b/system/modules/sysd/network/openssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.network.openssh; + cfg = config.systemModules.sysd.network.openssh; in { options = { - modules.sysd.network.openssh.enable = mkEnableOption "Enables openssh"; + systemModules.sysd.network.openssh.enable = mkEnableOption "Enables openssh"; }; config = mkIf cfg.enable { services.openssh = { diff --git a/system/modules/sysd/network/samba/default.nix b/system/modules/sysd/network/samba/default.nix index c3db21bd..f56a4c68 100644 --- a/system/modules/sysd/network/samba/default.nix +++ b/system/modules/sysd/network/samba/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.network.samba; + cfg = config.systemModules.sysd.network.samba; in { options = { - modules.sysd.network.samba.enable = mkEnableOption "Enables samba"; + systemModules.sysd.network.samba.enable = mkEnableOption "Enables samba"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/sysd/security/agenix/default.nix b/system/modules/sysd/security/agenix/default.nix index 4342dba2..c6dbcba7 100644 --- a/system/modules/sysd/security/agenix/default.nix +++ b/system/modules/sysd/security/agenix/default.nix @@ -7,10 +7,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.modules.sysd.security.agenix; + cfg = config.systemModules.sysd.security.agenix; in { options = { - modules.sysd.security.agenix = { + systemModules.sysd.security.agenix = { enable = mkEnableOption "Enables agenix system environment"; cnix.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/sysd/security/gnome-keyring/default.nix b/system/modules/sysd/security/gnome-keyring/default.nix index 5baf37f8..456df4b1 100644 --- a/system/modules/sysd/security/gnome-keyring/default.nix +++ b/system/modules/sysd/security/gnome-keyring/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.security.gnome-keyring; + cfg = config.systemModules.sysd.security.gnome-keyring; in { options = { - modules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; + systemModules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; }; config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; diff --git a/system/modules/sysd/session/dbus/default.nix b/system/modules/sysd/session/dbus/default.nix index b238e704..2ce2fcd3 100644 --- a/system/modules/sysd/session/dbus/default.nix +++ b/system/modules/sysd/session/dbus/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.session.dbus; + cfg = config.systemModules.sysd.session.dbus; in { options = { - modules.sysd.session.dbus.enable = mkEnableOption "Enables dbus"; + systemModules.sysd.session.dbus.enable = mkEnableOption "Enables dbus"; }; config = mkIf cfg.enable { services.dbus = { diff --git a/system/modules/sysd/session/dconf/default.nix b/system/modules/sysd/session/dconf/default.nix index fae6128a..8af3e86f 100644 --- a/system/modules/sysd/session/dconf/default.nix +++ b/system/modules/sysd/session/dconf/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.session.dconf; + cfg = config.systemModules.sysd.session.dconf; in { options = { - modules.sysd.session.dconf.enable = mkEnableOption "Enables dconf"; + systemModules.sysd.session.dconf.enable = mkEnableOption "Enables dconf"; }; config = mkIf cfg.enable { programs.dconf.enable = true; diff --git a/system/modules/sysd/session/xserver/default.nix b/system/modules/sysd/session/xserver/default.nix index ab63b309..29080789 100644 --- a/system/modules/sysd/session/xserver/default.nix +++ b/system/modules/sysd/session/xserver/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkOption types; - cfg = config.modules.sysd.session.xserver; + cfg = config.systemModules.sysd.session.xserver; in { options = { - modules.sysd.session.xserver = { + systemModules.sysd.session.xserver = { videoDrivers = mkOption { type = types.listOf (types.enum ["amdgpu" "nvidia"]); default = ["amdgpu"]; diff --git a/system/modules/sysd/system/fwupd/default.nix b/system/modules/sysd/system/fwupd/default.nix index 514ac9aa..ca4d2a2c 100644 --- a/system/modules/sysd/system/fwupd/default.nix +++ b/system/modules/sysd/system/fwupd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.fwupd; + cfg = config.systemModules.sysd.system.fwupd; in { options = { - modules.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd"; + systemModules.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd"; }; config = mkIf cfg.enable { services.fwupd.enable = true; diff --git a/system/modules/sysd/system/greetd/default.nix b/system/modules/sysd/system/greetd/default.nix index ed949055..aeba8763 100644 --- a/system/modules/sysd/system/greetd/default.nix +++ b/system/modules/sysd/system/greetd/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkOption types; - cfg = config.modules.sysd.system.greetd; + cfg = config.systemModules.sysd.system.greetd; in { options = { - modules.sysd.system.greetd = { + systemModules.sysd.system.greetd = { enable = mkEnableOption { type = types.bool; default = false; diff --git a/system/modules/sysd/system/gvfs/default.nix b/system/modules/sysd/system/gvfs/default.nix index 0630a1d1..c2341d7b 100644 --- a/system/modules/sysd/system/gvfs/default.nix +++ b/system/modules/sysd/system/gvfs/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.gvfs; + cfg = config.systemModules.sysd.system.gvfs; in { options = { - modules.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs"; + systemModules.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs"; }; config = mkIf cfg.enable { services.gvfs.enable = true; diff --git a/system/modules/sysd/system/kanata/default.nix b/system/modules/sysd/system/kanata/default.nix index 96fdfff1..16370db4 100644 --- a/system/modules/sysd/system/kanata/default.nix +++ b/system/modules/sysd/system/kanata/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.kanata; + cfg = config.systemModules.sysd.system.kanata; in { options = { - modules.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; + systemModules.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; }; config = mkIf cfg.enable { services.kanata = { diff --git a/system/modules/sysd/system/locate/default.nix b/system/modules/sysd/system/locate/default.nix index eb95c032..72505c3c 100644 --- a/system/modules/sysd/system/locate/default.nix +++ b/system/modules/sysd/system/locate/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.locate; + cfg = config.systemModules.sysd.system.locate; in { options = { - modules.sysd.system.locate.enable = mkEnableOption "Enables plocate"; + systemModules.sysd.system.locate.enable = mkEnableOption "Enables plocate"; }; config = mkIf cfg.enable { services.locate = { diff --git a/system/modules/sysd/system/nix-ld/default.nix b/system/modules/sysd/system/nix-ld/default.nix index 3804f01d..772288bc 100644 --- a/system/modules/sysd/system/nix-ld/default.nix +++ b/system/modules/sysd/system/nix-ld/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.nix-ld; + cfg = config.systemModules.sysd.system.nix-ld; in { options = { - modules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; + systemModules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; }; config = mkIf cfg.enable { programs.nix-ld = { diff --git a/system/modules/sysd/system/pcscd/default.nix b/system/modules/sysd/system/pcscd/default.nix index c2f79e0d..b287d782 100644 --- a/system/modules/sysd/system/pcscd/default.nix +++ b/system/modules/sysd/system/pcscd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.pcscd; + cfg = config.systemModules.sysd.system.pcscd; in { options = { - modules.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd"; + systemModules.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd"; }; config = mkIf cfg.enable { services.pcscd.enable = true; diff --git a/system/modules/sysd/system/pipewire/default.nix b/system/modules/sysd/system/pipewire/default.nix index 39bfe670..44bd1657 100644 --- a/system/modules/sysd/system/pipewire/default.nix +++ b/system/modules/sysd/system/pipewire/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.pipewire; + cfg = config.systemModules.sysd.system.pipewire; in { options = { - modules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire"; + systemModules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire"; }; config = mkIf cfg.enable { hardware.pulseaudio.enable = false; diff --git a/system/modules/sysd/system/powerd/default.nix b/system/modules/sysd/system/powerd/default.nix index 38ead70f..11b533c3 100644 --- a/system/modules/sysd/system/powerd/default.nix +++ b/system/modules/sysd/system/powerd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.powerd; + cfg = config.systemModules.sysd.system.powerd; in { options = { - modules.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; + systemModules.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/sysd/system/udisks/default.nix b/system/modules/sysd/system/udisks/default.nix index 78414fc2..af084a8a 100644 --- a/system/modules/sysd/system/udisks/default.nix +++ b/system/modules/sysd/system/udisks/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.udisks; + cfg = config.systemModules.sysd.system.udisks; in { options = { - modules.sysd.system.udisks.enable = mkEnableOption "Enables udisks"; + systemModules.sysd.system.udisks.enable = mkEnableOption "Enables udisks"; }; config = mkIf cfg.enable { services.udisks2.enable = true; diff --git a/system/modules/sysd/system/zram/default.nix b/system/modules/sysd/system/zram/default.nix index 36906197..5b70a59d 100644 --- a/system/modules/sysd/system/zram/default.nix +++ b/system/modules/sysd/system/zram/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.sysd.system.zram; + cfg = config.systemModules.sysd.system.zram; in { options = { - modules.sysd.system.zram.enable = mkEnableOption "Enables zram"; + systemModules.sysd.system.zram.enable = mkEnableOption "Enables zram"; }; config = mkIf cfg.enable { zramSwap.enable = true; diff --git a/system/modules/utils/android/default.nix b/system/modules/utils/android/default.nix index 65ed79d7..aa4c12d2 100644 --- a/system/modules/utils/android/default.nix +++ b/system/modules/utils/android/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.android; + cfg = config.systemModules.utils.android; in { options = { - modules.utils.android.enable = mkEnableOption "Enables android tools"; + systemModules.utils.android.enable = mkEnableOption "Enables android tools"; }; config = mkIf cfg.enable { programs.adb.enable = true; diff --git a/system/modules/utils/anyrun/default.nix b/system/modules/utils/anyrun/default.nix index 35aebde9..c92697b6 100644 --- a/system/modules/utils/anyrun/default.nix +++ b/system/modules/utils/anyrun/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.anyrun; + cfg = config.systemModules.utils.anyrun; in { options = { - modules.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + systemModules.utils.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/brightnessctl/default.nix b/system/modules/utils/brightnessctl/default.nix index 3826d23c..c8f83f78 100644 --- a/system/modules/utils/brightnessctl/default.nix +++ b/system/modules/utils/brightnessctl/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.brightnessctl; + cfg = config.systemModules.utils.brightnessctl; in { options = { - modules.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; + systemModules.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/chaotic/default.nix b/system/modules/utils/chaotic/default.nix index 9c7c2992..29eea3fd 100644 --- a/system/modules/utils/chaotic/default.nix +++ b/system/modules/utils/chaotic/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.modules.utils.chaotic; + cfg = config.systemModules.utils.chaotic; in { options = { - modules.utils.chaotic = { + systemModules.utils.chaotic = { enable = mkEnableOption "Enables Chaotic AUR packages"; amd.enable = mkOption { type = lib.types.bool; @@ -20,7 +20,6 @@ in { config = mkIf cfg.enable (mkMerge [ { - # Base configuration when Chaotic is enabled chaotic.scx.enable = true; } (mkIf cfg.amd.enable { diff --git a/system/modules/utils/corectrl/default.nix b/system/modules/utils/corectrl/default.nix index ce5f632e..77e19aa9 100644 --- a/system/modules/utils/corectrl/default.nix +++ b/system/modules/utils/corectrl/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.corectrl; + cfg = config.systemModules.utils.corectrl; in { options = { - modules.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; + systemModules.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; }; config = mkIf cfg.enable { programs.corectrl = { diff --git a/system/modules/utils/microfetch/default.nix b/system/modules/utils/microfetch/default.nix index da855708..8541fcb6 100644 --- a/system/modules/utils/microfetch/default.nix +++ b/system/modules/utils/microfetch/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.microfetch; + cfg = config.systemModules.utils.microfetch; in { options = { - modules.utils.microfetch.enable = mkEnableOption "Enables microfetch"; + systemModules.utils.microfetch.enable = mkEnableOption "Enables microfetch"; }; config = mkIf cfg.enable { environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default]; diff --git a/system/modules/utils/misc/default.nix b/system/modules/utils/misc/default.nix index 5be662f4..d1c3e224 100644 --- a/system/modules/utils/misc/default.nix +++ b/system/modules/utils/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.modules.utils.misc; + cfg = config.systemModules.utils.misc; in { options = { - modules.utils.misc = { + systemModules.utils.misc = { enable = mkEnableOption "Enables miscellaneous packages"; desktop.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/utils/npm/default.nix b/system/modules/utils/npm/default.nix index c15a838d..99f7c0af 100644 --- a/system/modules/utils/npm/default.nix +++ b/system/modules/utils/npm/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.npm; + cfg = config.systemModules.utils.npm; in { options = { - modules.utils.npm.enable = mkEnableOption "Enables npm"; + systemModules.utils.npm.enable = mkEnableOption "Enables npm"; }; config = mkIf cfg.enable { programs.npm = { diff --git a/system/modules/utils/obsidian/default.nix b/system/modules/utils/obsidian/default.nix index 811b7396..bb9b3e90 100644 --- a/system/modules/utils/obsidian/default.nix +++ b/system/modules/utils/obsidian/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.obsidian; + cfg = config.systemModules.utils.obsidian; in { options = { - modules.utils.obsidian.enable = mkEnableOption "Enables obsidian"; + systemModules.utils.obsidian.enable = mkEnableOption "Enables obsidian"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/yubikey/default.nix b/system/modules/utils/yubikey/default.nix index 7624e803..cb9b1b94 100644 --- a/system/modules/utils/yubikey/default.nix +++ b/system/modules/utils/yubikey/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.yubikey; + cfg = config.systemModules.utils.yubikey; in { options = { - modules.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; + systemModules.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/zsh/default.nix b/system/modules/utils/zsh/default.nix index 8a05a920..35f87f47 100644 --- a/system/modules/utils/zsh/default.nix +++ b/system/modules/utils/zsh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.zsh; + cfg = config.systemModules.utils.zsh; in { options = { - modules.utils.zsh.enable = mkEnableOption "Enables android tools"; + systemModules.utils.zsh.enable = mkEnableOption "Enables android tools"; }; config = mkIf cfg.enable { programs.zsh.enable = cfg.enable;