diff options
Diffstat (limited to 'dot-config/fish/conf.d')
| -rw-r--r-- | dot-config/fish/conf.d/_binds.conf | 92 | ||||
| -rw-r--r-- | dot-config/fish/conf.d/abbr.fish | 6 | ||||
| -rw-r--r-- | dot-config/fish/conf.d/env.fish | 6 |
3 files changed, 53 insertions, 51 deletions
diff --git a/dot-config/fish/conf.d/_binds.conf b/dot-config/fish/conf.d/_binds.conf index ad090e04..ca5005e8 100644 --- a/dot-config/fish/conf.d/_binds.conf +++ b/dot-config/fish/conf.d/_binds.conf @@ -1,52 +1,52 @@ -function toggle-sudo - set buf (commandline) +# function toggle-sudo +# set buf (commandline) - if test -z "$buf" - set last (history | head -n1) - if test -z "$last" - commandline -r "sudo " - return - end - set buf $last - end +# if test -z "$buf" +# set last (history | head -n1) +# if test -z "$last" +# commandline -r "sudo " +# return +# end +# set buf $last +# end - if string match -rq '^\s*sudo(\s+|$)' -- $buf - set new (string replace -r '^\s*sudo\s*' '' -- $buf) - if test -z "$new" - commandline -r "" - return - end - commandline -r $new - else - commandline -r "sudo $buf" - end -end -function fish_user_key_bindings - for m in default insert - bind -M $m ctrl-f accept-autosuggestion - bind -M $m ctrl-backspace backward-kill-word - end +# if string match -rq '^\s*sudo(\s+|$)' -- $buf +# set new (string replace -r '^\s*sudo\s*' '' -- $buf) +# if test -z "$new" +# commandline -r "" +# return +# end +# commandline -r $new +# else +# commandline -r "sudo $buf" +# end +# end +# function fish_user_key_bindings +# for m in default insert +# bind -M $m ctrl-f accept-autosuggestion +# bind -M $m ctrl-backspace backward-kill-word +# end - for m in default insert normal - bind -M $m alt-left 'commandline -f cancel; cd -; commandline -f repaint' - bind -M $m alt-up 'commandline -f cancel; cd ..; commandline -f repaint' - bind -M $m ctrl-e toggle-sudo - bind -M $m ctrl-r history-pager - end +# for m in default insert normal +# bind -M $m alt-left 'commandline -f cancel; cd -; commandline -f repaint' +# bind -M $m alt-up 'commandline -f cancel; cd ..; commandline -f repaint' +# bind -M $m ctrl-e toggle-sudo +# bind -M $m ctrl-r history-pager +# end - bind -M normal U redo +# bind -M normal U redo - for m in default insert normal replace replace_one - bind --preset --erase -M $m ctrl-h - bind -M $m ctrl-h backward-char - bind --preset --erase -M $m ctrl-j - bind -M $m ctrl-j down-or-search - bind --preset --erase -M $m ctrl-k - bind -M $m ctrl-k up-or-search - # clear overrode - bind --preset --erase -M $m ctrl-l - bind -M $m ctrl-l forward-char - end -end +# for m in default insert normal replace replace_one +# bind --preset --erase -M $m ctrl-h +# bind -M $m ctrl-h backward-char +# bind --preset --erase -M $m ctrl-j +# bind -M $m ctrl-j down-or-search +# bind --preset --erase -M $m ctrl-k +# bind -M $m ctrl-k up-or-search +# # clear overrode +# bind --preset --erase -M $m ctrl-l +# bind -M $m ctrl-l forward-char +# end +# end -echo a +# echo a diff --git a/dot-config/fish/conf.d/abbr.fish b/dot-config/fish/conf.d/abbr.fish index 511ad540..42cf8046 100644 --- a/dot-config/fish/conf.d/abbr.fish +++ b/dot-config/fish/conf.d/abbr.fish @@ -19,7 +19,7 @@ abbr -a psg "ps aux | grep -v grep | grep -i -e VSZ -e" alias mkdir "mkdir -p" abbr -a fm ranger -alias cat "bat --plain --pager=never" +# alias cat "bat --plain --pager=never" # alias grep='grep --color=auto' alias grep "rg --no-heading --with-filename --smart-case --hyperlink-format=kitty -F --hidden" alias mv "mv -v" @@ -41,7 +41,7 @@ abbr -a chatgpt chat # better ls if set -q DISPLAY - alias ls "eza --color=auto --icons=always --hyperlink" + alias ls "eza --color=auto --icons=always --hyperlink=always" else alias ls "eza --color=auto" end @@ -137,7 +137,7 @@ abbr -a config-keybind "vim ~/.config/bspwm/sxhkdrc" abbr -a config-polybar "vim ~/.config/bspwm/themes/default/polybar/config.ini" # better less/cat # alias less='bat --pager=always --color always --plain' # moved into utility for auto sudo # nah, the one wont work with pipe -# alias cat='bat --pager=never' # moved into utility for auto sudo # nah, wont work with pipe +alias cat='bat --pager=never' # moved into utility for auto sudo # nah, wont work with pipe # better diff #alias diff='bat -d' # tars diff --git a/dot-config/fish/conf.d/env.fish b/dot-config/fish/conf.d/env.fish index 68325cb1..e6d426bc 100644 --- a/dot-config/fish/conf.d/env.fish +++ b/dot-config/fish/conf.d/env.fish @@ -17,7 +17,7 @@ set -xg PATH $HOME/.cargo/bin $PATH set -xg PATH $PATH /snap/bin set -xg PATH $PATH $HOME/.cache/.bun/bin set -xg PATH $PATH $HOME/go/bin -set -xg PATH $PATH /home/system/.spicetify +set -xg PATH $PATH $HOME/.local/share/solana/install/active_release/bin # GPG_TTY and SUDO_PROMPT # Fish: tty is a builtin; emulate ${TTY:-$(tty)} @@ -51,7 +51,9 @@ set -x XDG_PICTURES_DIR "$HOME/Pictures" set -x XDG_VIDEOS_DIR "$HOME/Videos" # Pager/editor helpers -set -x MANPAGER 'nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0" +"set showtabline=0" +"set nonumber"' +# set -x MANPAGER 'nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0" +"set showtabline=0" +"set nonumber"' +set -x MANPAGER delta +set -x PAGER delta # set -x MANPAGER hx # set -x MANROFFOPT -c set -x DIFFPROG 'nvim -d' |