diff --git a/files/.config/fish/config.fish b/files/.config/fish/config.fish index 72903b7..576e305 100644 --- a/files/.config/fish/config.fish +++ b/files/.config/fish/config.fish @@ -1,6 +1,10 @@ fish_vi_key_bindings # fish_default_key_bindings +set -U FZF_TMUX 1 +set -U FZF_PREVIEW_FILE_CMD "head -n 10 | bat --color=always --decorations=never" + + alias ls=lsd abbr --add --global vim nvim abbr --add --global tsh trash diff --git a/files/.config/fish/fish_variables b/files/.config/fish/fish_variables index f67c1c9..a6c8a9f 100644 --- a/files/.config/fish/fish_variables +++ b/files/.config/fish/fish_variables @@ -1,5 +1,12 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR FZF_DEFAULT_OPTS:\x2d\x2dheight\x2040\x25 +SETUVAR FZF_ENABLE_OPEN_PREVIEW:1 +SETUVAR FZF_LEGACY_KEYBINDINGS:0 +SETUVAR FZF_PREVIEW_DIR_CMD:ls +SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010\x20\x7c\x20bat\x20\x2d\x2dcolor\x3dalways\x20\x2d\x2ddecorations\x3dnever +SETUVAR FZF_TMUX:1 +SETUVAR FZF_TMUX_HEIGHT:40\x25 SETUVAR SXHKD_SHELL:sh SETUVAR __fish_initialized:3100 SETUVAR dangerous_colors:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900 diff --git a/files/.config/fish/functions/fish_prompt.fish b/files/.config/fish/functions/fish_prompt.fish deleted file mode 100644 index 71d4e87..0000000 --- a/files/.config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,67 +0,0 @@ - - -function fish_prompt - # Cache exit status - set -l last_status $status - - set -l normal (set_color normal) - set -l white (set_color FFFFFF) - set -l turquoise (set_color 5fdfff) - set -l orange (set_color df5f00) - set -l hotpink (set_color df005f) - set -l blue (set_color blue) - set -l limegreen (set_color 87ff00) - set -l purple (set_color af5fff) - - - # Configure __fish_git_prompt - set -g __fish_git_prompt_char_stateseparator ' ' - set -g __fish_git_prompt_color 5fdfff - set -g __fish_git_prompt_color_flags df5f00 - set -g __fish_git_prompt_color_prefix white - set -g __fish_git_prompt_color_suffix white - set -g __fish_git_prompt_showdirtystate true - set -g __fish_git_prompt_showuntrackedfiles true - set -g __fish_git_prompt_showstashstate true - set -g __fish_git_prompt_show_informative_status true - - set -l current_user (whoami) - set -l vi_mode (__fish_vi_mode_prompt_real) - set -l git_prompt (__fish_git_prompt " (%s)") - #(pwd|sed "s=$HOME=~=") - - set -g fish_prompt_pwd_dir_length 1 - - echo -n $white'╭─'$vi_mode - echo -n $white'─'$hotpink$current_user$white' in '$limegreen(prompt_pwd) - echo -n $turquoise$git_prompt - if test $last_status -gt 0 - echo -n ' '$hotpink$last_status - end - echo - - echo -n $white'╰─λ ' - echo -n $normal -end - -function __fish_vi_mode_prompt_real - set -l turquoise (set_color 5fdfff) - set -l orange (set_color df5f00) - switch $fish_bind_mode - case insert - echo -n "─" - case default - echo -n $turquoise'N' - case visual - echo -n $orange'V' - case replace_one - echo -n $turquoise'R' - end -end - - -# needed so fish doesn't draw it by itself -function fish_mode_prompt -end - -# ⌁ diff --git a/files/.config/fish/functions/fish_prompt.fish b/files/.config/fish/functions/fish_prompt.fish new file mode 120000 index 0000000..aba2104 --- /dev/null +++ b/files/.config/fish/functions/fish_prompt.fish @@ -0,0 +1 @@ +/home/leon/.local/share/omf/themes/lambda_better/fish_prompt.fish \ No newline at end of file diff --git a/files/.config/fish/functions/fish_user_key_bindings.fish b/files/.config/fish/functions/fish_user_key_bindings.fish index 350a9da..3698914 100644 --- a/files/.config/fish/functions/fish_user_key_bindings.fish +++ b/files/.config/fish/functions/fish_user_key_bindings.fish @@ -1,3 +1,2 @@ function fish_user_key_bindings - fzf_key_bindings end diff --git a/files/.config/fish/functions/fzf_key_bindings.fish b/files/.config/fish/functions/fzf_key_bindings.fish deleted file mode 120000 index 49e917d..0000000 --- a/files/.config/fish/functions/fzf_key_bindings.fish +++ /dev/null @@ -1 +0,0 @@ -/home/leon/.fzf/shell/key-bindings.fish \ No newline at end of file