~gpanders/dotfiles

e0846af8496c7e1f4465d2ed632ba0a374c0dd1f — Greg Anders 1 year, 11 months ago bc9943f
Fish shell changes

- Configure FZF using the correct variable names
- Don't manage fish_variables in version control
- Define XDG variables explicitly. This is useful because fish doesn't
  have a "${XDG_CONFIG_HOME:-$HOME/.config}" capability
6 files changed, 18 insertions(+), 46 deletions(-)

A fish/.config/fish/conf.d/fzf.fish
A fish/.config/fish/conf.d/xdg.fish
M fish/.config/fish/config.fish
D fish/.config/fish/fish_variables
M fish/.config/fish/fisher/fishfile
M fish/.gitignore
A fish/.config/fish/conf.d/fzf.fish => fish/.config/fish/conf.d/fzf.fish +13 -0
@@ 0,0 1,13 @@
if status is-login
    if command -sq fd
        set -x FZF_FIND_FILE_COMMAND "fd --type f --hidden --follow --exclude .git"
        set -x FZF_CD_COMMAND "fd -t d"
    else if command -sq rg
        set -x FZF_FIND_FILE_COMMAND "rg --files --hidden --glob '!.git'"
    else if command -sq ag
        set -x FZF_FIND_FILE_COMMAND "ag -g ''"
    end

    set -x FZF_COLORS "bg+:10,bg:0,spinner:6,hl:4,fg:12,header:4,info:3,pointer:6,marker:6,fg+:13,prompt:3,hl+:4"
    set -x FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT --color $FZF_COLORS"
end

A fish/.config/fish/conf.d/xdg.fish => fish/.config/fish/conf.d/xdg.fish +3 -0
@@ 0,0 1,3 @@
set -q XDG_CONFIG_HOME; or set -U XDG_CONFIG_HOME ~/.config
set -q XDG_DATA_HOME; or set -U XDG_DATA_HOME ~/.local/share
set -q XDG_CACHE_HOME; or set -U XDG_CACHE_HOME ~/.local/cache

M fish/.config/fish/config.fish => fish/.config/fish/config.fish +0 -2
@@ 1,5 1,3 @@
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config

if not functions -q fisher
    curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish
    fish -c fisher

D fish/.config/fish/fish_variables => fish/.config/fish/fish_variables +0 -43
@@ 1,43 0,0 @@
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR EDITOR:vi
SETUVAR FZF_DEFAULT_OPTS:\x2d\x2dheight\x2040\x25
SETUVAR FZF_LEGACY_KEYBINDINGS:1
SETUVAR FZF_PREVIEW_DIR_CMD:ls
SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010
SETUVAR FZF_TMUX_HEIGHT:40\x25
SETUVAR PAGER:less
SETUVAR VISUAL:vi
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
SETUVAR fish_color_autosuggestion:brblack
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:green
SETUVAR fish_color_comment:yellow
SETUVAR fish_color_cwd:blue
SETUVAR fish_color_cwd_root:red
SETUVAR fish_color_end:magenta
SETUVAR fish_color_error:red
SETUVAR fish_color_escape:cyan
SETUVAR fish_color_history_current:\x2d\x2dbold
SETUVAR fish_color_host:normal
SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
SETUVAR fish_color_normal:normal
SETUVAR fish_color_operator:blue
SETUVAR fish_color_param:normal
SETUVAR fish_color_quote:yellow
SETUVAR fish_color_redirection:normal
SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_status:red
SETUVAR fish_color_user:brgreen
SETUVAR fish_color_valid_path:\x2d\x2dunderline
SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell
SETUVAR fish_key_bindings:fish_hybrid_key_bindings
SETUVAR fish_pager_color_completion:normal
SETUVAR fish_pager_color_description:yellow\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_user_paths:/Users/greande/\x2elocal/bin
SETUVAR pure_version:2\x2e1\x2e8

M fish/.config/fish/fisher/fishfile => fish/.config/fish/fisher/fishfile +1 -1
@@ 1,2 1,2 @@
jethrokuan/fzf
rafaelrinaldi/pure
jethrokuan/fzf

M fish/.gitignore => fish/.gitignore +1 -0
@@ 1,3 1,4 @@
.config/fish/fish_variables
.config/fish/functions/fisher.fish
.config/fish/fisher/*
!.config/fish/fisher/fishfile