cleanup fish config

This commit is contained in:
Noah Masur 2021-05-04 10:00:38 -04:00
parent f78923022f
commit 0bd93f7aa3
2 changed files with 15 additions and 11 deletions

View File

@ -9,15 +9,6 @@ if status --is-interactive
$DOTS/bin \ $DOTS/bin \
~/.cargo/bin ~/.cargo/bin
# Aliases
if command -v nvim > /dev/null
alias vim='nvim'
abbr -a vimrc 'vim $HOME/.config/nvim/init.vim'
end
if [ (uname) = "Linux" ]
linux
end
# Use `vi` in the shell with cursor shapes # Use `vi` in the shell with cursor shapes
fish_vi_key_bindings fish_vi_key_bindings
bind yy fish_clipboard_copy bind yy fish_clipboard_copy
@ -35,7 +26,9 @@ if status --is-interactive
zoxide init fish | source zoxide init fish | source
# Colors # Colors
if test -e $DOTS/fish.configlink/fish_colors
command cat $DOTS/fish.configlink/fish_colors command cat $DOTS/fish.configlink/fish_colors
end
# Fuzzy finder # Fuzzy finder
fzf_key_bindings fzf_key_bindings

View File

@ -49,8 +49,13 @@ function abbrs --description 'All abbreviations'
abbr -a cdg 'cd (git rev-parse --show-toplevel)' abbr -a cdg 'cd (git rev-parse --show-toplevel)'
# Vim # Vim
abbr -a v 'vim' if command -v nvim > /dev/null
alias vim='nvim'
abbr -a vimrc 'vim $HOME/.config/nvim/init.vim'
else
abbr -a vimrc 'vim $HOME/.vimrc' abbr -a vimrc 'vim $HOME/.vimrc'
end
abbr -a v 'vim'
abbr -a vl 'vim -c "normal! `0"' abbr -a vl 'vim -c "normal! `0"'
abbr -a vll 'vim -c "Hist"' abbr -a vll 'vim -c "Hist"'
abbr -a vh 'vim -c "Hist"' abbr -a vh 'vim -c "Hist"'
@ -118,4 +123,10 @@ function abbrs --description 'All abbreviations'
# macOS # macOS
abbr -a casks 'vim $DOTS/homebrew/Caskfile' abbr -a casks 'vim $DOTS/homebrew/Caskfile'
# Linux
if [ (uname) = "Linux" ]
linux
end
end end