diff options
| author | Guangxiong Lin <[email protected]> | 2023-11-16 20:33:53 +0800 |
|---|---|---|
| committer | Guangxiong Lin <[email protected]> | 2023-11-16 20:34:27 +0800 |
| commit | 39c8b27c342442e585e0729982bdb82a95bc2e6c (patch) | |
| tree | a12beb712a8db867db5de39794deb74cbe538ae9 /.config/fish | |
| parent | 6bed95dcccfc57e4c8db0c0b5fa2eb0739ae2f49 (diff) | |
| download | dotfiles-39c8b27c342442e585e0729982bdb82a95bc2e6c.tar.gz dotfiles-39c8b27c342442e585e0729982bdb82a95bc2e6c.tar.bz2 dotfiles-39c8b27c342442e585e0729982bdb82a95bc2e6c.zip | |
Refactor
Diffstat (limited to '.config/fish')
| -rw-r--r-- | .config/fish/conf.d/init-fzf.fish | 9 | ||||
| -rw-r--r-- | .config/fish/config.fish | 12 | ||||
| -rw-r--r-- | .config/fish/functions/is_mac.fish | 4 |
3 files changed, 10 insertions, 15 deletions
diff --git a/.config/fish/conf.d/init-fzf.fish b/.config/fish/conf.d/init-fzf.fish deleted file mode 100644 index d1c2d33..0000000 --- a/.config/fish/conf.d/init-fzf.fish +++ /dev/null @@ -1,9 +0,0 @@ -command -v fzf > /dev/null || exit 0 - -if is_mac; - source $(brew --prefix fzf)/shell/key-bindings.fish -end - -function fish_user_key_bindings - fzf_key_bindings -end diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 6a16e19..72524a6 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,8 +1,14 @@ if status is-interactive set -g fish_greeting + set -g __fish_git_prompt_showdirtystate 1 set -g __fish_git_prompt_showuntrackedfiles 1 set -g __fish_git_prompt_showcolorhints 1 + + bind \cx\ce edit_command_buffer + + source "$HOME/.macos" + command -v zoxide > /dev/null && zoxide init --cmd j fish | source command -v navi > /dev/null && eval "$(navi widget fish)" @@ -14,8 +20,10 @@ if status is-interactive end end - command -v tig > /dev/null && function tigs; tig status; end - command -v git > /dev/null && function g; git $argv; end + if command -v fzf > /dev/null; + [ -n "$IS_MACOS" ] && source "$(brew --prefix fzf)/shell/key-bindings.fish" + function fish_user_key_bindings; fzf_key_bindings; end + end source "$HOME/.aliases" diff --git a/.config/fish/functions/is_mac.fish b/.config/fish/functions/is_mac.fish deleted file mode 100644 index 51c7cbd..0000000 --- a/.config/fish/functions/is_mac.fish +++ /dev/null @@ -1,4 +0,0 @@ -function is_mac - [ $(uname) = Darwin ] && return 0 || return 1 -end - |