From dc4df5f53d9e5bc6dc10d4e44541af1a77148e84 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 13 May 2024 19:46:13 +0200 Subject: [PATCH] refactor: replace internal 'modules' option namespace with 'dotfiles' Replace the 'modules' option namespace with the 'dotfiles' namespace to align namespaces with the extended 'lib' [1]. [1]: 988bf623d58d60d0ceb0a0964beb1b201bc06491 --- .../code_map/modules_directory/index.adoc | 4 +- .../home_activation_name/index.adoc | 2 +- .../index.adoc | 2 +- flake.nix | 2 +- home_configurations/private/full/default.nix | 2 +- lib/default.nix | 12 +++--- .../homeManagerModules/default/default.nix | 6 +-- modules/homeManager/fonts/default.nix | 6 +-- .../home/packages/acpi/default.nix | 6 +-- .../home/packages/aria/default.nix | 6 +-- .../home/packages/asciidoctor/default.nix | 6 +-- .../home/packages/bandwhich/default.nix | 6 +-- .../home/packages/catimg/default.nix | 6 +-- .../home/packages/catnip/default.nix | 6 +-- .../home/packages/diskonaut/default.nix | 6 +-- .../home/packages/du-dust/default.nix | 6 +-- .../homeManager/home/packages/dua/default.nix | 6 +-- .../homeManager/home/packages/duf/default.nix | 6 +-- .../homeManager/home/packages/fd/default.nix | 6 +-- .../home/packages/ffmpeg/default.nix | 6 +-- .../home/packages/file/default.nix | 6 +-- .../homeManager/home/packages/gcc/default.nix | 6 +-- .../home/packages/gimp/default.nix | 6 +-- .../home/packages/glava/default.nix | 6 +-- .../home/packages/glow/default.nix | 6 +-- .../home/packages/gping/default.nix | 6 +-- .../home/packages/inkscape/default.nix | 6 +-- .../home/packages/kdenlive/default.nix | 6 +-- .../home/packages/killall/default.nix | 6 +-- .../home/packages/libreoffice/default.nix | 6 +-- .../home/packages/neofetch/default.nix | 6 +-- .../home/packages/p7zip/default.nix | 6 +-- .../home/packages/parallel/default.nix | 6 +-- .../home/packages/pipe-rename/default.nix | 6 +-- .../home/packages/poppler_utils/default.nix | 6 +-- .../home/packages/procs/default.nix | 6 +-- .../home/packages/pstree/default.nix | 6 +-- .../home/packages/ripgrep-all/default.nix | 6 +-- .../home/packages/rustup/default.nix | 6 +-- .../home/packages/thunderbird/default.nix | 6 +-- .../home/packages/tldr/default.nix | 6 +-- .../home/packages/tokei/default.nix | 6 +-- .../home/packages/tree/default.nix | 6 +-- .../home/packages/unzip/default.nix | 6 +-- .../home/packages/wl-clipboard/default.nix | 6 +-- .../home/packages/xdg-utils/default.nix | 6 +-- .../homeManager/home/packages/zip/default.nix | 6 +-- .../home/sessionVariables/default.nix | 6 +-- .../homeManager/home/shellAliases/default.nix | 6 +-- .../nixpkgs/config/allowUnfree/default.nix | 6 +-- modules/homeManager/programs/bash/default.nix | 6 +-- .../programs/bashmount/default.nix | 6 +-- modules/homeManager/programs/bat/default.nix | 6 +-- .../programs/borgmatic/default.nix | 8 ++-- modules/homeManager/programs/btop/default.nix | 6 +-- .../homeManager/programs/direnv/default.nix | 6 +-- modules/homeManager/programs/eza/default.nix | 6 +-- modules/homeManager/programs/feh/default.nix | 6 +-- .../homeManager/programs/firefox/default.nix | 6 +-- modules/homeManager/programs/fish/default.nix | 12 +++--- modules/homeManager/programs/fzf/default.nix | 6 +-- modules/homeManager/programs/gh/default.nix | 8 ++-- modules/homeManager/programs/git/default.nix | 8 ++-- modules/homeManager/programs/gpg/default.nix | 6 +-- .../programs/home-manager/default.nix | 6 +-- modules/homeManager/programs/imv/default.nix | 10 ++--- modules/homeManager/programs/jq/default.nix | 6 +-- .../homeManager/programs/kitty/default.nix | 8 ++-- .../homeManager/programs/lazygit/default.nix | 8 ++-- modules/homeManager/programs/man/default.nix | 6 +-- modules/homeManager/programs/mpv/default.nix | 8 ++-- .../programs/password-store/default.nix | 6 +-- .../programs/qutebrowser/default.nix | 14 ++++--- .../homeManager/programs/ripgrep/default.nix | 6 +-- modules/homeManager/programs/rofi/default.nix | 10 ++--- .../homeManager/programs/swaylock/default.nix | 6 +-- .../programs/taskwarrior/default.nix | 6 +-- .../homeManager/programs/wlogout/default.nix | 8 ++-- modules/homeManager/programs/xplr/default.nix | 6 +-- .../homeManager/programs/zathura/default.nix | 10 ++--- .../homeManager/programs/zellij/default.nix | 8 ++-- .../homeManager/programs/zoxide/default.nix | 6 +-- .../services/borgmatic/default.nix | 8 ++-- .../homeManager/services/dunst/default.nix | 6 +-- .../services/easyeffects/default.nix | 6 +-- .../services/gammastep/default.nix | 6 +-- .../services/gpg-agent/default.nix | 6 +-- .../homeManager/services/swayidle/default.nix | 10 ++--- .../systemd/user/tmpfiles/rules/default.nix | 8 ++-- .../windowManager/hyprland/default.nix | 8 ++-- modules/homeManager/xdg/default.nix | 8 ++-- modules/nix-alien/default.nix | 4 +- modules/programs/nixvim/autoCmd/default.nix | 6 +-- modules/programs/nixvim/default.nix | 12 +++--- modules/programs/nixvim/keymaps/default.nix | 6 +-- modules/programs/nixvim/opts/default.nix | 6 +-- .../programs/nixvim/plugins/cmp/default.nix | 8 ++-- .../nixvim/plugins/codeium-nvim/default.nix | 38 +++++++++-------- .../nixvim/plugins/codeium-vim/default.nix | 12 +++--- .../nixvim/plugins/comment/default.nix | 6 +-- .../nixvim/plugins/debugprint/default.nix | 6 +-- modules/programs/nixvim/plugins/default.nix | 8 ++-- .../nixvim/plugins/fidget/default.nix | 6 +-- .../nixvim/plugins/gitmessenger/default.nix | 42 ++++++++++--------- .../nixvim/plugins/gitsigns/default.nix | 8 ++-- .../nixvim/plugins/illuminate/default.nix | 6 +-- .../programs/nixvim/plugins/leap/default.nix | 6 +-- .../nixvim/plugins/lsp-format/default.nix | 8 ++-- .../programs/nixvim/plugins/lsp/default.nix | 6 +-- .../nixvim/plugins/nvim-colorizer/default.nix | 6 +-- .../nixvim/plugins/nvim-tree/default.nix | 6 +-- .../plugins/rainbow-delimiters/default.nix | 6 +-- .../nixvim/plugins/rustaceanvim/default.nix | 14 ++++--- .../nixvim/plugins/spider/default.nix | 6 +-- .../nixvim/plugins/surround/default.nix | 6 +-- .../nixvim/plugins/telescope/default.nix | 6 +-- .../nixvim/plugins/todo-comments/default.nix | 6 +-- .../plugins/treesitter-context/default.nix | 8 ++-- .../nixvim/plugins/treesitter/default.nix | 6 +-- .../nixvim/plugins/trouble/default.nix | 6 +-- .../nixvim/plugins/undotree/default.nix | 6 +-- .../programs/nixvim/plugins/wtf/default.nix | 6 +-- modules/services/battery/default.nix | 8 ++-- modules/stylix/default.nix | 8 ++-- modules/wayland/default.nix | 6 +-- 125 files changed, 450 insertions(+), 442 deletions(-) diff --git a/docs/developer_documentation/architecture/code_map/modules_directory/index.adoc b/docs/developer_documentation/architecture/code_map/modules_directory/index.adoc index 3a0ee8e6..b3ad5f9d 100644 --- a/docs/developer_documentation/architecture/code_map/modules_directory/index.adoc +++ b/docs/developer_documentation/architecture/code_map/modules_directory/index.adoc @@ -1,7 +1,7 @@ [[developer_documentation_architecture_code_map_modules_directory]] ===== /modules// :directory-modules: /modules -:sed: sed 's@\.@/@g' +:sed: sed 's/^dotfiles/modules/; s@\.@/@g' This directory contains all modules used by `<>`. @@ -18,7 +18,7 @@ structure: echo "$MODULE" | {sed} ---- -:module-attribute-set: modules.camelCase.kebab-case.snake_case +:module-attribute-set: dotfiles.camelCase.kebab-case.snake_case :module-path: /modules/camelCase/kebab-case/snake_case/default.nix ==== The `{module-attribute-set}` module attribute set would be declared at diff --git a/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/home_activation_name/index.adoc b/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/home_activation_name/index.adoc index c9bd8e05..89a78c3f 100644 --- a/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/home_activation_name/index.adoc +++ b/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/home_activation_name/index.adoc @@ -1,6 +1,6 @@ [[developer_documentation_architecture_cross_cutting_concerns_naming_conventions_home_activation_name]] ====== home.activation. -:module: modules.camelCase.kebab-case.snake_case +:module: dotfiles.camelCase.kebab-case.snake_case The `` attribute in `home.activation.` corresponds to the <> diff --git a/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/lib_mk_enable_option_description/index.adoc b/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/lib_mk_enable_option_description/index.adoc index 26540b5d..149ea937 100644 --- a/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/lib_mk_enable_option_description/index.adoc +++ b/docs/developer_documentation/architecture/cross_cutting_concerns/naming_conventions/lib_mk_enable_option_description/index.adoc @@ -1,5 +1,5 @@ ====== lib.mkEnableOption "" -:module: modules.camelCase.kebab-case.snake_case +:module: dotfiles.camelCase.kebab-case.snake_case The `` in `lib.mkEnableOption ""` corresponds to the <> diff --git a/flake.nix b/flake.nix index 3bdc56f3..e1448c53 100644 --- a/flake.nix +++ b/flake.nix @@ -135,7 +135,7 @@ .${name} ) .options - .modules; + .dotfiles; in extraConfig: pkgs.nixosOptionsDoc (extraConfig { diff --git a/home_configurations/private/full/default.nix b/home_configurations/private/full/default.nix index cf4845f2..4f066c0a 100644 --- a/home_configurations/private/full/default.nix +++ b/home_configurations/private/full/default.nix @@ -1,6 +1,6 @@ lib: lib.dotfiles.homeManagerConfiguration.homeManagerConfiguration "full" { - config.modules = { + config.dotfiles = { agenix.homeManagerModules.default.enable = true; homeManager = { diff --git a/lib/default.nix b/lib/default.nix index 06a764da..4529e12d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -28,7 +28,7 @@ ```nix homeManagerConfiguration "home-manager" { - config.modules.homeManager.programs.home-manager.enable = true; + config.dotfiles.homeManager.programs.home-manager.enable = true; imports = [modules/homeManager/programs/home-manager]; } => { home-manager = { ... }; } @@ -174,20 +174,20 @@ ```nix documentation = "https://nixos.org/nixos/options.xhtml#opt-services.easyeffects.enable" literalExpression = "programs.dconf.enable = true;" - src = "modules.homeManager.services.easyeffects" + src = "dotfiles.homeManager.services.easyeffects" systemRequirement src literalExpression documentation => { after = [ ... ]; before = [ ... ]; - data = "printf 'trace: INFO: modules.homeManager.services.easyeffects: %s\\n' \"include 'programs.dconf.enable = true;' in the system configuration: https://nixos.org/nixos/options.xhtml#opt-services.easyeffects.enable\"\n"; + data = "printf 'trace: INFO: dotfiles.homeManager.services.easyeffects: %s\\n' \"include 'programs.dconf.enable = true;' in the system configuration: https://nixos.org/nixos/options.xhtml#opt-services.easyeffects.enable\"\n"; } systemRequirement src literalExpression "" => { after = [ ... ]; before = [ ... ]; - data = "printf 'trace: INFO: modules.homeManager.services.easyeffects: %s\\n' \"include 'programs.dconf.enable = true;' in the system configuration\"\n"; + data = "printf 'trace: INFO: dotfiles.homeManager.services.easyeffects: %s\\n' \"include 'programs.dconf.enable = true;' in the system configuration\"\n"; } ``` */ @@ -229,12 +229,12 @@ allowUnfree = toString config.nixpkgs.config.allowUnfree; in lib.dotfiles.lib.hm.dag.entryBefore.writeBoundary.printf - "modules.homeManager.nixpkgs.config.allowUnfree" + "dotfiles.homeManager.nixpkgs.config.allowUnfree" "'nixpkgs.config.allowUnfree = ${allowUnfree};'"; => { after = [ ... ]; before = [ ... ]; - data = "printf 'trace: INFO: modules.homeManager.nixpkgs.config.allowUnfree: %s\\n' \"'nixpkgs.config.allowUnfree = 1;'\"\n"; + data = "printf 'trace: INFO: dotfiles.homeManager.nixpkgs.config.allowUnfree: %s\\n' \"'nixpkgs.config.allowUnfree = 1;'\"\n"; } */ printf = src: message: diff --git a/modules/agenix/homeManagerModules/default/default.nix b/modules/agenix/homeManagerModules/default/default.nix index 015e78cf..344509d5 100644 --- a/modules/agenix/homeManagerModules/default/default.nix +++ b/modules/agenix/homeManagerModules/default/default.nix @@ -4,14 +4,14 @@ lib, ... }: let - module = "modules.agenix.homeManagerModules.default"; + module = "dotfiles.agenix.homeManagerModules.default"; in { imports = [inputs.agenix.homeManagerModules.default]; - options.modules.agenix.homeManagerModules.default.enable = + options.dotfiles.agenix.homeManagerModules.default.enable = lib.mkEnableOption module; - config = lib.mkIf config.modules.agenix.homeManagerModules.default.enable { + config = lib.mkIf config.dotfiles.agenix.homeManagerModules.default.enable { age.identityPaths = ["${config.home.homeDirectory}/.ssh/age"]; home.activation.${module} = let diff --git a/modules/homeManager/fonts/default.nix b/modules/homeManager/fonts/default.nix index 7efb15ee..b95defae 100644 --- a/modules/homeManager/fonts/default.nix +++ b/modules/homeManager/fonts/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.fonts.enable = - lib.mkEnableOption "modules.homeManager.fonts"; + options.dotfiles.homeManager.fonts.enable = + lib.mkEnableOption "dotfiles.homeManager.fonts"; - config = lib.mkIf config.modules.homeManager.fonts.enable { + config = lib.mkIf config.dotfiles.homeManager.fonts.enable { fonts.fontconfig = { defaultFonts = { monospace = ["FiraCodeNerdFont"]; diff --git a/modules/homeManager/home/packages/acpi/default.nix b/modules/homeManager/home/packages/acpi/default.nix index e0f50f85..55d067b1 100644 --- a/modules/homeManager/home/packages/acpi/default.nix +++ b/modules/homeManager/home/packages/acpi/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.acpi.enable = - lib.mkEnableOption "modules.homeManager.home.packages.acpi"; + options.dotfiles.homeManager.home.packages.acpi.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.acpi"; - config = lib.mkIf config.modules.homeManager.home.packages.acpi.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.acpi.enable { home.packages = [pkgs.acpi]; }; } diff --git a/modules/homeManager/home/packages/aria/default.nix b/modules/homeManager/home/packages/aria/default.nix index 236b95cf..574bd9f9 100644 --- a/modules/homeManager/home/packages/aria/default.nix +++ b/modules/homeManager/home/packages/aria/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.aria.enable = - lib.mkEnableOption "modules.homeManager.home.packages.aria"; + options.dotfiles.homeManager.home.packages.aria.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.aria"; - config = lib.mkIf config.modules.homeManager.home.packages.aria.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.aria.enable { home.packages = [pkgs.aria]; }; } diff --git a/modules/homeManager/home/packages/asciidoctor/default.nix b/modules/homeManager/home/packages/asciidoctor/default.nix index 64de63a5..17195f75 100644 --- a/modules/homeManager/home/packages/asciidoctor/default.nix +++ b/modules/homeManager/home/packages/asciidoctor/default.nix @@ -4,12 +4,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.asciidoctor.enable = - lib.mkEnableOption "modules.homeManager.home.packages.asciidoctor"; + options.dotfiles.homeManager.home.packages.asciidoctor.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.asciidoctor"; config = lib.mkIf - config.modules.homeManager.home.packages.asciidoctor.enable { + config.dotfiles.homeManager.home.packages.asciidoctor.enable { home.packages = [pkgs.asciidoctor-with-extensions]; }; } diff --git a/modules/homeManager/home/packages/bandwhich/default.nix b/modules/homeManager/home/packages/bandwhich/default.nix index a236f4a3..3d619b87 100644 --- a/modules/homeManager/home/packages/bandwhich/default.nix +++ b/modules/homeManager/home/packages/bandwhich/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.bandwhich.enable = - lib.mkEnableOption "modules.homeManager.home.packages.bandwhich"; + options.dotfiles.homeManager.home.packages.bandwhich.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.bandwhich"; - config = lib.mkIf config.modules.homeManager.home.packages.bandwhich.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.bandwhich.enable { home.packages = [pkgs.bandwhich]; }; } diff --git a/modules/homeManager/home/packages/catimg/default.nix b/modules/homeManager/home/packages/catimg/default.nix index 908170d9..75ea576c 100644 --- a/modules/homeManager/home/packages/catimg/default.nix +++ b/modules/homeManager/home/packages/catimg/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.catimg.enable = - lib.mkEnableOption "modules.homeManager.home.packages.catimg"; + options.dotfiles.homeManager.home.packages.catimg.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.catimg"; - config = lib.mkIf config.modules.homeManager.home.packages.catimg.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.catimg.enable { home.packages = [pkgs.catimg]; }; } diff --git a/modules/homeManager/home/packages/catnip/default.nix b/modules/homeManager/home/packages/catnip/default.nix index 5ac2d90f..5899b57b 100644 --- a/modules/homeManager/home/packages/catnip/default.nix +++ b/modules/homeManager/home/packages/catnip/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.catnip.enable = - lib.mkEnableOption "modules.homeManager.home.packages.catnip"; + options.dotfiles.homeManager.home.packages.catnip.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.catnip"; - config = lib.mkIf config.modules.homeManager.home.packages.catnip.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.catnip.enable { home.packages = [pkgs.catnip]; }; } diff --git a/modules/homeManager/home/packages/diskonaut/default.nix b/modules/homeManager/home/packages/diskonaut/default.nix index fac8c90a..e833e2a4 100644 --- a/modules/homeManager/home/packages/diskonaut/default.nix +++ b/modules/homeManager/home/packages/diskonaut/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.diskonaut.enable = - lib.mkEnableOption "modules.homeManager.home.packages.diskonaut"; + options.dotfiles.homeManager.home.packages.diskonaut.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.diskonaut"; - config = lib.mkIf config.modules.homeManager.home.packages.diskonaut.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.diskonaut.enable { home.packages = [pkgs.diskonaut]; }; } diff --git a/modules/homeManager/home/packages/du-dust/default.nix b/modules/homeManager/home/packages/du-dust/default.nix index d1e96500..5f9d406a 100644 --- a/modules/homeManager/home/packages/du-dust/default.nix +++ b/modules/homeManager/home/packages/du-dust/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.du-dust.enable = - lib.mkEnableOption "modules.homeManager.home.packages.du-dust"; + options.dotfiles.homeManager.home.packages.du-dust.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.du-dust"; - config = lib.mkIf config.modules.homeManager.home.packages.du-dust.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.du-dust.enable { home.packages = [pkgs.du-dust]; }; } diff --git a/modules/homeManager/home/packages/dua/default.nix b/modules/homeManager/home/packages/dua/default.nix index 64635e98..3438b54b 100644 --- a/modules/homeManager/home/packages/dua/default.nix +++ b/modules/homeManager/home/packages/dua/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.dua.enable = - lib.mkEnableOption "modules.homeManager.home.packages.dua"; + options.dotfiles.homeManager.home.packages.dua.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.dua"; - config = lib.mkIf config.modules.homeManager.home.packages.dua.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.dua.enable { home.packages = [pkgs.dua]; }; } diff --git a/modules/homeManager/home/packages/duf/default.nix b/modules/homeManager/home/packages/duf/default.nix index 48094cd0..a4c9c278 100644 --- a/modules/homeManager/home/packages/duf/default.nix +++ b/modules/homeManager/home/packages/duf/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.duf.enable = - lib.mkEnableOption "modules.homeManager.home.packages.duf"; + options.dotfiles.homeManager.home.packages.duf.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.duf"; - config = lib.mkIf config.modules.homeManager.home.packages.duf.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.duf.enable { home.packages = [pkgs.duf]; }; } diff --git a/modules/homeManager/home/packages/fd/default.nix b/modules/homeManager/home/packages/fd/default.nix index 35036ae7..17f939b1 100644 --- a/modules/homeManager/home/packages/fd/default.nix +++ b/modules/homeManager/home/packages/fd/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.fd.enable = - lib.mkEnableOption "modules.homeManager.home.packages.fd"; + options.dotfiles.homeManager.home.packages.fd.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.fd"; - config = lib.mkIf config.modules.homeManager.home.packages.fd.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.fd.enable { home.packages = [pkgs.fd]; }; } diff --git a/modules/homeManager/home/packages/ffmpeg/default.nix b/modules/homeManager/home/packages/ffmpeg/default.nix index 20dd67be..54f2e6a0 100644 --- a/modules/homeManager/home/packages/ffmpeg/default.nix +++ b/modules/homeManager/home/packages/ffmpeg/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.ffmpeg.enable = - lib.mkEnableOption "modules.homeManager.home.packages.ffmpeg"; + options.dotfiles.homeManager.home.packages.ffmpeg.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.ffmpeg"; - config = lib.mkIf config.modules.homeManager.home.packages.ffmpeg.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.ffmpeg.enable { home.packages = [pkgs.ffmpeg]; }; } diff --git a/modules/homeManager/home/packages/file/default.nix b/modules/homeManager/home/packages/file/default.nix index 1bd2c885..eb0410ef 100644 --- a/modules/homeManager/home/packages/file/default.nix +++ b/modules/homeManager/home/packages/file/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.file.enable = - lib.mkEnableOption "modules.homeManager.home.packages.file"; + options.dotfiles.homeManager.home.packages.file.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.file"; - config = lib.mkIf config.modules.homeManager.home.packages.file.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.file.enable { home.packages = [pkgs.file]; }; } diff --git a/modules/homeManager/home/packages/gcc/default.nix b/modules/homeManager/home/packages/gcc/default.nix index 020aa963..b6877b4d 100644 --- a/modules/homeManager/home/packages/gcc/default.nix +++ b/modules/homeManager/home/packages/gcc/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.gcc.enable = - lib.mkEnableOption "modules.homeManager.home.packages.gcc"; + options.dotfiles.homeManager.home.packages.gcc.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.gcc"; - config = lib.mkIf config.modules.homeManager.home.packages.gcc.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.gcc.enable { home.packages = [pkgs.gcc]; }; } diff --git a/modules/homeManager/home/packages/gimp/default.nix b/modules/homeManager/home/packages/gimp/default.nix index d31bbdba..c5a19b38 100644 --- a/modules/homeManager/home/packages/gimp/default.nix +++ b/modules/homeManager/home/packages/gimp/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.gimp.enable = - lib.mkEnableOption "modules.homeManager.home.packages.gimp"; + options.dotfiles.homeManager.home.packages.gimp.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.gimp"; - config = lib.mkIf config.modules.homeManager.home.packages.gimp.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.gimp.enable { home.packages = [pkgs.gimp]; }; } diff --git a/modules/homeManager/home/packages/glava/default.nix b/modules/homeManager/home/packages/glava/default.nix index 44793ba2..718a71d3 100644 --- a/modules/homeManager/home/packages/glava/default.nix +++ b/modules/homeManager/home/packages/glava/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.glava.enable = - lib.mkEnableOption "modules.homeManager.home.packages.glava"; + options.dotfiles.homeManager.home.packages.glava.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.glava"; - config = lib.mkIf config.modules.homeManager.home.packages.glava.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.glava.enable { home.packages = [pkgs.glava]; }; } diff --git a/modules/homeManager/home/packages/glow/default.nix b/modules/homeManager/home/packages/glow/default.nix index 85a34669..bf31e5b6 100644 --- a/modules/homeManager/home/packages/glow/default.nix +++ b/modules/homeManager/home/packages/glow/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.glow.enable = - lib.mkEnableOption "modules.homeManager.home.packages.glow"; + options.dotfiles.homeManager.home.packages.glow.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.glow"; - config = lib.mkIf config.modules.homeManager.home.packages.glow.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.glow.enable { home.packages = [pkgs.glow]; }; } diff --git a/modules/homeManager/home/packages/gping/default.nix b/modules/homeManager/home/packages/gping/default.nix index fc2c4224..ee3915e8 100644 --- a/modules/homeManager/home/packages/gping/default.nix +++ b/modules/homeManager/home/packages/gping/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.gping.enable = - lib.mkEnableOption "modules.homeManager.home.packages.gping"; + options.dotfiles.homeManager.home.packages.gping.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.gping"; - config = lib.mkIf config.modules.homeManager.home.packages.gping.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.gping.enable { home.packages = [pkgs.gping]; }; } diff --git a/modules/homeManager/home/packages/inkscape/default.nix b/modules/homeManager/home/packages/inkscape/default.nix index 9f359c66..350a4a25 100644 --- a/modules/homeManager/home/packages/inkscape/default.nix +++ b/modules/homeManager/home/packages/inkscape/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.inkscape.enable = - lib.mkEnableOption "modules.homeManager.home.packages.inkscape"; + options.dotfiles.homeManager.home.packages.inkscape.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.inkscape"; - config = lib.mkIf config.modules.homeManager.home.packages.inkscape.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.inkscape.enable { home.packages = [pkgs.inkscape]; }; } diff --git a/modules/homeManager/home/packages/kdenlive/default.nix b/modules/homeManager/home/packages/kdenlive/default.nix index e6d474b1..08c86305 100644 --- a/modules/homeManager/home/packages/kdenlive/default.nix +++ b/modules/homeManager/home/packages/kdenlive/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.kdenlive.enable = - lib.mkEnableOption "modules.homeManager.home.packages.kdenlive"; + options.dotfiles.homeManager.home.packages.kdenlive.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.kdenlive"; - config = lib.mkIf config.modules.homeManager.home.packages.kdenlive.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.kdenlive.enable { home.packages = [pkgs.libsForQt5.kdenlive]; }; } diff --git a/modules/homeManager/home/packages/killall/default.nix b/modules/homeManager/home/packages/killall/default.nix index 9af2a1ee..ee277c8a 100644 --- a/modules/homeManager/home/packages/killall/default.nix +++ b/modules/homeManager/home/packages/killall/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.killall.enable = - lib.mkEnableOption "modules.homeManager.home.packages.killall"; + options.dotfiles.homeManager.home.packages.killall.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.killall"; - config = lib.mkIf config.modules.homeManager.home.packages.killall.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.killall.enable { home.packages = [pkgs.killall]; }; } diff --git a/modules/homeManager/home/packages/libreoffice/default.nix b/modules/homeManager/home/packages/libreoffice/default.nix index 9b8bcf97..51e74697 100644 --- a/modules/homeManager/home/packages/libreoffice/default.nix +++ b/modules/homeManager/home/packages/libreoffice/default.nix @@ -4,12 +4,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.libreoffice.enable = - lib.mkEnableOption "modules.homeManager.home.packages.libreoffice"; + options.dotfiles.homeManager.home.packages.libreoffice.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.libreoffice"; config = lib.mkIf - config.modules.homeManager.home.packages.libreoffice.enable { + config.dotfiles.homeManager.home.packages.libreoffice.enable { home.packages = [pkgs.libreoffice]; }; } diff --git a/modules/homeManager/home/packages/neofetch/default.nix b/modules/homeManager/home/packages/neofetch/default.nix index fe0bfc05..fa8cb0e2 100644 --- a/modules/homeManager/home/packages/neofetch/default.nix +++ b/modules/homeManager/home/packages/neofetch/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.neofetch.enable = - lib.mkEnableOption "modules.homeManager.home.packages.neofetch"; + options.dotfiles.homeManager.home.packages.neofetch.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.neofetch"; - config = lib.mkIf config.modules.homeManager.home.packages.neofetch.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.neofetch.enable { home.packages = [pkgs.neofetch]; }; } diff --git a/modules/homeManager/home/packages/p7zip/default.nix b/modules/homeManager/home/packages/p7zip/default.nix index 50e434d0..d667517a 100644 --- a/modules/homeManager/home/packages/p7zip/default.nix +++ b/modules/homeManager/home/packages/p7zip/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.p7zip.enable = - lib.mkEnableOption "modules.homeManager.home.packages.p7zip"; + options.dotfiles.homeManager.home.packages.p7zip.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.p7zip"; - config = lib.mkIf config.modules.homeManager.home.packages.p7zip.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.p7zip.enable { home.packages = [pkgs.p7zip]; }; } diff --git a/modules/homeManager/home/packages/parallel/default.nix b/modules/homeManager/home/packages/parallel/default.nix index 942307ea..b5df5ff3 100644 --- a/modules/homeManager/home/packages/parallel/default.nix +++ b/modules/homeManager/home/packages/parallel/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.parallel.enable = - lib.mkEnableOption "modules.homeManager.home.packages.parallel"; + options.dotfiles.homeManager.home.packages.parallel.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.parallel"; - config = lib.mkIf config.modules.homeManager.home.packages.parallel.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.parallel.enable { home.packages = [(pkgs.parallel-full.override {willCite = true;})]; }; } diff --git a/modules/homeManager/home/packages/pipe-rename/default.nix b/modules/homeManager/home/packages/pipe-rename/default.nix index e418d9f0..e8ccf803 100644 --- a/modules/homeManager/home/packages/pipe-rename/default.nix +++ b/modules/homeManager/home/packages/pipe-rename/default.nix @@ -4,12 +4,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.pipe-rename.enable = - lib.mkEnableOption "modules.homeManager.home.packages.pipe-rename"; + options.dotfiles.homeManager.home.packages.pipe-rename.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.pipe-rename"; config = lib.mkIf - config.modules.homeManager.home.packages.pipe-rename.enable { + config.dotfiles.homeManager.home.packages.pipe-rename.enable { home.packages = [pkgs.pipe-rename]; }; } diff --git a/modules/homeManager/home/packages/poppler_utils/default.nix b/modules/homeManager/home/packages/poppler_utils/default.nix index 2554b312..bef55fde 100644 --- a/modules/homeManager/home/packages/poppler_utils/default.nix +++ b/modules/homeManager/home/packages/poppler_utils/default.nix @@ -4,12 +4,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.poppler_utils.enable = - lib.mkEnableOption "modules.homeManager.home.packages.poppler_utils"; + options.dotfiles.homeManager.home.packages.poppler_utils.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.poppler_utils"; config = lib.mkIf - config.modules.homeManager.home.packages.poppler_utils.enable { + config.dotfiles.homeManager.home.packages.poppler_utils.enable { home.packages = [pkgs.poppler_utils]; }; } diff --git a/modules/homeManager/home/packages/procs/default.nix b/modules/homeManager/home/packages/procs/default.nix index 30142407..770e0060 100644 --- a/modules/homeManager/home/packages/procs/default.nix +++ b/modules/homeManager/home/packages/procs/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.procs.enable = - lib.mkEnableOption "modules.homeManager.home.packages.procs"; + options.dotfiles.homeManager.home.packages.procs.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.procs"; - config = lib.mkIf config.modules.homeManager.home.packages.procs.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.procs.enable { home.packages = [pkgs.procs]; }; } diff --git a/modules/homeManager/home/packages/pstree/default.nix b/modules/homeManager/home/packages/pstree/default.nix index 300e50f5..8736373d 100644 --- a/modules/homeManager/home/packages/pstree/default.nix +++ b/modules/homeManager/home/packages/pstree/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.pstree.enable = - lib.mkEnableOption "modules.homeManager.home.packages.pstree"; + options.dotfiles.homeManager.home.packages.pstree.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.pstree"; - config = lib.mkIf config.modules.homeManager.home.packages.pstree.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.pstree.enable { home.packages = [pkgs.pstree]; }; } diff --git a/modules/homeManager/home/packages/ripgrep-all/default.nix b/modules/homeManager/home/packages/ripgrep-all/default.nix index 13847a6f..29f26601 100644 --- a/modules/homeManager/home/packages/ripgrep-all/default.nix +++ b/modules/homeManager/home/packages/ripgrep-all/default.nix @@ -4,12 +4,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.ripgrep-all.enable = - lib.mkEnableOption "modules.homeManager.home.packages.ripgrep-all"; + options.dotfiles.homeManager.home.packages.ripgrep-all.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.ripgrep-all"; config = lib.mkIf - config.modules.homeManager.home.packages.ripgrep-all.enable { + config.dotfiles.homeManager.home.packages.ripgrep-all.enable { home.packages = [pkgs.ripgrep-all]; }; } diff --git a/modules/homeManager/home/packages/rustup/default.nix b/modules/homeManager/home/packages/rustup/default.nix index 89b08dc8..8dab963a 100644 --- a/modules/homeManager/home/packages/rustup/default.nix +++ b/modules/homeManager/home/packages/rustup/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.rustup.enable = - lib.mkEnableOption "modules.homeManager.home.packages.rustup"; + options.dotfiles.homeManager.home.packages.rustup.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.rustup"; - config = lib.mkIf config.modules.homeManager.home.packages.rustup.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.rustup.enable { home.packages = [pkgs.rustup]; }; } diff --git a/modules/homeManager/home/packages/thunderbird/default.nix b/modules/homeManager/home/packages/thunderbird/default.nix index 40ccfddb..a237f499 100644 --- a/modules/homeManager/home/packages/thunderbird/default.nix +++ b/modules/homeManager/home/packages/thunderbird/default.nix @@ -7,12 +7,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.thunderbird.enable = - lib.mkEnableOption "modules.homeManager.home.packages.thunderbird"; + options.dotfiles.homeManager.home.packages.thunderbird.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.thunderbird"; config = lib.mkIf - config.modules.homeManager.home.packages.thunderbird.enable { + config.dotfiles.homeManager.home.packages.thunderbird.enable { home.packages = [pkgs.thunderbird]; }; } diff --git a/modules/homeManager/home/packages/tldr/default.nix b/modules/homeManager/home/packages/tldr/default.nix index cb46e16f..7d0b997d 100644 --- a/modules/homeManager/home/packages/tldr/default.nix +++ b/modules/homeManager/home/packages/tldr/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.tldr.enable = - lib.mkEnableOption "modules.homeManager.home.packages.tldr"; + options.dotfiles.homeManager.home.packages.tldr.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.tldr"; - config = lib.mkIf config.modules.homeManager.home.packages.tldr.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.tldr.enable { home.packages = [pkgs.tldr]; }; } diff --git a/modules/homeManager/home/packages/tokei/default.nix b/modules/homeManager/home/packages/tokei/default.nix index 487ea38a..c0cdd05c 100644 --- a/modules/homeManager/home/packages/tokei/default.nix +++ b/modules/homeManager/home/packages/tokei/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.tokei.enable = - lib.mkEnableOption "modules.homeManager.home.packages.tokei"; + options.dotfiles.homeManager.home.packages.tokei.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.tokei"; - config = lib.mkIf config.modules.homeManager.home.packages.tokei.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.tokei.enable { home.packages = [pkgs.tokei]; }; } diff --git a/modules/homeManager/home/packages/tree/default.nix b/modules/homeManager/home/packages/tree/default.nix index 3514b9f6..32c1a5af 100644 --- a/modules/homeManager/home/packages/tree/default.nix +++ b/modules/homeManager/home/packages/tree/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.tree.enable = - lib.mkEnableOption "modules.homeManager.home.packages.tree"; + options.dotfiles.homeManager.home.packages.tree.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.tree"; - config = lib.mkIf config.modules.homeManager.home.packages.tree.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.tree.enable { home = { packages = [pkgs.tree]; diff --git a/modules/homeManager/home/packages/unzip/default.nix b/modules/homeManager/home/packages/unzip/default.nix index 684321b5..727831a6 100644 --- a/modules/homeManager/home/packages/unzip/default.nix +++ b/modules/homeManager/home/packages/unzip/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.unzip.enable = - lib.mkEnableOption "modules.homeManager.home.packages.unzip"; + options.dotfiles.homeManager.home.packages.unzip.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.unzip"; - config = lib.mkIf config.modules.homeManager.home.packages.unzip.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.unzip.enable { home.packages = [pkgs.unzip]; }; } diff --git a/modules/homeManager/home/packages/wl-clipboard/default.nix b/modules/homeManager/home/packages/wl-clipboard/default.nix index d1cfee16..71f34dc9 100644 --- a/modules/homeManager/home/packages/wl-clipboard/default.nix +++ b/modules/homeManager/home/packages/wl-clipboard/default.nix @@ -4,12 +4,12 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.wl-clipboard.enable = - lib.mkEnableOption "modules.homeManager.home.packages.wl-clipboard"; + options.dotfiles.homeManager.home.packages.wl-clipboard.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.wl-clipboard"; config = lib.mkIf - config.modules.homeManager.home.packages.wl-clipboard.enable { + config.dotfiles.homeManager.home.packages.wl-clipboard.enable { home.packages = [pkgs.wl-clipboard]; }; } diff --git a/modules/homeManager/home/packages/xdg-utils/default.nix b/modules/homeManager/home/packages/xdg-utils/default.nix index 10f5f2b7..a4c1c6be 100644 --- a/modules/homeManager/home/packages/xdg-utils/default.nix +++ b/modules/homeManager/home/packages/xdg-utils/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.xdg-utils.enable = - lib.mkEnableOption "modules.homeManager.home.packages.xdg-utils"; + options.dotfiles.homeManager.home.packages.xdg-utils.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.xdg-utils"; - config = lib.mkIf config.modules.homeManager.home.packages.xdg-utils.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.xdg-utils.enable { home.packages = [pkgs.xdg-utils]; }; } diff --git a/modules/homeManager/home/packages/zip/default.nix b/modules/homeManager/home/packages/zip/default.nix index 30422b4a..75a04077 100644 --- a/modules/homeManager/home/packages/zip/default.nix +++ b/modules/homeManager/home/packages/zip/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.packages.zip.enable = - lib.mkEnableOption "modules.homeManager.home.packages.zip"; + options.dotfiles.homeManager.home.packages.zip.enable = + lib.mkEnableOption "dotfiles.homeManager.home.packages.zip"; - config = lib.mkIf config.modules.homeManager.home.packages.zip.enable { + config = lib.mkIf config.dotfiles.homeManager.home.packages.zip.enable { home.packages = [pkgs.zip]; }; } diff --git a/modules/homeManager/home/sessionVariables/default.nix b/modules/homeManager/home/sessionVariables/default.nix index 0a46def5..f9da25b6 100644 --- a/modules/homeManager/home/sessionVariables/default.nix +++ b/modules/homeManager/home/sessionVariables/default.nix @@ -9,8 +9,8 @@ # declare any dependencies using 'imports'. imports = []; - options.modules.homeManager.home.sessionVariables = let - module = "modules.homeManager.home.sessionVariables"; + options.dotfiles.homeManager.home.sessionVariables = let + module = "dotfiles.homeManager.home.sessionVariables"; in { BROWSER.enable = lib.mkEnableOption "${module}.BROWSER"; @@ -38,7 +38,7 @@ # packages are unavailable in 'config' due to the intentional lack of # unconditional 'imports'. config.home.sessionVariables = let - cfg = config.modules.homeManager.home.sessionVariables; + cfg = config.dotfiles.homeManager.home.sessionVariables; neovim = lib.getExe (config.programs.nixvim.finalPackage or pkgs.neovim); in # The 'lib.mkMerge [(lib.mkIf { = ;})];' pattern is diff --git a/modules/homeManager/home/shellAliases/default.nix b/modules/homeManager/home/shellAliases/default.nix index aae335f0..f7b772a6 100644 --- a/modules/homeManager/home/shellAliases/default.nix +++ b/modules/homeManager/home/shellAliases/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.home.shellAliases.enable = - lib.mkEnableOption "modules.homeManager.home.shellAliases"; + options.dotfiles.homeManager.home.shellAliases.enable = + lib.mkEnableOption "dotfiles.homeManager.home.shellAliases"; - config = lib.mkIf config.modules.homeManager.home.shellAliases.enable { + config = lib.mkIf config.dotfiles.homeManager.home.shellAliases.enable { home.shellAliases = { c = "cd"; cal = "${lib.getExe' pkgs.util-linux "cal"} --monday"; diff --git a/modules/homeManager/nixpkgs/config/allowUnfree/default.nix b/modules/homeManager/nixpkgs/config/allowUnfree/default.nix index a974c001..7fcb4e8d 100644 --- a/modules/homeManager/nixpkgs/config/allowUnfree/default.nix +++ b/modules/homeManager/nixpkgs/config/allowUnfree/default.nix @@ -3,13 +3,13 @@ lib, ... }: let - module = "modules.homeManager.nixpkgs.config.allowUnfree"; + module = "dotfiles.homeManager.nixpkgs.config.allowUnfree"; in { - options.modules.homeManager.nixpkgs.config.allowUnfree.enable = + options.dotfiles.homeManager.nixpkgs.config.allowUnfree.enable = lib.mkEnableOption module; config = let - cfg = config.modules.homeManager.nixpkgs.config.allowUnfree; + cfg = config.dotfiles.homeManager.nixpkgs.config.allowUnfree; string = "'nixpkgs.config.allowUnfree = ${toString cfg.enable};'"; in { home.activation.${module} = diff --git a/modules/homeManager/programs/bash/default.nix b/modules/homeManager/programs/bash/default.nix index ca90e934..e2793076 100644 --- a/modules/homeManager/programs/bash/default.nix +++ b/modules/homeManager/programs/bash/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.bash.enable = - lib.mkEnableOption "modules.homeManager.programs.bash"; + options.dotfiles.homeManager.programs.bash.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.bash"; - config = lib.mkIf config.modules.homeManager.programs.bash.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.bash.enable { programs.bash.enable = true; }; } diff --git a/modules/homeManager/programs/bashmount/default.nix b/modules/homeManager/programs/bashmount/default.nix index d334176a..5a2ae927 100644 --- a/modules/homeManager/programs/bashmount/default.nix +++ b/modules/homeManager/programs/bashmount/default.nix @@ -3,12 +3,12 @@ lib, ... }: let - module = "modules.homeManager.programs.bashmount"; + module = "dotfiles.homeManager.programs.bashmount"; in { - options.modules.homeManager.programs.bashmount.enable = + options.dotfiles.homeManager.programs.bashmount.enable = lib.mkEnableOption module; - config = lib.mkIf config.modules.homeManager.programs.bashmount.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.bashmount.enable { home.activation = { ${module} = lib.dotfiles.lib.hm.dag.entryBefore.writeBoundary.systemRequirement diff --git a/modules/homeManager/programs/bat/default.nix b/modules/homeManager/programs/bat/default.nix index f6ddb6f6..bf7e44ea 100644 --- a/modules/homeManager/programs/bat/default.nix +++ b/modules/homeManager/programs/bat/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.programs.bat.enable = - lib.mkEnableOption "modules.homeManager.programs.bat"; + options.dotfiles.homeManager.programs.bat.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.bat"; - config = lib.mkIf config.modules.homeManager.programs.bat.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.bat.enable { # TODO: Add upstream 'config.programs.bat.finalPackage' option. home.shellAliases.b = lib.getExe pkgs.bat; diff --git a/modules/homeManager/programs/borgmatic/default.nix b/modules/homeManager/programs/borgmatic/default.nix index 1f608c04..3a7159af 100644 --- a/modules/homeManager/programs/borgmatic/default.nix +++ b/modules/homeManager/programs/borgmatic/default.nix @@ -6,11 +6,11 @@ }: { imports = [../../../agenix/homeManagerModules/default]; - options.modules.homeManager.programs.borgmatic.enable = - lib.mkEnableOption "modules.homeManager.programs.borgmatic"; + options.dotfiles.homeManager.programs.borgmatic.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.borgmatic"; - config = lib.mkIf config.modules.homeManager.programs.borgmatic.enable { - modules.agenix.homeManagerModules.default.enable = true; + config = lib.mkIf config.dotfiles.homeManager.programs.borgmatic.enable { + dotfiles.agenix.homeManagerModules.default.enable = true; age.secrets.modulesHomeManagerProgramsBorgmaticEncryptionPasscommand = { file = ./encryption_passcommand.age; diff --git a/modules/homeManager/programs/btop/default.nix b/modules/homeManager/programs/btop/default.nix index cad09231..cb54bc75 100644 --- a/modules/homeManager/programs/btop/default.nix +++ b/modules/homeManager/programs/btop/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.btop.enable = - lib.mkEnableOption "modules.homeManager.programs.btop"; + options.dotfiles.homeManager.programs.btop.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.btop"; - config = lib.mkIf config.modules.homeManager.programs.btop.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.btop.enable { programs.btop.enable = true; }; } diff --git a/modules/homeManager/programs/direnv/default.nix b/modules/homeManager/programs/direnv/default.nix index 020d6027..336527dd 100644 --- a/modules/homeManager/programs/direnv/default.nix +++ b/modules/homeManager/programs/direnv/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.direnv.enable = - lib.mkEnableOption "modules.homeManager.programs.direnv"; + options.dotfiles.homeManager.programs.direnv.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.direnv"; - config = lib.mkIf config.modules.homeManager.programs.direnv.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.direnv.enable { programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/modules/homeManager/programs/eza/default.nix b/modules/homeManager/programs/eza/default.nix index e0549f3a..f388d0a5 100644 --- a/modules/homeManager/programs/eza/default.nix +++ b/modules/homeManager/programs/eza/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.eza.enable = - lib.mkEnableOption "modules.homeManager.programs.eza"; + options.dotfiles.homeManager.programs.eza.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.eza"; - config = lib.mkIf config.modules.homeManager.programs.eza.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.eza.enable { # The local 'home.shellAliases' variables are not replaced with the arguably # simpler # diff --git a/modules/homeManager/programs/feh/default.nix b/modules/homeManager/programs/feh/default.nix index 112c5a99..11cf408a 100644 --- a/modules/homeManager/programs/feh/default.nix +++ b/modules/homeManager/programs/feh/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.feh.enable = - lib.mkEnableOption "modules.homeManager.programs.feh"; + options.dotfiles.homeManager.programs.feh.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.feh"; - config = lib.mkIf config.modules.homeManager.programs.feh.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.feh.enable { programs.feh.enable = true; }; } diff --git a/modules/homeManager/programs/firefox/default.nix b/modules/homeManager/programs/firefox/default.nix index 4babd830..c8990718 100644 --- a/modules/homeManager/programs/firefox/default.nix +++ b/modules/homeManager/programs/firefox/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.firefox.enable = - lib.mkEnableOption "modules.homeManager.programs.firefox"; + options.dotfiles.homeManager.programs.firefox.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.firefox"; - config = lib.mkIf config.modules.homeManager.programs.firefox.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.firefox.enable { programs.firefox.enable = true; }; } diff --git a/modules/homeManager/programs/fish/default.nix b/modules/homeManager/programs/fish/default.nix index 10174ac7..2052a378 100644 --- a/modules/homeManager/programs/fish/default.nix +++ b/modules/homeManager/programs/fish/default.nix @@ -12,16 +12,16 @@ ../../wayland/windowManager/hyprland ]; - options.modules.homeManager.programs.fish.enable = - lib.mkEnableOption "modules.homeManager.programs.fish"; + options.dotfiles.homeManager.programs.fish.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.fish"; # TODO: Add missing fish plugin dependencies upstream. config = lib.mkIf - config.modules.homeManager.programs.fish.enable + config.dotfiles.homeManager.programs.fish.enable (lib.mkMerge [ { - modules.homeManager = { + dotfiles.homeManager = { home = { packages.asciidoctor.enable = true; @@ -314,7 +314,7 @@ } { - modules.homeManager.home.packages.wl-clipboard.enable = true; + dotfiles.homeManager.home.packages.wl-clipboard.enable = true; home = { packages = [pkgs.fzf]; @@ -351,7 +351,7 @@ git.aliases = lib.mkIf - config.modules.homeManager.programs.git.enable + config.dotfiles.homeManager.programs.git.enable (builtins.mapAttrs (_: value: "forgit ${value}") { a = "add"; b = "checkout_branch"; diff --git a/modules/homeManager/programs/fzf/default.nix b/modules/homeManager/programs/fzf/default.nix index 50bf72de..ca4b33d9 100644 --- a/modules/homeManager/programs/fzf/default.nix +++ b/modules/homeManager/programs/fzf/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.fzf.enable = - lib.mkEnableOption "modules.homeManager.programs.fzf"; + options.dotfiles.homeManager.programs.fzf.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.fzf"; - config = lib.mkIf config.modules.homeManager.programs.fzf.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.fzf.enable { programs.fzf.enable = true; }; } diff --git a/modules/homeManager/programs/gh/default.nix b/modules/homeManager/programs/gh/default.nix index 2b66adea..8d10ea42 100644 --- a/modules/homeManager/programs/gh/default.nix +++ b/modules/homeManager/programs/gh/default.nix @@ -6,11 +6,11 @@ }: { imports = [../../../agenix/homeManagerModules/default]; - options.modules.homeManager.programs.gh.enable = - lib.mkEnableOption "modules.homeManager.programs.gh"; + options.dotfiles.homeManager.programs.gh.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.gh"; - config = lib.mkIf config.modules.homeManager.programs.gh.enable { - modules.agenix.homeManagerModules.default.enable = true; + config = lib.mkIf config.dotfiles.homeManager.programs.gh.enable { + dotfiles.agenix.homeManagerModules.default.enable = true; age.secrets.modulesHomeManagerProgramsGhGhToken.file = ./gh_token.age; diff --git a/modules/homeManager/programs/git/default.nix b/modules/homeManager/programs/git/default.nix index 8f510a78..8f96a3be 100644 --- a/modules/homeManager/programs/git/default.nix +++ b/modules/homeManager/programs/git/default.nix @@ -6,14 +6,14 @@ }: { imports = [../gpg]; - options.modules.homeManager.programs.git.enable = - lib.mkEnableOption "modules.homeManager.programs.git"; + options.dotfiles.homeManager.programs.git.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.git"; config = let git = lib.getExe config.programs.git.package; in - lib.mkIf config.modules.homeManager.programs.git.enable { - modules.homeManager.programs.gpg.enable = true; + lib.mkIf config.dotfiles.homeManager.programs.git.enable { + dotfiles.homeManager.programs.gpg.enable = true; # The local 'home.shellAliases' variables are not replaced with the # arguably simpler diff --git a/modules/homeManager/programs/gpg/default.nix b/modules/homeManager/programs/gpg/default.nix index d6a77bef..f0f2e97e 100644 --- a/modules/homeManager/programs/gpg/default.nix +++ b/modules/homeManager/programs/gpg/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.gpg.enable = - lib.mkEnableOption "modules.homeManager.programs.gpg"; + options.dotfiles.homeManager.programs.gpg.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.gpg"; - config = lib.mkIf config.modules.homeManager.programs.gpg.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.gpg.enable { programs.gpg.enable = true; }; } diff --git a/modules/homeManager/programs/home-manager/default.nix b/modules/homeManager/programs/home-manager/default.nix index 619c3e86..3fd914de 100644 --- a/modules/homeManager/programs/home-manager/default.nix +++ b/modules/homeManager/programs/home-manager/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.home-manager.enable = - lib.mkEnableOption "modules.homeManager.programs.home-manager"; + options.dotfiles.homeManager.programs.home-manager.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.home-manager"; - config = lib.mkIf config.modules.homeManager.programs.home-manager.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.home-manager.enable { programs.home-manager.enable = true; }; } diff --git a/modules/homeManager/programs/imv/default.nix b/modules/homeManager/programs/imv/default.nix index c572d3de..8c3afa58 100644 --- a/modules/homeManager/programs/imv/default.nix +++ b/modules/homeManager/programs/imv/default.nix @@ -6,12 +6,12 @@ }: { imports = [../../xdg]; - options.modules.homeManager.programs.imv.enable = - lib.mkEnableOption "modules.homeManager.programs.imv"; + options.dotfiles.homeManager.programs.imv.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.imv"; config = lib.mkIf - config.modules.homeManager.programs.imv.enable + config.dotfiles.homeManager.programs.imv.enable (lib.mkMerge [ { programs.imv = { @@ -30,9 +30,9 @@ ( lib.mkIf - (config.modules.homeManager.home.packages.gimp.enable or false) + (config.dotfiles.homeManager.home.packages.gimp.enable or false) { - modules.homeManager.xdg.mimeApps.enable = true; + dotfiles.homeManager.xdg.mimeApps.enable = true; xdg.mimeApps.defaultApplications = let imvDesktop = "imv.desktop"; diff --git a/modules/homeManager/programs/jq/default.nix b/modules/homeManager/programs/jq/default.nix index 07dd9f77..66f22379 100644 --- a/modules/homeManager/programs/jq/default.nix +++ b/modules/homeManager/programs/jq/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.jq.enable = - lib.mkEnableOption "modules.homeManager.programs.jq"; + options.dotfiles.homeManager.programs.jq.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.jq"; - config = lib.mkIf config.modules.homeManager.programs.jq.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.jq.enable { programs.jq.enable = true; }; } diff --git a/modules/homeManager/programs/kitty/default.nix b/modules/homeManager/programs/kitty/default.nix index a4a9c3e8..26c1cd21 100644 --- a/modules/homeManager/programs/kitty/default.nix +++ b/modules/homeManager/programs/kitty/default.nix @@ -5,11 +5,11 @@ }: { imports = [../../home/sessionVariables]; - options.modules.homeManager.programs.kitty.enable = - lib.mkEnableOption "modules.homeManager.programs.kitty"; + options.dotfiles.homeManager.programs.kitty.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.kitty"; - config = lib.mkIf config.modules.homeManager.programs.kitty.enable { - modules.homeManager.home.sessionVariables = { + config = lib.mkIf config.dotfiles.homeManager.programs.kitty.enable { + dotfiles.homeManager.home.sessionVariables = { TERMINAL.enable = true; enable = true; }; diff --git a/modules/homeManager/programs/lazygit/default.nix b/modules/homeManager/programs/lazygit/default.nix index d41d6aeb..417799b9 100644 --- a/modules/homeManager/programs/lazygit/default.nix +++ b/modules/homeManager/programs/lazygit/default.nix @@ -6,11 +6,11 @@ }: { imports = [../git]; - options.modules.homeManager.programs.lazygit.enable = - lib.mkEnableOption "modules.homeManager.programs.lazygit"; + options.dotfiles.homeManager.programs.lazygit.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.lazygit"; - config = lib.mkIf config.modules.homeManager.programs.lazygit.enable { - modules.homeManager.programs.git.enable = true; + config = lib.mkIf config.dotfiles.homeManager.programs.lazygit.enable { + dotfiles.homeManager.programs.git.enable = true; home.shellAliases.lg = lib.getExe config.programs.lazygit.package; diff --git a/modules/homeManager/programs/man/default.nix b/modules/homeManager/programs/man/default.nix index c6753ae7..d2a88ea8 100644 --- a/modules/homeManager/programs/man/default.nix +++ b/modules/homeManager/programs/man/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.man.enable = - lib.mkEnableOption "modules.homeManager.programs.man"; + options.dotfiles.homeManager.programs.man.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.man"; - config = lib.mkIf config.modules.homeManager.programs.man.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.man.enable { programs.man.enable = true; }; } diff --git a/modules/homeManager/programs/mpv/default.nix b/modules/homeManager/programs/mpv/default.nix index 035385bd..2a27dd90 100644 --- a/modules/homeManager/programs/mpv/default.nix +++ b/modules/homeManager/programs/mpv/default.nix @@ -4,14 +4,14 @@ pkgs, ... }: let - module = "modules.homeManager.programs.mpv"; + module = "dotfiles.homeManager.programs.mpv"; in { imports = [../../../stylix]; - options.modules.homeManager.programs.mpv.enable = lib.mkEnableOption module; + options.dotfiles.homeManager.programs.mpv.enable = lib.mkEnableOption module; - config = lib.mkIf config.modules.homeManager.programs.mpv.enable { - modules.stylix.enable = true; + config = lib.mkIf config.dotfiles.homeManager.programs.mpv.enable { + dotfiles.stylix.enable = true; home.activation = { ${module} = diff --git a/modules/homeManager/programs/password-store/default.nix b/modules/homeManager/programs/password-store/default.nix index ebbd8a9f..f733665d 100644 --- a/modules/homeManager/programs/password-store/default.nix +++ b/modules/homeManager/programs/password-store/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.programs.password-store.enable = - lib.mkEnableOption "modules.homeManager.programs.password-store"; + options.dotfiles.homeManager.programs.password-store.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.password-store"; - config = lib.mkIf config.modules.homeManager.programs.password-store.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.password-store.enable { programs.password-store = { enable = true; package = pkgs.pass-wayland.withExtensions (exts: [exts.pass-otp]); diff --git a/modules/homeManager/programs/qutebrowser/default.nix b/modules/homeManager/programs/qutebrowser/default.nix index cb57defc..2dc3c8dc 100644 --- a/modules/homeManager/programs/qutebrowser/default.nix +++ b/modules/homeManager/programs/qutebrowser/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - module = "modules.homeManager.programs.qutebrowser"; + module = "dotfiles.homeManager.programs.qutebrowser"; in { imports = [ ../../home/packages/wl-clipboard @@ -15,15 +15,15 @@ in { ../xplr ]; - options.modules.homeManager.programs.qutebrowser.enable = + options.dotfiles.homeManager.programs.qutebrowser.enable = lib.mkEnableOption module; config = lib.mkIf - config.modules.homeManager.programs.qutebrowser.enable + config.dotfiles.homeManager.programs.qutebrowser.enable (lib.mkMerge [ { - modules.homeManager = { + dotfiles.homeManager = { home = { packages.wl-clipboard.enable = true; @@ -221,8 +221,10 @@ in { } ( - lib.mkIf (config.modules.homeManager.programs.firefox.enable or false) { - modules.homeManager.xdg.mimeApps.enable = true; + lib.mkIf + (config.dotfiles.homeManager.programs.firefox.enable or false) + { + dotfiles.homeManager.xdg.mimeApps.enable = true; xdg.mimeApps.defaultApplications = let qutebrowser = "org.qutebrowser.qutebrowser.desktop"; diff --git a/modules/homeManager/programs/ripgrep/default.nix b/modules/homeManager/programs/ripgrep/default.nix index 5933ab24..a86e2d65 100644 --- a/modules/homeManager/programs/ripgrep/default.nix +++ b/modules/homeManager/programs/ripgrep/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.ripgrep.enable = - lib.mkEnableOption "modules.homeManager.programs.ripgrep"; + options.dotfiles.homeManager.programs.ripgrep.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.ripgrep"; - config = lib.mkIf config.modules.homeManager.programs.ripgrep.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.ripgrep.enable { programs.ripgrep.enable = true; }; } diff --git a/modules/homeManager/programs/rofi/default.nix b/modules/homeManager/programs/rofi/default.nix index c13222ed..cd6afdba 100644 --- a/modules/homeManager/programs/rofi/default.nix +++ b/modules/homeManager/programs/rofi/default.nix @@ -6,16 +6,16 @@ }: { imports = [../password-store]; - options.modules.homeManager.programs.rofi = { - enable = lib.mkEnableOption "modules.homeManager.programs.rofi"; - pass.enable = lib.mkEnableOption "modules.homeManager.programs.rofi.pass"; + options.dotfiles.homeManager.programs.rofi = { + enable = lib.mkEnableOption "dotfiles.homeManager.programs.rofi"; + pass.enable = lib.mkEnableOption "dotfiles.homeManager.programs.rofi.pass"; }; config = let - cfg = config.modules.homeManager.programs.rofi; + cfg = config.dotfiles.homeManager.programs.rofi; in lib.mkIf (cfg.enable || cfg.pass.enable) { - modules.homeManager.programs.password-store.enable = true; + dotfiles.homeManager.programs.password-store.enable = true; programs.rofi = { enable = cfg.enable; diff --git a/modules/homeManager/programs/swaylock/default.nix b/modules/homeManager/programs/swaylock/default.nix index 366c5410..11f4bf66 100644 --- a/modules/homeManager/programs/swaylock/default.nix +++ b/modules/homeManager/programs/swaylock/default.nix @@ -3,12 +3,12 @@ lib, ... }: let - module = "modules.homeManager.programs.swaylock"; + module = "dotfiles.homeManager.programs.swaylock"; in { - options.modules.homeManager.programs.swaylock.enable = + options.dotfiles.homeManager.programs.swaylock.enable = lib.mkEnableOption module; - config = lib.mkIf config.modules.homeManager.programs.swaylock.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.swaylock.enable { home.activation.${module} = lib.dotfiles.lib.hm.dag.entryBefore.writeBoundary.systemRequirement module diff --git a/modules/homeManager/programs/taskwarrior/default.nix b/modules/homeManager/programs/taskwarrior/default.nix index 36ec6d11..43b05d31 100644 --- a/modules/homeManager/programs/taskwarrior/default.nix +++ b/modules/homeManager/programs/taskwarrior/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.taskwarrior.enable = - lib.mkEnableOption "modules.homeManager.programs.taskwarrior"; + options.dotfiles.homeManager.programs.taskwarrior.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.taskwarrior"; - config = lib.mkIf config.modules.homeManager.programs.taskwarrior.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.taskwarrior.enable { home.shellAliases.tk = lib.getExe config.programs.taskwarrior.package; programs.taskwarrior = { diff --git a/modules/homeManager/programs/wlogout/default.nix b/modules/homeManager/programs/wlogout/default.nix index 34d37402..095b9ebe 100644 --- a/modules/homeManager/programs/wlogout/default.nix +++ b/modules/homeManager/programs/wlogout/default.nix @@ -6,11 +6,11 @@ }: { imports = [../../services/swayidle]; - options.modules.homeManager.programs.wlogout.enable = - lib.mkEnableOption "modules.homeManager.programs.wlogout"; + options.dotfiles.homeManager.programs.wlogout.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.wlogout"; - config = lib.mkIf config.modules.homeManager.programs.wlogout.enable { - modules.homeManager.services.swayidle.enable = true; + config = lib.mkIf config.dotfiles.homeManager.programs.wlogout.enable { + dotfiles.homeManager.services.swayidle.enable = true; programs.wlogout = { enable = true; diff --git a/modules/homeManager/programs/xplr/default.nix b/modules/homeManager/programs/xplr/default.nix index 058f4035..75799142 100644 --- a/modules/homeManager/programs/xplr/default.nix +++ b/modules/homeManager/programs/xplr/default.nix @@ -5,10 +5,10 @@ pkgs, ... }: { - options.modules.homeManager.programs.xplr.enable = - lib.mkEnableOption "modules.homeManager.programs.xplr"; + options.dotfiles.homeManager.programs.xplr.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.xplr"; - config = lib.mkIf config.modules.homeManager.programs.xplr.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.xplr.enable { home.packages = let # TODO: add missing dependencies upstream. dependencies.inputs.dragonXplr = with pkgs; [curl xdragon]; diff --git a/modules/homeManager/programs/zathura/default.nix b/modules/homeManager/programs/zathura/default.nix index 65ac6dec..ccdf00d5 100644 --- a/modules/homeManager/programs/zathura/default.nix +++ b/modules/homeManager/programs/zathura/default.nix @@ -5,12 +5,12 @@ }: { imports = [../../xdg]; - options.modules.homeManager.programs.zathura.enable = - lib.mkEnableOption "modules.homeManager.programs.zathura"; + options.dotfiles.homeManager.programs.zathura.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.zathura"; config = lib.mkIf - config.modules.homeManager.programs.zathura.enable + config.dotfiles.homeManager.programs.zathura.enable (lib.mkMerge [ { programs.zathura = { @@ -21,9 +21,9 @@ ( lib.mkIf - (config.modules.homeManager.home.packages.gimp.enable or false) + (config.dotfiles.homeManager.home.packages.gimp.enable or false) { - modules.homeManager.xdg.mimeApps.enable = true; + dotfiles.homeManager.xdg.mimeApps.enable = true; xdg.mimeApps.defaultApplications = lib.mapAttrs' diff --git a/modules/homeManager/programs/zellij/default.nix b/modules/homeManager/programs/zellij/default.nix index 2447f1b2..c7386a5a 100644 --- a/modules/homeManager/programs/zellij/default.nix +++ b/modules/homeManager/programs/zellij/default.nix @@ -6,15 +6,15 @@ }: { imports = [../../home/sessionVariables]; - options.modules.homeManager.programs.zellij.enable = - lib.mkEnableOption "modules.homeManager.programs.zellij"; + options.dotfiles.homeManager.programs.zellij.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.zellij"; config = lib.mkIf - config.modules.homeManager.programs.zellij.enable + config.dotfiles.homeManager.programs.zellij.enable (lib.mkMerge [ { - modules.homeManager.home.sessionVariables = { + dotfiles.homeManager.home.sessionVariables = { EDITOR.enable = true; enable = true; }; diff --git a/modules/homeManager/programs/zoxide/default.nix b/modules/homeManager/programs/zoxide/default.nix index 0aa095df..468f6dfa 100644 --- a/modules/homeManager/programs/zoxide/default.nix +++ b/modules/homeManager/programs/zoxide/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.programs.zoxide.enable = - lib.mkEnableOption "modules.homeManager.programs.zoxide"; + options.dotfiles.homeManager.programs.zoxide.enable = + lib.mkEnableOption "dotfiles.homeManager.programs.zoxide"; - config = lib.mkIf config.modules.homeManager.programs.zoxide.enable { + config = lib.mkIf config.dotfiles.homeManager.programs.zoxide.enable { programs.zoxide.enable = true; }; } diff --git a/modules/homeManager/services/borgmatic/default.nix b/modules/homeManager/services/borgmatic/default.nix index dd2065b9..232df55a 100644 --- a/modules/homeManager/services/borgmatic/default.nix +++ b/modules/homeManager/services/borgmatic/default.nix @@ -5,11 +5,11 @@ }: { imports = [../../programs/borgmatic]; - options.modules.homeManager.services.borgmatic.enable = - lib.mkEnableOption "modules.homeManager.services.borgmatic"; + options.dotfiles.homeManager.services.borgmatic.enable = + lib.mkEnableOption "dotfiles.homeManager.services.borgmatic"; - config = lib.mkIf config.modules.homeManager.services.borgmatic.enable { - modules.homeManager.programs.borgmatic.enable = true; + config = lib.mkIf config.dotfiles.homeManager.services.borgmatic.enable { + dotfiles.homeManager.programs.borgmatic.enable = true; services.borgmatic.enable = true; }; } diff --git a/modules/homeManager/services/dunst/default.nix b/modules/homeManager/services/dunst/default.nix index fc60402e..282fdf5a 100644 --- a/modules/homeManager/services/dunst/default.nix +++ b/modules/homeManager/services/dunst/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.homeManager.services.dunst.enable = - lib.mkEnableOption "modules.homeManager.services.dunst"; + options.dotfiles.homeManager.services.dunst.enable = + lib.mkEnableOption "dotfiles.homeManager.services.dunst"; - config = lib.mkIf config.modules.homeManager.services.dunst.enable { + config = lib.mkIf config.dotfiles.homeManager.services.dunst.enable { services.dunst.enable = true; }; } diff --git a/modules/homeManager/services/easyeffects/default.nix b/modules/homeManager/services/easyeffects/default.nix index 8cf59794..686d0272 100644 --- a/modules/homeManager/services/easyeffects/default.nix +++ b/modules/homeManager/services/easyeffects/default.nix @@ -3,15 +3,15 @@ lib, ... }: let - module = "modules.homeManager.services.easyeffects"; + module = "dotfiles.homeManager.services.easyeffects"; in { - options.modules.homeManager.services.easyeffects.enable = + options.dotfiles.homeManager.services.easyeffects.enable = lib.mkEnableOption module; config = let preset = "default"; in - lib.mkIf config.modules.homeManager.services.easyeffects.enable { + lib.mkIf config.dotfiles.homeManager.services.easyeffects.enable { home.activation.${module} = lib.dotfiles.lib.hm.dag.entryBefore.writeBoundary.systemRequirement module diff --git a/modules/homeManager/services/gammastep/default.nix b/modules/homeManager/services/gammastep/default.nix index 2d698e2a..25078c5a 100644 --- a/modules/homeManager/services/gammastep/default.nix +++ b/modules/homeManager/services/gammastep/default.nix @@ -4,8 +4,8 @@ ... }: { # https://github.com/nix-community/home-manager/blob/release-23.11/modules/services/redshift-gammastep/lib/options.nix#L54-L72 - options.modules.homeManager.services.gammastep = { - enable = lib.mkEnableOption "modules.homeManager.services.gammastep"; + options.dotfiles.homeManager.services.gammastep = { + enable = lib.mkEnableOption "dotfiles.homeManager.services.gammastep"; latitude = lib.mkOption { default = 48.0; @@ -27,7 +27,7 @@ }; config = let - cfg = config.modules.homeManager.services.gammastep; + cfg = config.dotfiles.homeManager.services.gammastep; in lib.mkIf cfg.enable { services.gammastep = { diff --git a/modules/homeManager/services/gpg-agent/default.nix b/modules/homeManager/services/gpg-agent/default.nix index 4fe845dd..19adecc9 100644 --- a/modules/homeManager/services/gpg-agent/default.nix +++ b/modules/homeManager/services/gpg-agent/default.nix @@ -4,10 +4,10 @@ pkgs, ... }: { - options.modules.homeManager.services.gpg-agent.enable = - lib.mkEnableOption "modules.homeManager.services.gpg-agent"; + options.dotfiles.homeManager.services.gpg-agent.enable = + lib.mkEnableOption "dotfiles.homeManager.services.gpg-agent"; - config = lib.mkIf config.modules.homeManager.services.gpg-agent.enable { + config = lib.mkIf config.dotfiles.homeManager.services.gpg-agent.enable { services.gpg-agent = { enable = true; enableSshSupport = true; diff --git a/modules/homeManager/services/swayidle/default.nix b/modules/homeManager/services/swayidle/default.nix index ce816062..29b17bf8 100644 --- a/modules/homeManager/services/swayidle/default.nix +++ b/modules/homeManager/services/swayidle/default.nix @@ -6,11 +6,11 @@ }: { imports = [../../programs/swaylock]; - options.modules.homeManager.services.swayidle = { + options.dotfiles.homeManager.services.swayidle = { displayTimeout = { enable = lib.mkEnableOption - "modules.homeManager.services.swayidle.displayTimeout"; + "dotfiles.homeManager.services.swayidle.displayTimeout"; timeouts = { command = lib.mkOption { @@ -33,14 +33,14 @@ }; }; - enable = lib.mkEnableOption "modules.homeManager.services.swayidle"; + enable = lib.mkEnableOption "dotfiles.homeManager.services.swayidle"; }; config = let - cfg = config.modules.homeManager.services.swayidle; + cfg = config.dotfiles.homeManager.services.swayidle; in lib.mkIf cfg.enable { - modules.homeManager.programs.swaylock.enable = true; + dotfiles.homeManager.programs.swaylock.enable = true; services.swayidle = let command = "${lib.getExe pkgs.swaylock} --daemonize"; diff --git a/modules/homeManager/systemd/user/tmpfiles/rules/default.nix b/modules/homeManager/systemd/user/tmpfiles/rules/default.nix index 86d32480..c30f2fef 100644 --- a/modules/homeManager/systemd/user/tmpfiles/rules/default.nix +++ b/modules/homeManager/systemd/user/tmpfiles/rules/default.nix @@ -5,13 +5,13 @@ }: { imports = [../../../../home/sessionVariables]; - options.modules.homeManager.systemd.user.tmpfiles.rules.enable = - lib.mkEnableOption "modules.homeManager.systemd.user.tmpfiles.rules"; + options.dotfiles.homeManager.systemd.user.tmpfiles.rules.enable = + lib.mkEnableOption "dotfiles.homeManager.systemd.user.tmpfiles.rules"; config = lib.mkIf - config.modules.homeManager.systemd.user.tmpfiles.rules.enable { - modules.homeManager.home.sessionVariables = { + config.dotfiles.homeManager.systemd.user.tmpfiles.rules.enable { + dotfiles.homeManager.home.sessionVariables = { TMPDIR.enable = true; enable = true; }; diff --git a/modules/homeManager/wayland/windowManager/hyprland/default.nix b/modules/homeManager/wayland/windowManager/hyprland/default.nix index 2ace6e53..f9c8744d 100644 --- a/modules/homeManager/wayland/windowManager/hyprland/default.nix +++ b/modules/homeManager/wayland/windowManager/hyprland/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - module = "modules.homeManager.wayland.windowManager.hyprland"; + module = "dotfiles.homeManager.wayland.windowManager.hyprland"; in { imports = [ ../../../../wayland @@ -15,13 +15,13 @@ in { ../../../services/swayidle ]; - options.modules.homeManager.wayland.windowManager.hyprland.enable = + options.dotfiles.homeManager.wayland.windowManager.hyprland.enable = lib.mkEnableOption module; config = lib.mkIf - config.modules.homeManager.wayland.windowManager.hyprland.enable { - modules = { + config.dotfiles.homeManager.wayland.windowManager.hyprland.enable { + dotfiles = { homeManager = { home.sessionVariables = { BROWSER.enable = true; diff --git a/modules/homeManager/xdg/default.nix b/modules/homeManager/xdg/default.nix index 5950bdd8..8ae1553d 100644 --- a/modules/homeManager/xdg/default.nix +++ b/modules/homeManager/xdg/default.nix @@ -5,8 +5,8 @@ }: { imports = [../home/sessionVariables]; - options.modules.homeManager.xdg = let - module = "modules.homeManager.xdg"; + options.dotfiles.homeManager.xdg = let + module = "dotfiles.homeManager.xdg"; in { enable = lib.mkEnableOption module; mimeApps.enable = lib.mkEnableOption "${module}.mimeApps"; @@ -14,9 +14,9 @@ }; config = let - cfg = config.modules.homeManager.xdg; + cfg = config.dotfiles.homeManager.xdg; in { - modules.homeManager.home.sessionVariables = { + dotfiles.homeManager.home.sessionVariables = { TMPDIR.enable = true; enable = true; }; diff --git a/modules/nix-alien/default.nix b/modules/nix-alien/default.nix index 921f7c7f..1a4097a9 100644 --- a/modules/nix-alien/default.nix +++ b/modules/nix-alien/default.nix @@ -5,9 +5,9 @@ system, ... }: { - options.modules.nix-alien.enable = lib.mkEnableOption "modules.nix-alien"; + options.dotfiles.nix-alien.enable = lib.mkEnableOption "dotfiles.nix-alien"; - config = lib.mkIf config.modules.nix-alien.enable { + config = lib.mkIf config.dotfiles.nix-alien.enable { home.packages = [inputs.nix-alien.packages.${system}.nix-alien]; }; } diff --git a/modules/programs/nixvim/autoCmd/default.nix b/modules/programs/nixvim/autoCmd/default.nix index e64f35af..4be56bdf 100644 --- a/modules/programs/nixvim/autoCmd/default.nix +++ b/modules/programs/nixvim/autoCmd/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.autoCmd.enable = - lib.mkEnableOption "modules.programs.nixvim.autoCmd"; + options.dotfiles.programs.nixvim.autoCmd.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.autoCmd"; - config = lib.mkIf config.modules.programs.nixvim.autoCmd.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.autoCmd.enable { programs.nixvim.autoCmd = [ { command = ''%s/\s\+$//e''; diff --git a/modules/programs/nixvim/default.nix b/modules/programs/nixvim/default.nix index 3cf067a0..9c822243 100644 --- a/modules/programs/nixvim/default.nix +++ b/modules/programs/nixvim/default.nix @@ -13,17 +13,17 @@ inputs.nixvim.homeManagerModules.nixvim ]; - options.modules.programs.nixvim = { - enable = lib.mkEnableOption "modules.programs.nixvim"; - full = lib.mkEnableOption "modules.programs.nixvim.full"; + options.dotfiles.programs.nixvim = { + enable = lib.mkEnableOption "dotfiles.programs.nixvim"; + full = lib.mkEnableOption "dotfiles.programs.nixvim.full"; }; config = let - cfg = config.modules.programs.nixvim; + cfg = config.dotfiles.programs.nixvim; in lib.mkIf cfg.enable (lib.mkMerge [ { - modules.homeManager.home.sessionVariables = { + dotfiles.homeManager.home.sessionVariables = { EDITOR.enable = true; MANPAGER.enable = true; enable = true; @@ -44,7 +44,7 @@ } (lib.mkIf cfg.full { - modules.programs.nixvim = { + dotfiles.programs.nixvim = { autoCmd.enable = lib.mkDefault true; keymaps.enable = lib.mkDefault true; opts.enable = lib.mkDefault true; diff --git a/modules/programs/nixvim/keymaps/default.nix b/modules/programs/nixvim/keymaps/default.nix index a73bc0bd..d527305a 100644 --- a/modules/programs/nixvim/keymaps/default.nix +++ b/modules/programs/nixvim/keymaps/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.keymaps.enable = - lib.mkEnableOption "modules.programs.nixvim.keymaps"; + options.dotfiles.programs.nixvim.keymaps.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.keymaps"; - config = lib.mkIf config.modules.programs.nixvim.keymaps.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.keymaps.enable { programs.nixvim.keymaps = map (keymaps: {options.silent = true;} // keymaps) ((map (keymaps: {mode = "n";} // keymaps) ([ diff --git a/modules/programs/nixvim/opts/default.nix b/modules/programs/nixvim/opts/default.nix index fbdc006f..f0ed9eb0 100644 --- a/modules/programs/nixvim/opts/default.nix +++ b/modules/programs/nixvim/opts/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.opts.enable = - lib.mkEnableOption "modules.programs.nixvim.opts"; + options.dotfiles.programs.nixvim.opts.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.opts"; - config = lib.mkIf config.modules.programs.nixvim.opts.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.opts.enable { programs.nixvim = { extraConfigLua = '' vim.opt.matchpairs:append("<:>") diff --git a/modules/programs/nixvim/plugins/cmp/default.nix b/modules/programs/nixvim/plugins/cmp/default.nix index 3e447ab0..0011e11e 100644 --- a/modules/programs/nixvim/plugins/cmp/default.nix +++ b/modules/programs/nixvim/plugins/cmp/default.nix @@ -5,11 +5,11 @@ }: { imports = [../codeium-nvim ../lsp]; - options.modules.programs.nixvim.plugins.cmp.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.cmp"; + options.dotfiles.programs.nixvim.plugins.cmp.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.cmp"; - config = lib.mkIf config.modules.programs.nixvim.plugins.cmp.enable { - modules.programs.nixvim.plugins = { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.cmp.enable { + dotfiles.programs.nixvim.plugins = { codeium-nvim.enable = true; lsp.enable = true; }; diff --git a/modules/programs/nixvim/plugins/codeium-nvim/default.nix b/modules/programs/nixvim/plugins/codeium-nvim/default.nix index 61790ffa..c8f1ee13 100644 --- a/modules/programs/nixvim/plugins/codeium-nvim/default.nix +++ b/modules/programs/nixvim/plugins/codeium-nvim/default.nix @@ -8,27 +8,29 @@ ../../../../homeManager/nixpkgs/config/allowUnfree ]; - options.modules.programs.nixvim.plugins.codeium-nvim.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.codeium-nvim"; + options.dotfiles.programs.nixvim.plugins.codeium-nvim.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.codeium-nvim"; - config = lib.mkIf config.modules.programs.nixvim.plugins.codeium-nvim.enable { - modules = { - agenix.homeManagerModules.default.enable = true; - homeManager.nixpkgs.config.allowUnfree.enable = true; - }; + config = + lib.mkIf + config.dotfiles.programs.nixvim.plugins.codeium-nvim.enable { + dotfiles = { + agenix.homeManagerModules.default.enable = true; + homeManager.nixpkgs.config.allowUnfree.enable = true; + }; - age.secrets.modulesProgramsNixvimPluginsCodeiumApiKey = { - file = ../codeium_api_key.age; - }; + age.secrets.modulesProgramsNixvimPluginsCodeiumApiKey = { + file = ../codeium_api_key.age; + }; - programs.nixvim.plugins.codeium-nvim = { - configPath.__raw = '' - vim.fn.expand( - "${config.age.secrets.modulesProgramsNixvimPluginsCodeiumApiKey.path}" - ) - ''; + programs.nixvim.plugins.codeium-nvim = { + configPath.__raw = '' + vim.fn.expand( + "${config.age.secrets.modulesProgramsNixvimPluginsCodeiumApiKey.path}" + ) + ''; - enable = true; + enable = true; + }; }; - }; } diff --git a/modules/programs/nixvim/plugins/codeium-vim/default.nix b/modules/programs/nixvim/plugins/codeium-vim/default.nix index 30ee5464..c9dcf032 100644 --- a/modules/programs/nixvim/plugins/codeium-vim/default.nix +++ b/modules/programs/nixvim/plugins/codeium-vim/default.nix @@ -9,11 +9,11 @@ ../../../../homeManager/nixpkgs/config/allowUnfree ]; - options.modules.programs.nixvim.plugins.codeium-vim.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.codeium-vim"; + options.dotfiles.programs.nixvim.plugins.codeium-vim.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.codeium-vim"; - config = lib.mkIf config.modules.programs.nixvim.plugins.codeium-vim.enable { - modules = { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.codeium-vim.enable { + dotfiles = { agenix.homeManagerModules.default.enable = true; homeManager.nixpkgs.config.allowUnfree.enable = true; }; @@ -33,12 +33,12 @@ # [1]: https://github.com/Exafunction/codeium.nvim # [2]: https://github.com/Exafunction/codeium.vim # [3]: https://github.com/Exafunction/codeium.vim/issues/303 - home.activation."modules.programs.nixvim.plugins.codeium-vim" = + home.activation."dotfiles.programs.nixvim.plugins.codeium-vim" = lib.hm.dag.entryAfter ["writeBoundary"] ( lib.getExe (pkgs.writeShellApplication { - name = "modules-programs-nixvim"; + name = "dotfiles-programs-nixvim"; runtimeInputs = [pkgs.coreutils]; text = let diff --git a/modules/programs/nixvim/plugins/comment/default.nix b/modules/programs/nixvim/plugins/comment/default.nix index 93d14344..47351d54 100644 --- a/modules/programs/nixvim/plugins/comment/default.nix +++ b/modules/programs/nixvim/plugins/comment/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.comment.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.comment"; + options.dotfiles.programs.nixvim.plugins.comment.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.comment"; - config = lib.mkIf config.modules.programs.nixvim.plugins.comment.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.comment.enable { programs.nixvim.plugins.comment.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/debugprint/default.nix b/modules/programs/nixvim/plugins/debugprint/default.nix index accc115c..71ad93c1 100644 --- a/modules/programs/nixvim/plugins/debugprint/default.nix +++ b/modules/programs/nixvim/plugins/debugprint/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.debugprint.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.debugprint"; + options.dotfiles.programs.nixvim.plugins.debugprint.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.debugprint"; - config = lib.mkIf config.modules.programs.nixvim.plugins.debugprint.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.debugprint.enable { programs.nixvim.plugins.debugprint = { enable = true; diff --git a/modules/programs/nixvim/plugins/default.nix b/modules/programs/nixvim/plugins/default.nix index 9708b37d..eb407e49 100644 --- a/modules/programs/nixvim/plugins/default.nix +++ b/modules/programs/nixvim/plugins/default.nix @@ -31,11 +31,11 @@ ./wtf ]; - options.modules.programs.nixvim.plugins.full = - lib.mkEnableOption "modules.programs.nixvim.plugins.full"; + options.dotfiles.programs.nixvim.plugins.full = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.full"; - config = lib.mkIf config.modules.programs.nixvim.plugins.full { - modules.programs.nixvim.plugins = { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.full { + dotfiles.programs.nixvim.plugins = { cmp.enable = lib.mkDefault true; codeium-nvim.enable = lib.mkDefault true; codeium-vim.enable = lib.mkDefault true; diff --git a/modules/programs/nixvim/plugins/fidget/default.nix b/modules/programs/nixvim/plugins/fidget/default.nix index 7fcc779c..010e50cb 100644 --- a/modules/programs/nixvim/plugins/fidget/default.nix +++ b/modules/programs/nixvim/plugins/fidget/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.fidget.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.fidget"; + options.dotfiles.programs.nixvim.plugins.fidget.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.fidget"; - config = lib.mkIf config.modules.programs.nixvim.plugins.fidget.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.fidget.enable { programs.nixvim.plugins.fidget.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/gitmessenger/default.nix b/modules/programs/nixvim/plugins/gitmessenger/default.nix index fddb7ce8..0ec382a4 100644 --- a/modules/programs/nixvim/plugins/gitmessenger/default.nix +++ b/modules/programs/nixvim/plugins/gitmessenger/default.nix @@ -3,28 +3,30 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.gitmessenger.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.gitmessenger"; + options.dotfiles.programs.nixvim.plugins.gitmessenger.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.gitmessenger"; - config = lib.mkIf config.modules.programs.nixvim.plugins.gitmessenger.enable { - programs.nixvim = { - keymaps = [ - { - action = "vim.cmd.GitMessenger"; - key = "gl"; - lua = true; - mode = "n"; - options.silent = true; - } - ]; + config = + lib.mkIf + config.dotfiles.programs.nixvim.plugins.gitmessenger.enable { + programs.nixvim = { + keymaps = [ + { + action = "vim.cmd.GitMessenger"; + key = "gl"; + lua = true; + mode = "n"; + options.silent = true; + } + ]; - plugins.gitmessenger = { - enable = true; - floatingWinOps.border = "rounded"; - includeDiff = "current"; - noDefaultMappings = true; - popupContentMargins = false; + plugins.gitmessenger = { + enable = true; + floatingWinOps.border = "rounded"; + includeDiff = "current"; + noDefaultMappings = true; + popupContentMargins = false; + }; }; }; - }; } diff --git a/modules/programs/nixvim/plugins/gitsigns/default.nix b/modules/programs/nixvim/plugins/gitsigns/default.nix index 9b49e828..a12b4b6f 100644 --- a/modules/programs/nixvim/plugins/gitsigns/default.nix +++ b/modules/programs/nixvim/plugins/gitsigns/default.nix @@ -5,10 +5,10 @@ }: { imports = [../trouble]; - options.modules.programs.nixvim.plugins.gitsigns.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.gitsigns"; + options.dotfiles.programs.nixvim.plugins.gitsigns.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.gitsigns"; - config = lib.mkIf config.modules.programs.nixvim.plugins.gitsigns.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.gitsigns.enable { programs.nixvim.plugins.gitsigns = { enable = true; @@ -57,7 +57,7 @@ trouble = lib.mkIf - config.modules.programs.nixvim.plugins.trouble.enable + config.dotfiles.programs.nixvim.plugins.trouble.enable true; }; }; diff --git a/modules/programs/nixvim/plugins/illuminate/default.nix b/modules/programs/nixvim/plugins/illuminate/default.nix index f352f352..a450b071 100644 --- a/modules/programs/nixvim/plugins/illuminate/default.nix +++ b/modules/programs/nixvim/plugins/illuminate/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.illuminate.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.illuminate"; + options.dotfiles.programs.nixvim.plugins.illuminate.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.illuminate"; - config = lib.mkIf config.modules.programs.nixvim.plugins.illuminate.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.illuminate.enable { programs.nixvim.plugins.illuminate.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/leap/default.nix b/modules/programs/nixvim/plugins/leap/default.nix index 8c73d53c..13903074 100644 --- a/modules/programs/nixvim/plugins/leap/default.nix +++ b/modules/programs/nixvim/plugins/leap/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.leap.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.leap"; + options.dotfiles.programs.nixvim.plugins.leap.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.leap"; - config = lib.mkIf config.modules.programs.nixvim.plugins.leap.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.leap.enable { programs.nixvim = { keymaps = [ { diff --git a/modules/programs/nixvim/plugins/lsp-format/default.nix b/modules/programs/nixvim/plugins/lsp-format/default.nix index c1fd30df..eb11e40e 100644 --- a/modules/programs/nixvim/plugins/lsp-format/default.nix +++ b/modules/programs/nixvim/plugins/lsp-format/default.nix @@ -5,11 +5,11 @@ }: { imports = [../lsp]; - options.modules.programs.nixvim.plugins.lsp-format.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.lsp-format"; + options.dotfiles.programs.nixvim.plugins.lsp-format.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.lsp-format"; - config = lib.mkIf config.modules.programs.nixvim.plugins.lsp-format.enable { - modules.programs.nixvim.plugins.lsp.enable = true; + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.lsp-format.enable { + dotfiles.programs.nixvim.plugins.lsp.enable = true; programs.nixvim.plugins.lsp-format.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/lsp/default.nix b/modules/programs/nixvim/plugins/lsp/default.nix index d2f02582..119cb075 100644 --- a/modules/programs/nixvim/plugins/lsp/default.nix +++ b/modules/programs/nixvim/plugins/lsp/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.lsp.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.lsp"; + options.dotfiles.programs.nixvim.plugins.lsp.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.lsp"; - config = lib.mkIf config.modules.programs.nixvim.plugins.lsp.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.lsp.enable { programs.nixvim.plugins.lsp = { enable = true; diff --git a/modules/programs/nixvim/plugins/nvim-colorizer/default.nix b/modules/programs/nixvim/plugins/nvim-colorizer/default.nix index b6e1994e..fb1750c1 100644 --- a/modules/programs/nixvim/plugins/nvim-colorizer/default.nix +++ b/modules/programs/nixvim/plugins/nvim-colorizer/default.nix @@ -3,12 +3,12 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.nvim-colorizer.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.nvim-colorizer"; + options.dotfiles.programs.nixvim.plugins.nvim-colorizer.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.nvim-colorizer"; config = lib.mkIf - config.modules.programs.nixvim.plugins.nvim-colorizer.enable { + config.dotfiles.programs.nixvim.plugins.nvim-colorizer.enable { programs.nixvim.plugins.nvim-colorizer.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/nvim-tree/default.nix b/modules/programs/nixvim/plugins/nvim-tree/default.nix index 1aa1bd05..944eeb40 100644 --- a/modules/programs/nixvim/plugins/nvim-tree/default.nix +++ b/modules/programs/nixvim/plugins/nvim-tree/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.nvim-tree.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.nvim-tree"; + options.dotfiles.programs.nixvim.plugins.nvim-tree.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.nvim-tree"; - config = lib.mkIf config.modules.programs.nixvim.plugins.nvim-tree.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.nvim-tree.enable { programs.nixvim = { keymaps = [ { diff --git a/modules/programs/nixvim/plugins/rainbow-delimiters/default.nix b/modules/programs/nixvim/plugins/rainbow-delimiters/default.nix index 52beec56..2a98106c 100644 --- a/modules/programs/nixvim/plugins/rainbow-delimiters/default.nix +++ b/modules/programs/nixvim/plugins/rainbow-delimiters/default.nix @@ -3,12 +3,12 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.rainbow-delimiters.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.rainbow-delimiters"; + options.dotfiles.programs.nixvim.plugins.rainbow-delimiters.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.rainbow-delimiters"; config = lib.mkIf - config.modules.programs.nixvim.plugins.rainbow-delimiters.enable { + config.dotfiles.programs.nixvim.plugins.rainbow-delimiters.enable { programs.nixvim.plugins = { rainbow-delimiters.enable = true; treesitter.enable = true; diff --git a/modules/programs/nixvim/plugins/rustaceanvim/default.nix b/modules/programs/nixvim/plugins/rustaceanvim/default.nix index 76dbc74a..9d2b326e 100644 --- a/modules/programs/nixvim/plugins/rustaceanvim/default.nix +++ b/modules/programs/nixvim/plugins/rustaceanvim/default.nix @@ -5,11 +5,13 @@ }: { imports = [../../../../homeManager/home/packages/rustup]; - options.modules.programs.nixvim.plugins.rustaceanvim.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.rustaceanvim"; + options.dotfiles.programs.nixvim.plugins.rustaceanvim.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.rustaceanvim"; - config = lib.mkIf config.modules.programs.nixvim.plugins.rustaceanvim.enable { - modules.homeManager.home.packages.rustup.enable = true; - programs.nixvim.plugins.rustaceanvim.enable = true; - }; + config = + lib.mkIf + config.dotfiles.programs.nixvim.plugins.rustaceanvim.enable { + dotfiles.homeManager.home.packages.rustup.enable = true; + programs.nixvim.plugins.rustaceanvim.enable = true; + }; } diff --git a/modules/programs/nixvim/plugins/spider/default.nix b/modules/programs/nixvim/plugins/spider/default.nix index 24fe185d..76ea060a 100644 --- a/modules/programs/nixvim/plugins/spider/default.nix +++ b/modules/programs/nixvim/plugins/spider/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.spider.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.spider"; + options.dotfiles.programs.nixvim.plugins.spider.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.spider"; - config = lib.mkIf config.modules.programs.nixvim.plugins.spider.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.spider.enable { programs.nixvim.plugins.spider = { enable = true; diff --git a/modules/programs/nixvim/plugins/surround/default.nix b/modules/programs/nixvim/plugins/surround/default.nix index ad6f8c71..fe7b1bea 100644 --- a/modules/programs/nixvim/plugins/surround/default.nix +++ b/modules/programs/nixvim/plugins/surround/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.surround.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.surround"; + options.dotfiles.programs.nixvim.plugins.surround.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.surround"; - config = lib.mkIf config.modules.programs.nixvim.plugins.surround.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.surround.enable { programs.nixvim.plugins.surround.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/telescope/default.nix b/modules/programs/nixvim/plugins/telescope/default.nix index b33661d9..54c0ebff 100644 --- a/modules/programs/nixvim/plugins/telescope/default.nix +++ b/modules/programs/nixvim/plugins/telescope/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.telescope.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.telescope"; + options.dotfiles.programs.nixvim.plugins.telescope.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.telescope"; - config = lib.mkIf config.modules.programs.nixvim.plugins.telescope.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.telescope.enable { programs.nixvim.plugins.telescope = { enable = true; settings.defaults.layout_strategy = "vertical"; diff --git a/modules/programs/nixvim/plugins/todo-comments/default.nix b/modules/programs/nixvim/plugins/todo-comments/default.nix index 940ce574..7ec5e4d6 100644 --- a/modules/programs/nixvim/plugins/todo-comments/default.nix +++ b/modules/programs/nixvim/plugins/todo-comments/default.nix @@ -3,12 +3,12 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.todo-comments.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.todo-comments"; + options.dotfiles.programs.nixvim.plugins.todo-comments.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.todo-comments"; config = lib.mkIf - config.modules.programs.nixvim.plugins.todo-comments.enable { + config.dotfiles.programs.nixvim.plugins.todo-comments.enable { programs.nixvim = { keymaps = let requireTodocomments = "require('todo-comments')"; diff --git a/modules/programs/nixvim/plugins/treesitter-context/default.nix b/modules/programs/nixvim/plugins/treesitter-context/default.nix index ba23e2c4..ae4303be 100644 --- a/modules/programs/nixvim/plugins/treesitter-context/default.nix +++ b/modules/programs/nixvim/plugins/treesitter-context/default.nix @@ -5,13 +5,13 @@ }: { imports = [../treesitter]; - options.modules.programs.nixvim.plugins.treesitter-context.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.treesitter-context"; + options.dotfiles.programs.nixvim.plugins.treesitter-context.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.treesitter-context"; config = lib.mkIf - config.modules.programs.nixvim.plugins.treesitter-context.enable { - modules.programs.nixvim.plugins.treesitter.enable = true; + config.dotfiles.programs.nixvim.plugins.treesitter-context.enable { + dotfiles.programs.nixvim.plugins.treesitter.enable = true; programs.nixvim.plugins.treesitter-context.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/treesitter/default.nix b/modules/programs/nixvim/plugins/treesitter/default.nix index 347dfeb4..d1b8dcd6 100644 --- a/modules/programs/nixvim/plugins/treesitter/default.nix +++ b/modules/programs/nixvim/plugins/treesitter/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.treesitter.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.treesitter"; + options.dotfiles.programs.nixvim.plugins.treesitter.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.treesitter"; - config = lib.mkIf config.modules.programs.nixvim.plugins.treesitter.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.treesitter.enable { programs.nixvim.plugins.treesitter.enable = true; }; } diff --git a/modules/programs/nixvim/plugins/trouble/default.nix b/modules/programs/nixvim/plugins/trouble/default.nix index d17c7942..c200e6c3 100644 --- a/modules/programs/nixvim/plugins/trouble/default.nix +++ b/modules/programs/nixvim/plugins/trouble/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.trouble.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.trouble"; + options.dotfiles.programs.nixvim.plugins.trouble.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.trouble"; - config = lib.mkIf config.modules.programs.nixvim.plugins.trouble.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.trouble.enable { programs.nixvim = { keymaps = [ { diff --git a/modules/programs/nixvim/plugins/undotree/default.nix b/modules/programs/nixvim/plugins/undotree/default.nix index 72269520..7602c4eb 100644 --- a/modules/programs/nixvim/plugins/undotree/default.nix +++ b/modules/programs/nixvim/plugins/undotree/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.undotree.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.undotree"; + options.dotfiles.programs.nixvim.plugins.undotree.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.undotree"; - config = lib.mkIf config.modules.programs.nixvim.plugins.undotree.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.undotree.enable { programs.nixvim = { keymaps = [ { diff --git a/modules/programs/nixvim/plugins/wtf/default.nix b/modules/programs/nixvim/plugins/wtf/default.nix index 36850fb9..c3c686a2 100644 --- a/modules/programs/nixvim/plugins/wtf/default.nix +++ b/modules/programs/nixvim/plugins/wtf/default.nix @@ -3,10 +3,10 @@ lib, ... }: { - options.modules.programs.nixvim.plugins.wtf.enable = - lib.mkEnableOption "modules.programs.nixvim.plugins.wtf"; + options.dotfiles.programs.nixvim.plugins.wtf.enable = + lib.mkEnableOption "dotfiles.programs.nixvim.plugins.wtf"; - config = lib.mkIf config.modules.programs.nixvim.plugins.wtf.enable { + config = lib.mkIf config.dotfiles.programs.nixvim.plugins.wtf.enable { programs.nixvim = { keymaps = [ { diff --git a/modules/services/battery/default.nix b/modules/services/battery/default.nix index 783681f7..8eaf07d9 100644 --- a/modules/services/battery/default.nix +++ b/modules/services/battery/default.nix @@ -5,11 +5,11 @@ ... }: let maximumBatteryCapacity = 100; - module = "modules.services.battery"; + module = "dotfiles.services.battery"; in { imports = [../../homeManager/services/dunst]; - options.modules.services.battery = let + options.dotfiles.services.battery = let onCalendar = "[`systemd.user.timers.battery.Timer.OnCalendar`](https://nix-community.github.io/home-manager/options.xhtml#opt-systemd.user.timers)"; in { delta = lib.mkOption { @@ -75,7 +75,7 @@ in { }; config = let - cfg = config.modules.services.battery; + cfg = config.dotfiles.services.battery; in lib.mkIf cfg.enable { assertions = [ @@ -92,7 +92,7 @@ in { } ]; - modules.homeManager.services.dunst.enable = true; + dotfiles.homeManager.services.dunst.enable = true; systemd.user = let description = "Battery notifier"; diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix index 54f650ca..e618ae45 100644 --- a/modules/stylix/default.nix +++ b/modules/stylix/default.nix @@ -5,15 +5,15 @@ pkgs, ... }: let - module = "modules.stylix"; + module = "dotfiles.stylix"; in { imports = [inputs.stylix.homeManagerModules.stylix]; - options.modules.stylix.enable = lib.mkEnableOption module; + options.dotfiles.stylix.enable = lib.mkEnableOption module; config = lib.mkMerge [ # TODO: Patch an upstream 'stylix.enable' option [1] to merge the # unconditional 'stylix.image' option with the conditional 'lib.mkIf - # config.modules.stylix.enable' attribute set. + # config.dotfiles.stylix.enable' attribute set. # # [1]: https://github.com/danth/stylix/issues/216 { @@ -24,7 +24,7 @@ in { } ( - lib.mkIf config.modules.stylix.enable { + lib.mkIf config.dotfiles.stylix.enable { home.activation.${module} = lib.dotfiles.lib.hm.dag.entryBefore.writeBoundary.systemRequirement module diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix index b47f6db2..8729664b 100644 --- a/modules/wayland/default.nix +++ b/modules/wayland/default.nix @@ -5,10 +5,10 @@ }: { imports = [../homeManager/services/dunst ../homeManager/services/swayidle]; - options.modules.wayland.enable = lib.mkEnableOption "modules.wayland"; + options.dotfiles.wayland.enable = lib.mkEnableOption "dotfiles.wayland"; - config = lib.mkIf config.modules.wayland.enable { - modules.homeManager.services = { + config = lib.mkIf config.dotfiles.wayland.enable { + dotfiles.homeManager.services = { dunst.enable = true; swayidle.enable = true; };