From f0daaba8a746d8347bdf7a164bd19944745e3bac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 28 Sep 2024 20:04:56 +0300 Subject: [PATCH] Fixes to FZF and ZSH configuration --- users/functionalhacker/programs/fzf.nix | 15 +++++++++------ users/functionalhacker/programs/zsh.nix | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/users/functionalhacker/programs/fzf.nix b/users/functionalhacker/programs/fzf.nix index 2aa65f24..76ac36a0 100644 --- a/users/functionalhacker/programs/fzf.nix +++ b/users/functionalhacker/programs/fzf.nix @@ -4,12 +4,15 @@ programs.fzf = { enable = true; enableZshIntegration = true; - defaultCommand = "fd -Hlt f"; - defaultOptions = [ "-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all" ]; - fileWidgetCommand = "fd -Hlt f --strip-cwd-prefix"; - fileWidgetOptions = [ "--preview 'bat --color=always --style=numbers --line-range=:500 {}" ]; - changeDirWidgetCommand = "fd -Hlt d"; + defaultCommand = "fd -Ht f"; + defaultOptions = [ + "-m" + "--ansi" + "--bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all" + ]; + fileWidgetCommand = "fd -Ht f --strip-cwd-prefix"; + fileWidgetOptions = [ "--preview 'bat --color=always --style=numbers --line-range=:500 {}'" ]; + changeDirWidgetCommand = "fd -Ht d"; changeDirWidgetOptions = [ "--preview 'eza -l {}'" ]; }; - } diff --git a/users/functionalhacker/programs/zsh.nix b/users/functionalhacker/programs/zsh.nix index aea4a1f9..da8caea5 100644 --- a/users/functionalhacker/programs/zsh.nix +++ b/users/functionalhacker/programs/zsh.nix @@ -31,11 +31,11 @@ # fzf settings _fzf_compgen_path() { resultcmd="$FZF_DEFAULT_COMMAND . $1" - eval "''${resultcmd} + eval "''${resultcmd}" } _fzf_compgen_dir() { resultcmd="$FZF_ALT_C_COMMAND . $1" - eval "''${resultcmd} + eval "''${resultcmd}" } # nvim ftw! export PAGER="$EDITOR -R +\"lua require 'pager'\""