diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop/application-launcher/fzf/default.nix | 4 | ||||
| -rw-r--r-- | modules/shell/bash/default.nix | 2 | ||||
| -rw-r--r-- | modules/shell/zsh/default.nix | 2 | ||||
| -rw-r--r-- | modules/tools/default.nix | 2 | ||||
| -rw-r--r-- | modules/tools/utils/default.nix | 7 | ||||
| -rw-r--r-- | modules/tools/utils/fzf/default.nix (renamed from modules/tools/fzf/default.nix) | 4 |
6 files changed, 14 insertions, 7 deletions
diff --git a/modules/desktop/application-launcher/fzf/default.nix b/modules/desktop/application-launcher/fzf/default.nix index 0196a2b..2047919 100644 --- a/modules/desktop/application-launcher/fzf/default.nix +++ b/modules/desktop/application-launcher/fzf/default.nix @@ -8,8 +8,8 @@ config = lib.mkIf config.desktop.application-launcher.fzf.enable { assertions = [ { - assertion = config.tools.fzf.enable; - message ="Module desktop.application-launcher.fzf requires tools.fzf module to be enabled."; + assertion = config.tools.utils.fzf.enable; + message ="Module desktop.application-launcher.fzf requires tools.utils.fzf module to be enabled."; } ]; diff --git a/modules/shell/bash/default.nix b/modules/shell/bash/default.nix index fb1040a..9a81d7a 100644 --- a/modules/shell/bash/default.nix +++ b/modules/shell/bash/default.nix @@ -20,7 +20,7 @@ programs.bash.historyFile = "${config.xdg.cacheHome}/bash/history"; programs.bash.shellAliases = config.shell.alias; programs.bash.bashrcExtra = '' -${if config.tools.fzf.enable then +${if config.tools.utils.fzf.enable then "eval \"$(fzf --bash)\"" else ""} ''; diff --git a/modules/shell/zsh/default.nix b/modules/shell/zsh/default.nix index 66e9556..9dd762d 100644 --- a/modules/shell/zsh/default.nix +++ b/modules/shell/zsh/default.nix @@ -17,7 +17,7 @@ programs.zsh.history.path = "${config.xdg.cacheHome}/zsh/history"; programs.zsh.shellAliases = config.shell.alias; programs.zsh.initExtra = '' -${if config.tools.fzf.enable then +${if config.tools.utils.fzf.enable then "eval \"$(fzf --zsh)\"" else ""} ${builtins.readFile ./zshrc} diff --git a/modules/tools/default.nix b/modules/tools/default.nix index 266e900..3916111 100644 --- a/modules/tools/default.nix +++ b/modules/tools/default.nix @@ -4,9 +4,9 @@ imports = [ ./editor ./file-manager - ./fzf ./git ./system-monitor + ./utils ./viewer ]; } diff --git a/modules/tools/utils/default.nix b/modules/tools/utils/default.nix new file mode 100644 index 0000000..5d758fc --- /dev/null +++ b/modules/tools/utils/default.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + ./fzf + ]; +} diff --git a/modules/tools/fzf/default.nix b/modules/tools/utils/fzf/default.nix index 169a07f..e6378bc 100644 --- a/modules/tools/fzf/default.nix +++ b/modules/tools/utils/fzf/default.nix @@ -1,11 +1,11 @@ { config, lib,... }: { - options.tools.fzf = { + options.tools.utils.fzf = { enable = lib.mkEnableOption "Enables fzf."; }; - config = lib.mkIf config.tools.fzf.enable { + config = lib.mkIf config.tools.utils.fzf.enable { programs.fzf.enable = true; programs.fzf.defaultOptions = [ "--height 100%" |