diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix index 2eec1bdc..18017403 100644 --- a/home-manager/modules/fish.nix +++ b/home-manager/modules/fish.nix @@ -85,10 +85,6 @@ in { fish_vi_key_bindings bind -M insert jk "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char force-repaint; end" - for mode in insert default normal - # bind -M $mode \a _project_jump - end - export OP_PLUGIN_ALIASES_SOURCED=1 ${lib.concatMapStrings (plugin: ''alias ${plugin}="op plugin run -- ${plugin}"'') diff --git a/home-manager/modules/fzf.nix b/home-manager/modules/fzf.nix index 77e582f5..c26b29f4 100644 --- a/home-manager/modules/fzf.nix +++ b/home-manager/modules/fzf.nix @@ -70,12 +70,12 @@ function _project_jump_get_readme set -l dir (_project_jump_parse_project "$argv[1]") if test -f "$dir/README.md" - glow -p -s dark -w 150 "$dir/README.md" + ${pkgs.glow}/bin/glow -p -s dark -w 150 "$dir/README.md" else echo echo (set_color --bold) "README.md not found" echo - ls --color=always $dir + ${pkgs.exa}/bin/exa --icons -s type -F --color=always $dir end end @@ -83,7 +83,7 @@ if set -ql _flag_format _project_jump_get_readme $_flag_format else - set -l selected (_project_jump_get_projects | fzf --ansi --preview-window 'right,70%' --preview "_project_jump --format {}" | _project_jump_parse_project) + set -l selected (_project_jump_get_projects | fzf --ansi --preview-window 'right,70%' --preview "fzf-project-widget --format {}" | _project_jump_parse_project) if test -n "$selected" cd "$selected" end