From ebd79a2876eeada0deaf349bf91a3e12b23326d2 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com> Date: Sat, 5 Oct 2024 22:01:05 +0530 Subject: Moved fzf configuration under modules/utils/fzf. --- modules/tools/default.nix | 2 +- modules/tools/fzf/default.nix | 42 ------------------------------------- modules/tools/utils/default.nix | 7 +++++++ modules/tools/utils/fzf/default.nix | 42 +++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 43 deletions(-) delete mode 100644 modules/tools/fzf/default.nix create mode 100644 modules/tools/utils/default.nix create mode 100644 modules/tools/utils/fzf/default.nix (limited to 'modules/tools') 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/fzf/default.nix b/modules/tools/fzf/default.nix deleted file mode 100644 index 169a07f..0000000 --- a/modules/tools/fzf/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, lib,... }: - -{ - options.tools.fzf = { - enable = lib.mkEnableOption "Enables fzf."; - }; - - config = lib.mkIf config.tools.fzf.enable { - programs.fzf.enable = true; - programs.fzf.defaultOptions = [ - "--height 100%" - "--layout=reverse" - ''--pointer=\"${if config.fonts.nerdfont.fira-code.enable then " " else ">"}\"'' - ''--header=\" \"'' - ''--prompt=\" \"'' - ''--marker=\"✓ \"'' - "--border=none" - "--cycle" - "--no-info" - "--margin=\"1,2\"" - ]; - - programs.fzf.colors = with config.scheme.withHashtag; { - fg = base05; # Foreground - bg = "-1"; # Background (-1 for transparent) - hl = base0D; # Highlight - - "fg+" = base07; # Foreground for selected item - "bg+" = "-1"; # Background for selected item - "hl+" = base0D; # Highlight for selected item - - gutter = "-1"; # Remove the white margin at the left - - info = base0B; # Info text (usually count of items) - border = base03; # Border color - prompt = base0A; # Prompt text color - pointer = base0F; # Pointer color (e.g., > for selected) - marker = base0C; # Marker color (e.g., for multi-select) - spinner = base0C; # Spinner color (during search) - }; - }; -} 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/utils/fzf/default.nix b/modules/tools/utils/fzf/default.nix new file mode 100644 index 0000000..e6378bc --- /dev/null +++ b/modules/tools/utils/fzf/default.nix @@ -0,0 +1,42 @@ +{ config, lib,... }: + +{ + options.tools.utils.fzf = { + enable = lib.mkEnableOption "Enables fzf."; + }; + + config = lib.mkIf config.tools.utils.fzf.enable { + programs.fzf.enable = true; + programs.fzf.defaultOptions = [ + "--height 100%" + "--layout=reverse" + ''--pointer=\"${if config.fonts.nerdfont.fira-code.enable then " " else ">"}\"'' + ''--header=\" \"'' + ''--prompt=\" \"'' + ''--marker=\"✓ \"'' + "--border=none" + "--cycle" + "--no-info" + "--margin=\"1,2\"" + ]; + + programs.fzf.colors = with config.scheme.withHashtag; { + fg = base05; # Foreground + bg = "-1"; # Background (-1 for transparent) + hl = base0D; # Highlight + + "fg+" = base07; # Foreground for selected item + "bg+" = "-1"; # Background for selected item + "hl+" = base0D; # Highlight for selected item + + gutter = "-1"; # Remove the white margin at the left + + info = base0B; # Info text (usually count of items) + border = base03; # Border color + prompt = base0A; # Prompt text color + pointer = base0F; # Pointer color (e.g., > for selected) + marker = base0C; # Marker color (e.g., for multi-select) + spinner = base0C; # Spinner color (during search) + }; + }; +} -- cgit v1.2.3