From 9c92b26369c727745660c1c0e432c8e4f4c0fe77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Wed, 30 Aug 2023 20:04:34 +0200 Subject: [PATCH] Fish restructure: aliases are now in functions, change in existing functions as well as new variables and cleaning for config.fish --- ...nelTabs_new_302085663057248267.config.json | 6 +-- .config/fish/aliases.fish | 39 ---------------- .config/fish/config.fish | 26 ++--------- .config/fish/fish_variables | 2 - .../fish/functions/_fzf_search_directory.fish | 10 +++- .../{fzf_git_all.fish => allrepos.fish} | 6 ++- .config/fish/functions/audiorestart.fish | 4 ++ .config/fish/functions/backup.fish | 3 ++ .config/fish/functions/bin.fish | 3 ++ .config/fish/functions/bruh.fish | 4 ++ .config/fish/functions/cat.fish | 4 ++ .config/fish/functions/cdzi.fish | 7 +++ .config/fish/functions/clean-unzip.fish | 15 ++++++ .config/fish/functions/clock.fish | 4 ++ .config/fish/functions/clone-cd.fish | 11 +++++ .config/fish/functions/codeinfo.fish | 4 ++ .config/fish/functions/copy.fish | 11 +++++ .config/fish/functions/disks.fish | 4 ++ .config/fish/functions/dots.fish | 4 ++ .config/fish/functions/dsize.fish | 4 ++ .config/fish/functions/ea.fish | 4 ++ .config/fish/functions/ef.fish | 4 ++ .config/fish/functions/eg.fish | 4 ++ .config/fish/functions/ev.fish | 4 ++ .config/fish/functions/f.fish | 4 ++ .config/fish/functions/fetch.fish | 4 ++ .../functions/{fzf_forgit.fish => fgit.fish} | 5 +- .config/fish/functions/files.fish | 4 ++ .config/fish/functions/fsend.fish | 4 ++ .config/fish/functions/gpt.fish | 4 ++ .config/fish/functions/h.fish | 4 ++ .config/fish/functions/info.fish | 4 ++ .config/fish/functions/install.fish | 4 ++ .config/fish/functions/l.fish | 4 ++ .config/fish/functions/ld.fish | 4 ++ .config/fish/functions/ldh.fish | 4 ++ .config/fish/functions/lg.fish | 4 ++ .config/fish/functions/lh.fish | 4 ++ .config/fish/functions/ls.fish | 4 ++ .config/fish/functions/lsh.fish | 4 ++ .config/fish/functions/lt.fish | 4 ++ .config/fish/functions/lth.fish | 4 ++ .config/fish/functions/matrix.fish | 4 ++ .config/fish/functions/mkdir-cd.fish | 4 ++ .config/fish/functions/pages.fish | 4 ++ .config/fish/functions/q.fish | 4 ++ .../functions/{fzf_git.fish => repos.fish} | 5 +- .config/fish/functions/restore.fish | 3 ++ .config/fish/functions/svn.fish | 4 ++ .config/fish/functions/sysproc.fish | 4 ++ .config/fish/functions/uninstall.fish | 4 ++ .config/fish/functions/update.fish | 4 ++ .config/fish/functions/vi.fish | 4 ++ .config/fish/functions/vim.fish | 4 ++ .config/fish/functions/yarn.fish | 4 ++ .config/fish/functions/zi.fish | 9 ---- .config/fish/keybinds.fish | 5 ++ .config/fish/variables.fish | 46 +++++++++++++++++-- .config/keyb/bindings/fish.yml | 10 +++- .config/nvim/lazy-lock.json | 26 +++++------ 60 files changed, 308 insertions(+), 100 deletions(-) delete mode 100644 .config/fish/aliases.fish rename .config/fish/functions/{fzf_git_all.fish => allrepos.fish} (69%) create mode 100644 .config/fish/functions/audiorestart.fish create mode 100644 .config/fish/functions/backup.fish create mode 100644 .config/fish/functions/bin.fish create mode 100644 .config/fish/functions/bruh.fish create mode 100644 .config/fish/functions/cat.fish create mode 100644 .config/fish/functions/cdzi.fish create mode 100644 .config/fish/functions/clean-unzip.fish create mode 100644 .config/fish/functions/clock.fish create mode 100644 .config/fish/functions/clone-cd.fish create mode 100644 .config/fish/functions/codeinfo.fish create mode 100644 .config/fish/functions/copy.fish create mode 100644 .config/fish/functions/disks.fish create mode 100644 .config/fish/functions/dots.fish create mode 100644 .config/fish/functions/dsize.fish create mode 100644 .config/fish/functions/ea.fish create mode 100644 .config/fish/functions/ef.fish create mode 100644 .config/fish/functions/eg.fish create mode 100644 .config/fish/functions/ev.fish create mode 100644 .config/fish/functions/f.fish create mode 100644 .config/fish/functions/fetch.fish rename .config/fish/functions/{fzf_forgit.fish => fgit.fish} (60%) create mode 100644 .config/fish/functions/files.fish create mode 100644 .config/fish/functions/fsend.fish create mode 100644 .config/fish/functions/gpt.fish create mode 100644 .config/fish/functions/h.fish create mode 100644 .config/fish/functions/info.fish create mode 100644 .config/fish/functions/install.fish create mode 100644 .config/fish/functions/l.fish create mode 100644 .config/fish/functions/ld.fish create mode 100644 .config/fish/functions/ldh.fish create mode 100644 .config/fish/functions/lg.fish create mode 100644 .config/fish/functions/lh.fish create mode 100644 .config/fish/functions/ls.fish create mode 100644 .config/fish/functions/lsh.fish create mode 100644 .config/fish/functions/lt.fish create mode 100644 .config/fish/functions/lth.fish create mode 100644 .config/fish/functions/matrix.fish create mode 100644 .config/fish/functions/mkdir-cd.fish create mode 100644 .config/fish/functions/pages.fish create mode 100644 .config/fish/functions/q.fish rename .config/fish/functions/{fzf_git.fish => repos.fish} (58%) create mode 100644 .config/fish/functions/restore.fish create mode 100644 .config/fish/functions/svn.fish create mode 100644 .config/fish/functions/sysproc.fish create mode 100644 .config/fish/functions/uninstall.fish create mode 100644 .config/fish/functions/update.fish create mode 100644 .config/fish/functions/vi.fish create mode 100644 .config/fish/functions/vim.fish create mode 100644 .config/fish/functions/yarn.fish delete mode 100644 .config/fish/functions/zi.fish create mode 100644 .config/fish/keybinds.fish diff --git a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json index 38b3480f..f353b168 100644 --- a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json +++ b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json @@ -2,12 +2,12 @@ "settings": { "tabs": [ { - "name": "#memes", - "url": "/channels/674984102860161025/675369610253434900", + "name": "#noticias_gd", + "url": "/channels/674984102860161025/888017395195736116", "selected": true, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", - "channelId": "675369610253434900" + "channelId": "888017395195736116" }, { "name": "#feedback-and-suggestions", diff --git a/.config/fish/aliases.fish b/.config/fish/aliases.fish deleted file mode 100644 index 0f32080a..00000000 --- a/.config/fish/aliases.fish +++ /dev/null @@ -1,39 +0,0 @@ -alias l='exa --long --header -a --icons --git --group-directories-first' -alias ls='exa -a --icons --group-directories-first' -alias lt='exa --long --header -a --icons --tree --git --group-directories-first' -alias ld='exa --long --header -a --icons -D --git' -alias lh='exa --long --header --icons --git --group-directories-first' -alias lsh='exa --icons --git --group-directories-first' -alias lth='exa --long --header --icons --tree --git --group-directories-first' -alias ldh='exa --long --header --icons -D --git' -alias bruh='genact -s 4' -alias matrix='unimatrix -s 95' -alias q='exit' -alias install='yay -S ' -alias uninstall='yay -R ' -alias update='yay -Syu' -alias clock='tty-clock -sbc' -alias files='xplr' -alias sysproc='sysz' -alias cat='bat' -alias dots='yadm enter lazygit' -alias audiorestart='systemctl --user restart wireplumber pipewire pipewire-pulse' -alias info='tldr' -alias cd='z' -alias disks='duf' -alias h='zi' -alias vim='nvim' -alias vi='nvim' -alias fsend='floaterm' -alias dsize='dua i' -alias fetch='neofetch' -alias f='fzf' -alias fp='fzf --preview "bat --color=always --style=header,grid --line-range :500 {}"' -alias gpt='tgpt -i' -alias ea='nvim ~/.config/fish/aliases.fish' -alias ef='nvim ~/.config/fish/config.fish' -alias ev='nvim ~/.config/fish/variables.fish' -alias eg='nvim ~/.gitconfig' -alias codeinfo='scc ./' -alias pages='navi' -alias lg='lazygit' diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 5ba3d400..b2bb8de6 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,31 +1,11 @@ -#source ~/.config/fish/variables.fish -set -xg fzf_preview_dir_cmd exa --long --header --icons --all --color=always --group-directories-first -set -xg fzf_fd_opts --hidden --exclude=.git -set -xg fzf_diff_highlighter delta --paging=never --width=20 +source ~/.config/fish/variables.fish +source ~/.config/fish/keybinds.fish if status is-interactive - # Commands to run in interactive sessions can go here - set -x FZF_DEFAULT_OPTS "\ ---color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 \ ---color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 \ ---color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796" - set -xg LS_COLORS (vivid generate catppuccin-macchiato) - set -xg BAT_THEME Catppuccin-macchiato - - set fzf_preview_dir_cmd exa --all --color=always - fzf_configure_bindings --directory=\cf - - source ~/.config/fish/functions/fzf_git.fish - source ~/.config/fish/functions/fzf_git_all.fish - source ~/.config/fish/functions/fzf_forgit.fish - source ~/.config/fish/functions/zi.fish - - bind \cg fgit - bind \e\z cdzi colorscript random end starship init fish | source zoxide init fish | source -source ~/.config/fish/aliases.fish +alias cd='z' # Couldn't create it as a function because of zoxide init diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index d00c3eca..98d83021 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,8 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR --export EDITOR:nvim -SETUVAR --export FZF_DEFAULT_COMMAND:fd\x20\x2d\x2dtype\x20f\x20\x2d\x2dfollow\x20\x2d\x2dhidden\x20\x2d\x2dexclude\x20\x2egit -SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23363a4f\x2cbg\x3a\x2324273a\x2cspinner\x3a\x23f4dbd6\x2chl\x3a\x23ed8796\x20\x2d\x2dcolor\x3dfg\x3a\x23cad3f5\x2cheader\x3a\x23ed8796\x2cinfo\x3a\x23c6a0f6\x2cpointer\x3a\x23f4dbd6\x20\x2d\x2dcolor\x3dmarker\x3a\x23f4dbd6\x2cfg\x2b\x3a\x23cad3f5\x2cprompt\x3a\x23c6a0f6\x2chl\x2b\x3a\x23ed8796 SETUVAR --export --path GOPATH:/home/matt/\x2elocal/share/go SETUVAR --export LANG:es_ES\x2eUTF\x2d8 SETUVAR --export LC_ALL:es_ES\x2eUTF\x2d8 diff --git a/.config/fish/functions/_fzf_search_directory.fish b/.config/fish/functions/_fzf_search_directory.fish index ad30a303..37da42b1 100644 --- a/.config/fish/functions/_fzf_search_directory.fish +++ b/.config/fish/functions/_fzf_search_directory.fish @@ -18,10 +18,16 @@ function _fzf_search_directory --description "Search the current directory. Repl if string match --quiet -- "*/" $unescaped_exp_token && test -d "$unescaped_exp_token" set --append fd_cmd --base-directory=$unescaped_exp_token # use the directory name as fzf's prompt to indicate the search is limited to that directory - set --prepend fzf_arguments --prompt="Search Directory $unescaped_exp_token> " --preview="_fzf_preview_file $expanded_token{}" + set --prepend fzf_arguments --prompt="All >" --header 'CTRL-A: All / CTRL-D: Directories / CTRL-F: Files' \ + --bind 'ctrl-a:change-prompt(All> )+reload(fd)' \ + --bind 'ctrl-d:change-prompt(Directories> )+reload(fd -t d)' \ + --bind 'ctrl-f:change-prompt(Files> )+reload(fd -t f)' --preview="_fzf_preview_file $expanded_token{}" set -f file_paths_selected $unescaped_exp_token($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) else - set --prepend fzf_arguments --prompt="Search Directory> " --query="$unescaped_exp_token" --preview='_fzf_preview_file {}' + set --prepend fzf_arguments --prompt="All >" --header 'CTRL-A: All / CTRL-D: Directories / CTRL-F: Files' \ + --bind 'ctrl-a:change-prompt(All> )+reload(fd)' \ + --bind 'ctrl-d:change-prompt(Directories> )+reload(fd -t d)' \ + --bind 'ctrl-f:change-prompt(Files> )+reload(fd -t f)' --query="$unescaped_exp_token" --preview='_fzf_preview_file {}' set -f file_paths_selected ($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) end diff --git a/.config/fish/functions/fzf_git_all.fish b/.config/fish/functions/allrepos.fish similarity index 69% rename from .config/fish/functions/fzf_git_all.fish rename to .config/fish/functions/allrepos.fish index 679bf2d7..2b8d89ff 100644 --- a/.config/fish/functions/fzf_git_all.fish +++ b/.config/fish/functions/allrepos.fish @@ -1,9 +1,13 @@ -function allrepos +function allrepos --description 'Git directories in the indicated directories with fzf' set -l search_directories ~/Descargas/ /docs/Documentos/ ~/.config/ ~/.local/share/ set -l excluded_directory /docs/Documentos/Repos/ set -l selected_dir (find $search_directories -type d -name '.git' -not -path "$excluded_directory/*" -exec dirname '{}' \; | fzf) if test -n "$selected_dir" cd "$selected_dir" + else + echo "No directory selected" + return end + end diff --git a/.config/fish/functions/audiorestart.fish b/.config/fish/functions/audiorestart.fish new file mode 100644 index 00000000..d32d0b0a --- /dev/null +++ b/.config/fish/functions/audiorestart.fish @@ -0,0 +1,4 @@ +function audiorestart --wraps='systemctl --user restart wireplumber pipewire pipewire-pulse' --description 'alias audiorestart=systemctl --user restart wireplumber pipewire pipewire-pulse' + systemctl --user restart wireplumber pipewire pipewire-pulse $argv + +end diff --git a/.config/fish/functions/backup.fish b/.config/fish/functions/backup.fish new file mode 100644 index 00000000..57de44dd --- /dev/null +++ b/.config/fish/functions/backup.fish @@ -0,0 +1,3 @@ +function backup --argument filename + cp $filename $filename.bak +end diff --git a/.config/fish/functions/bin.fish b/.config/fish/functions/bin.fish new file mode 100644 index 00000000..33aa63e0 --- /dev/null +++ b/.config/fish/functions/bin.fish @@ -0,0 +1,3 @@ +function bin --argument file + ln -sr (realpath $file) /usr/local/bin/ +end diff --git a/.config/fish/functions/bruh.fish b/.config/fish/functions/bruh.fish new file mode 100644 index 00000000..17cf0cc9 --- /dev/null +++ b/.config/fish/functions/bruh.fish @@ -0,0 +1,4 @@ +function bruh --wraps='genact -s 4' --description 'alias bruh=genact -s 4' + genact -s 4 $argv + +end diff --git a/.config/fish/functions/cat.fish b/.config/fish/functions/cat.fish new file mode 100644 index 00000000..774b959a --- /dev/null +++ b/.config/fish/functions/cat.fish @@ -0,0 +1,4 @@ +function cat --wraps=bat --description 'alias cat=bat' + bat $argv + +end diff --git a/.config/fish/functions/cdzi.fish b/.config/fish/functions/cdzi.fish new file mode 100644 index 00000000..e0f7b9e9 --- /dev/null +++ b/.config/fish/functions/cdzi.fish @@ -0,0 +1,7 @@ +function cdzi --description 'cd to a directory in the zoxide db' + set selected_directory (zi) + + if test -n "$selected_directory" + cd $selected_directory + end +end diff --git a/.config/fish/functions/clean-unzip.fish b/.config/fish/functions/clean-unzip.fish new file mode 100644 index 00000000..aa600b8d --- /dev/null +++ b/.config/fish/functions/clean-unzip.fish @@ -0,0 +1,15 @@ +function clean-unzip --argument zipfile + if not test (echo $zipfile | string sub --start=-4) = .zip + echo (status function): argument must be a zipfile + return 1 + end + + if is-clean-zip $zipfile + unzip $zipfile + else + set folder_name (echo $zipfile | trim-right '.zip') + set target (basename $folder_name) + mkdir $target || return 1 + unzip $zipfile -d $target + end +end diff --git a/.config/fish/functions/clock.fish b/.config/fish/functions/clock.fish new file mode 100644 index 00000000..673d6ca0 --- /dev/null +++ b/.config/fish/functions/clock.fish @@ -0,0 +1,4 @@ +function clock --wraps='tty-clock -sbc' --description 'alias clock=tty-clock -sbc' + tty-clock -sbc $argv + +end diff --git a/.config/fish/functions/clone-cd.fish b/.config/fish/functions/clone-cd.fish new file mode 100644 index 00000000..a949dd2c --- /dev/null +++ b/.config/fish/functions/clone-cd.fish @@ -0,0 +1,11 @@ +function clone-cd --argument url _destination + set destination (default $_destination (repo-from-url $url)) + + if file-exists $destination + echo 'Already cloned. Attempting pull...' + cd $destination && git pull + return + end + + git clone --depth=1 $url $destination && cd $destination +end diff --git a/.config/fish/functions/codeinfo.fish b/.config/fish/functions/codeinfo.fish new file mode 100644 index 00000000..24a24c9f --- /dev/null +++ b/.config/fish/functions/codeinfo.fish @@ -0,0 +1,4 @@ +function codeinfo --wraps='scc ./' --description 'alias codeinfo=scc ./' + scc ./ $argv + +end diff --git a/.config/fish/functions/copy.fish b/.config/fish/functions/copy.fish new file mode 100644 index 00000000..9a614783 --- /dev/null +++ b/.config/fish/functions/copy.fish @@ -0,0 +1,11 @@ +function copy + set count (count $argv | tr -d \n) + if test "$count" = 2; and test -d "$argv[1]" + set from (echo $argv[1] | trim-right /) + set to (echo $argv[2]) + mkdir -p (basename $to) + command cp -i -r $from $to + else + command cp -i $argv + end +end diff --git a/.config/fish/functions/disks.fish b/.config/fish/functions/disks.fish new file mode 100644 index 00000000..1d3b7157 --- /dev/null +++ b/.config/fish/functions/disks.fish @@ -0,0 +1,4 @@ +function disks --wraps=duf --description 'alias disks=duf' + duf $argv + +end diff --git a/.config/fish/functions/dots.fish b/.config/fish/functions/dots.fish new file mode 100644 index 00000000..d7a102b6 --- /dev/null +++ b/.config/fish/functions/dots.fish @@ -0,0 +1,4 @@ +function dots --wraps='yadm enter lazygit' --description 'alias dots=yadm enter lazygit' + yadm enter lazygit $argv + +end diff --git a/.config/fish/functions/dsize.fish b/.config/fish/functions/dsize.fish new file mode 100644 index 00000000..24d864a2 --- /dev/null +++ b/.config/fish/functions/dsize.fish @@ -0,0 +1,4 @@ +function dsize --wraps='dua i' --description 'alias dsize=dua i' + dua i $argv + +end diff --git a/.config/fish/functions/ea.fish b/.config/fish/functions/ea.fish new file mode 100644 index 00000000..7721079f --- /dev/null +++ b/.config/fish/functions/ea.fish @@ -0,0 +1,4 @@ +function ea --wraps='nvim ~/.config/fish/aliases.fish' --description 'alias ea=nvim ~/.config/fish/aliases.fish' + nvim ~/.config/fish/aliases.fish $argv + +end diff --git a/.config/fish/functions/ef.fish b/.config/fish/functions/ef.fish new file mode 100644 index 00000000..2fb7ccf1 --- /dev/null +++ b/.config/fish/functions/ef.fish @@ -0,0 +1,4 @@ +function ef --wraps='nvim ~/.config/fish/config.fish' --description 'alias ef=nvim ~/.config/fish/config.fish' + nvim ~/.config/fish/config.fish $argv + +end diff --git a/.config/fish/functions/eg.fish b/.config/fish/functions/eg.fish new file mode 100644 index 00000000..fec9d920 --- /dev/null +++ b/.config/fish/functions/eg.fish @@ -0,0 +1,4 @@ +function eg --wraps='nvim ~/.gitconfig' --description 'alias eg=nvim ~/.gitconfig' + nvim ~/.gitconfig $argv + +end diff --git a/.config/fish/functions/ev.fish b/.config/fish/functions/ev.fish new file mode 100644 index 00000000..22f3ce43 --- /dev/null +++ b/.config/fish/functions/ev.fish @@ -0,0 +1,4 @@ +function ev --wraps='nvim ~/.config/fish/variables.fish' --description 'alias ev=nvim ~/.config/fish/variables.fish' + nvim ~/.config/fish/variables.fish $argv + +end diff --git a/.config/fish/functions/f.fish b/.config/fish/functions/f.fish new file mode 100644 index 00000000..443c9175 --- /dev/null +++ b/.config/fish/functions/f.fish @@ -0,0 +1,4 @@ +function f --wraps=fzf --description 'alias f=fzf' + fzf $argv + +end diff --git a/.config/fish/functions/fetch.fish b/.config/fish/functions/fetch.fish new file mode 100644 index 00000000..a6426b39 --- /dev/null +++ b/.config/fish/functions/fetch.fish @@ -0,0 +1,4 @@ +function fetch --wraps=neofetch --description 'alias fetch=neofetch' + neofetch $argv + +end diff --git a/.config/fish/functions/fzf_forgit.fish b/.config/fish/functions/fgit.fish similarity index 60% rename from .config/fish/functions/fzf_forgit.fish rename to .config/fish/functions/fgit.fish index 136f5b07..d15ab449 100644 --- a/.config/fish/functions/fzf_forgit.fish +++ b/.config/fish/functions/fgit.fish @@ -1,6 +1,9 @@ -function fgit +function fgit --description 'List forgit options with fzf' set selected_command (functions | grep -o 'forgit::[^ ]*' | cut -d ':' -f 2- | sed 's/^://' | fzf) if [ -n "$selected_command" ] eval "forgit::$selected_command" + else + echo "Command selection canceled" + return end end diff --git a/.config/fish/functions/files.fish b/.config/fish/functions/files.fish new file mode 100644 index 00000000..47a1179d --- /dev/null +++ b/.config/fish/functions/files.fish @@ -0,0 +1,4 @@ +function files --wraps=xplr --description 'alias files=xplr' + xplr $argv + +end diff --git a/.config/fish/functions/fsend.fish b/.config/fish/functions/fsend.fish new file mode 100644 index 00000000..62f57bfc --- /dev/null +++ b/.config/fish/functions/fsend.fish @@ -0,0 +1,4 @@ +function fsend --wraps=floaterm --description 'alias fsend=floaterm' + floaterm $argv + +end diff --git a/.config/fish/functions/gpt.fish b/.config/fish/functions/gpt.fish new file mode 100644 index 00000000..3bfdd7f7 --- /dev/null +++ b/.config/fish/functions/gpt.fish @@ -0,0 +1,4 @@ +function gpt --wraps='tgpt -i' --description 'alias gpt=tgpt -i' + tgpt -i $argv + +end diff --git a/.config/fish/functions/h.fish b/.config/fish/functions/h.fish new file mode 100644 index 00000000..06c0651b --- /dev/null +++ b/.config/fish/functions/h.fish @@ -0,0 +1,4 @@ +function h --wraps=zi --description 'alias h=zi' + zi $argv + +end diff --git a/.config/fish/functions/info.fish b/.config/fish/functions/info.fish new file mode 100644 index 00000000..24d3c0e6 --- /dev/null +++ b/.config/fish/functions/info.fish @@ -0,0 +1,4 @@ +function info --wraps=tldr --description 'alias info=tldr' + tldr $argv + +end diff --git a/.config/fish/functions/install.fish b/.config/fish/functions/install.fish new file mode 100644 index 00000000..2508fbeb --- /dev/null +++ b/.config/fish/functions/install.fish @@ -0,0 +1,4 @@ +function install --wraps='yay -S ' --description 'alias install=yay -S ' + yay -S $argv + +end diff --git a/.config/fish/functions/l.fish b/.config/fish/functions/l.fish new file mode 100644 index 00000000..4c7f6563 --- /dev/null +++ b/.config/fish/functions/l.fish @@ -0,0 +1,4 @@ +function l --wraps='exa --long --header -a --icons --git --group-directories-first' --description 'alias l=exa --long --header -a --icons --git --group-directories-first' + exa --long --header -a --icons --git --group-directories-first $argv + +end diff --git a/.config/fish/functions/ld.fish b/.config/fish/functions/ld.fish new file mode 100644 index 00000000..8bb47dcb --- /dev/null +++ b/.config/fish/functions/ld.fish @@ -0,0 +1,4 @@ +function ld --wraps='exa --long --header -a --icons -D --git' --description 'alias ld=exa --long --header -a --icons -D --git' + exa --long --header -a --icons -D --git $argv + +end diff --git a/.config/fish/functions/ldh.fish b/.config/fish/functions/ldh.fish new file mode 100644 index 00000000..df740666 --- /dev/null +++ b/.config/fish/functions/ldh.fish @@ -0,0 +1,4 @@ +function ldh --wraps='exa --long --header --icons -D --git' --description 'alias ldh=exa --long --header --icons -D --git' + exa --long --header --icons -D --git $argv + +end diff --git a/.config/fish/functions/lg.fish b/.config/fish/functions/lg.fish new file mode 100644 index 00000000..8737a82a --- /dev/null +++ b/.config/fish/functions/lg.fish @@ -0,0 +1,4 @@ +function lg --wraps=lazygit --description 'alias lg=lazygit' + lazygit $argv + +end diff --git a/.config/fish/functions/lh.fish b/.config/fish/functions/lh.fish new file mode 100644 index 00000000..88eb2ea3 --- /dev/null +++ b/.config/fish/functions/lh.fish @@ -0,0 +1,4 @@ +function lh --wraps='exa --long --header --icons --git --group-directories-first' --description 'alias lh=exa --long --header --icons --git --group-directories-first' + exa --long --header --icons --git --group-directories-first $argv + +end diff --git a/.config/fish/functions/ls.fish b/.config/fish/functions/ls.fish new file mode 100644 index 00000000..ae1caa01 --- /dev/null +++ b/.config/fish/functions/ls.fish @@ -0,0 +1,4 @@ +function ls --wraps='exa -a --icons --group-directories-first' --description 'alias ls=exa -a --icons --group-directories-first' + exa -a --icons --group-directories-first $argv + +end diff --git a/.config/fish/functions/lsh.fish b/.config/fish/functions/lsh.fish new file mode 100644 index 00000000..82a10b05 --- /dev/null +++ b/.config/fish/functions/lsh.fish @@ -0,0 +1,4 @@ +function lsh --wraps='exa --icons --git --group-directories-first' --description 'alias lsh=exa --icons --git --group-directories-first' + exa --icons --git --group-directories-first $argv + +end diff --git a/.config/fish/functions/lt.fish b/.config/fish/functions/lt.fish new file mode 100644 index 00000000..73133fd7 --- /dev/null +++ b/.config/fish/functions/lt.fish @@ -0,0 +1,4 @@ +function lt --wraps='exa --long --header -a --icons --tree --git --group-directories-first' --description 'alias lt=exa --long --header -a --icons --tree --git --group-directories-first' + exa --long --header -a --icons --tree --git --group-directories-first $argv + +end diff --git a/.config/fish/functions/lth.fish b/.config/fish/functions/lth.fish new file mode 100644 index 00000000..5b8372f8 --- /dev/null +++ b/.config/fish/functions/lth.fish @@ -0,0 +1,4 @@ +function lth --wraps='exa --long --header --icons --tree --git --group-directories-first' --description 'alias lth=exa --long --header --icons --tree --git --group-directories-first' + exa --long --header --icons --tree --git --group-directories-first $argv + +end diff --git a/.config/fish/functions/matrix.fish b/.config/fish/functions/matrix.fish new file mode 100644 index 00000000..0529c608 --- /dev/null +++ b/.config/fish/functions/matrix.fish @@ -0,0 +1,4 @@ +function matrix --wraps='unimatrix -s 95' --description 'alias matrix=unimatrix -s 95' + unimatrix -s 95 $argv + +end diff --git a/.config/fish/functions/mkdir-cd.fish b/.config/fish/functions/mkdir-cd.fish new file mode 100644 index 00000000..6bfae861 --- /dev/null +++ b/.config/fish/functions/mkdir-cd.fish @@ -0,0 +1,4 @@ +function mkdir-cd --argument dir + mkdir -p -- $dir + and cd -- $dir +end diff --git a/.config/fish/functions/pages.fish b/.config/fish/functions/pages.fish new file mode 100644 index 00000000..4be3d70d --- /dev/null +++ b/.config/fish/functions/pages.fish @@ -0,0 +1,4 @@ +function pages --wraps=navi --description 'alias pages=navi' + navi $argv + +end diff --git a/.config/fish/functions/q.fish b/.config/fish/functions/q.fish new file mode 100644 index 00000000..20a7ec3a --- /dev/null +++ b/.config/fish/functions/q.fish @@ -0,0 +1,4 @@ +function q --wraps=exit --description 'alias q=exit' + exit $argv + +end diff --git a/.config/fish/functions/fzf_git.fish b/.config/fish/functions/repos.fish similarity index 58% rename from .config/fish/functions/fzf_git.fish rename to .config/fish/functions/repos.fish index dc5d802b..d0a3f172 100644 --- a/.config/fish/functions/fzf_git.fish +++ b/.config/fish/functions/repos.fish @@ -1,6 +1,9 @@ -function repos +function repos --description 'Git directories in ~/Repos with fzf' set selected_dir (fd --type d --base-directory ~/Repos/ -H '^\.git$' | sed 's/\/\.git\/$//' | fzf) if test -n "$selected_dir" cd ~/Repos/"$selected_dir" + else + echo "No directory selected" + return end end diff --git a/.config/fish/functions/restore.fish b/.config/fish/functions/restore.fish new file mode 100644 index 00000000..aa923783 --- /dev/null +++ b/.config/fish/functions/restore.fish @@ -0,0 +1,3 @@ +function restore --argument file + mv $file (echo $file | sed s/.bak//) +end diff --git a/.config/fish/functions/svn.fish b/.config/fish/functions/svn.fish new file mode 100644 index 00000000..7031b28b --- /dev/null +++ b/.config/fish/functions/svn.fish @@ -0,0 +1,4 @@ +function svn --description alias\ svn=svn\ --config-dir\ \\\"\$XDG_CONFIG_HOME\\\"/subversion + command svn --config-dir \"$XDG_CONFIG_HOME\"/subversion $argv + +end diff --git a/.config/fish/functions/sysproc.fish b/.config/fish/functions/sysproc.fish new file mode 100644 index 00000000..9bea225d --- /dev/null +++ b/.config/fish/functions/sysproc.fish @@ -0,0 +1,4 @@ +function sysproc --wraps=sysz --description 'alias sysproc=sysz' + sysz $argv + +end diff --git a/.config/fish/functions/uninstall.fish b/.config/fish/functions/uninstall.fish new file mode 100644 index 00000000..8c3438a9 --- /dev/null +++ b/.config/fish/functions/uninstall.fish @@ -0,0 +1,4 @@ +function uninstall --wraps='yay -R ' --description 'alias uninstall=yay -R ' + yay -R $argv + +end diff --git a/.config/fish/functions/update.fish b/.config/fish/functions/update.fish new file mode 100644 index 00000000..65252cf5 --- /dev/null +++ b/.config/fish/functions/update.fish @@ -0,0 +1,4 @@ +function update --wraps='yay -Syu' --description 'alias update=yay -Syu' + yay -Syu $argv + +end diff --git a/.config/fish/functions/vi.fish b/.config/fish/functions/vi.fish new file mode 100644 index 00000000..1bf20068 --- /dev/null +++ b/.config/fish/functions/vi.fish @@ -0,0 +1,4 @@ +function vi --wraps=nvim --description 'alias vi=nvim' + nvim $argv + +end diff --git a/.config/fish/functions/vim.fish b/.config/fish/functions/vim.fish new file mode 100644 index 00000000..af1b5818 --- /dev/null +++ b/.config/fish/functions/vim.fish @@ -0,0 +1,4 @@ +function vim --wraps=nvim --description 'alias vim=nvim' + nvim $argv + +end diff --git a/.config/fish/functions/yarn.fish b/.config/fish/functions/yarn.fish new file mode 100644 index 00000000..c45d0dbd --- /dev/null +++ b/.config/fish/functions/yarn.fish @@ -0,0 +1,4 @@ +function yarn --description 'alias yarn=yarn --use-yarnrc "$XDG_CONFIG_HOME/yarn/config"' + command yarn --use-yarnrc "$XDG_CONFIG_HOME/yarn/config" $argv + +end diff --git a/.config/fish/functions/zi.fish b/.config/fish/functions/zi.fish deleted file mode 100644 index 767be906..00000000 --- a/.config/fish/functions/zi.fish +++ /dev/null @@ -1,9 +0,0 @@ -function cdzi - # Ejecuta zi y utilize su interfaz de fzf para seleccionar el directorio - set selected_directory (zi) - - # Si se seleccionó un directorio, navega a él - if test -n "$selected_directory" - cd $selected_directory - end -end diff --git a/.config/fish/keybinds.fish b/.config/fish/keybinds.fish new file mode 100644 index 00000000..ec8c9e7f --- /dev/null +++ b/.config/fish/keybinds.fish @@ -0,0 +1,5 @@ +fzf_configure_bindings --directory=\cf + +bind \cg fgit +bind \e\z cdzi +bind \e\ci navi diff --git a/.config/fish/variables.fish b/.config/fish/variables.fish index 8ddbe7ea..87c04565 100644 --- a/.config/fish/variables.fish +++ b/.config/fish/variables.fish @@ -1,11 +1,49 @@ -set -xg GOPATH ~/.local/share/go -set -xg EDITOR nvim -set -xg VISUAL nvim set -xg XDG_CONFIG_HOME ~/.config set -xg XDG_CACHE_HOME ~/.cache set -xg XDG_DATA_HOME ~/.local/share +set -xg XDG_STATE_HOME ~/.local/state set -xg XDG_BIN_HOME ~/.local/bin set -xg XDG_SCRIPT_HOME ~/.local/script + +set -xg CONAN_USER_HOME $XDG_CONFIG_HOME +set -xg GOPATH $XDG_DATA_HOME/go +set -xg GOMODCACHE $XDG_CACHE_HOME/go/mod +set -xg RUSTUP_HOME $XDG_DATA_HOME/rustup +set -xg CARGO_HOME $XDG_DATA_HOME/cargo +set -xg LEIN_HOME $XDG_DATA_HOME/lein +set -xg NUGET_PACKAGES $XDG_CACHE_HOME/NuGetPackages +set -xg NPM_CONFIG_USERCONFIG $XDG_CONFIG_HOME/npm/npmrc + +set -x fish_user_paths +fish_add_path $XDG_BIN_HOME +fish_add_path $GOPATH/bin +fish_add_path $CARGO_HOME/bin +fish_add_path $XDG_SCRIPT_HOME +fish_add_path /usr/local/bin +fish_add_path /usr/local/sbin +fish_add_path /usr/bin +fish_add_path /usr/sbin +fish_add_path /bin +fish_add_path /sbin +fish_add_path /usr/lib/rustup/bin/ +fish_add_path /usr/lib/go/bin/ +fish_add_path $HOME/.dotnet/tools + +set -xg EDITOR nvim +set -xg VISUAL $EDITOR +set -xg SUDO_EDITOR $EDITOR + set -xg LANG es_ES.UTF-8 set -xg LC_ALL es_ES.UTF-8 -set -xg FZF_DEFAULT_COMMAND 'fd --type f --follow --hidden --exclude .git' + +set -xg FZF_DEFAULT_COMMAND fd +set -xg FZF_DEFAULT_OPTS "--height=90% --layout=reverse --info=inline --border --margin=1 --padding=1 \ +--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 \ +--color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 \ +--color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796" +set -xg fzf_preview_dir_cmd exa --long --header --icons --all --color=always --group-directories-first +set -xg fzf_fd_opts --hidden --exclude=.git --color=always +set -xg fzf_diff_highlighter delta --paging=never --width=20 + +set -xg LS_COLORS (vivid generate catppuccin-macchiato) +set -xg BAT_THEME Catppuccin-macchiato diff --git a/.config/keyb/bindings/fish.yml b/.config/keyb/bindings/fish.yml index 38856ab7..402cd302 100644 --- a/.config/keyb/bindings/fish.yml +++ b/.config/keyb/bindings/fish.yml @@ -25,11 +25,17 @@ key: Ctrl + Alt + L - name: Search Git Status key: Ctrl + Alt + S - - name: Search HIstory + - name: Search Command History key: Ctrl + R - name: Search Processes key: Ctrl + Alt + P - name: Search Variables key: Ctrl + Alt + V - name: Search Git Options - key: Ctrl + G \ No newline at end of file + key: Ctrl + G + - name: Search Aliases + key: Ctrl + Alt + A + - name: Search Navi Pages + key: Ctrl + Alt + I + - name: Search Zoxide History + key: Alt + Z \ No newline at end of file diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 2e29741c..32172e8d 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -11,14 +11,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, - "compiler.nvim": { "branch": "main", "commit": "41cfc40f09ab63c4ba2533c22aa002bcae576b2d" }, + "compiler.nvim": { "branch": "main", "commit": "df9eaba5458f10941b5a3037eb8d423139ac92d3" }, "copilot-cmp": { "branch": "master", "commit": "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1" }, "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" }, - "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" }, + "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8590288417fef2430f85bc8b312fae8b1cf2c40" }, + "gitsigns.nvim": { "branch": "main", "commit": "d8b52fc95e3d424e5c09b287ee2c293dcb4e26fb" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "highlight-undo.nvim": { "branch": "main", "commit": "d9e674a2eb4d95ee16cd477d47eab7ddc586e336" }, "import-cost.nvim": { "branch": "main", "commit": "d2c93deee35fa4042fde28719ddcbad664544fcf" }, @@ -28,7 +28,7 @@ "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, - "mason.nvim": { "branch": "main", "commit": "c811fbf09c7642eebb37d6694f1a016a043f6ed3" }, + "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" }, "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, @@ -43,8 +43,8 @@ "neotest-go": { "branch": "main", "commit": "f2580cad67ef0181403cf65858ab638ffd3ede9f" }, "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" }, "neotest-rust": { "branch": "main", "commit": "95161da0fbe0570395a938927b654931a82caecb" }, - "noice.nvim": { "branch": "main", "commit": "791c7adda821fd03529f995df2ee284ad591dabd" }, - "nui.nvim": { "branch": "main", "commit": "0f913a3ae1a24c8a4487fbf111b4044cc22b1b0d" }, + "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" }, + "nui.nvim": { "branch": "main", "commit": "aa1b4c1e05983ff7debd2b4b2788651db099de2f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, @@ -60,9 +60,9 @@ "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, "nvim-scrollview": { "branch": "main", "commit": "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-treesitter": { "branch": "master", "commit": "6def3eea22c213a475fc42644cd48c924b67a03f" }, + "nvim-treesitter": { "branch": "master", "commit": "7f6ff292e3f53e7b12554ee92264c23762dc7906" }, "nvim-treesitter-context": { "branch": "master", "commit": "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "e3e2b6de4ccf781fb653a3a1d397aeb4a0095609" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, @@ -77,18 +77,18 @@ "telescope-all-recent.nvim": { "branch": "main", "commit": "dee20f810aec14c31287988b3baa8c371900cf06" }, "telescope-floaterm.nvim": { "branch": "main", "commit": "ccd3f40ae30dce5de0e5d0f5069e08e7d9ad6d23" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "83133f66c8c265cfe41ee21828c88222c776cf18" }, + "telescope.nvim": { "branch": "master", "commit": "32e6792f865221dfaf2a3751fd3cfeac96557433" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, - "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, - "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, + "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, + "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "venv-selector.nvim": { "branch": "main", "commit": "81c4557afa2bb8e4bb91a33464a65b26ee1b8a52" }, + "venv-selector.nvim": { "branch": "main", "commit": "037b9af70942991b87eb54a80c989e26187e9f47" }, "vim-floaterm": { "branch": "master", "commit": "3bf0beb10a5a6f7a878195c93711515f2b7bdc99" }, "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, "workspaces.nvim": { "branch": "master", "commit": "a6fb4995333f927cc6f707890800fa7f7c476043" }, - "yanky.nvim": { "branch": "main", "commit": "95c2f006ea6eaed2b2d8b8b4943b8fcf13faf03f" } + "yanky.nvim": { "branch": "main", "commit": "ef70e4e44095a17ab8611cb6630b727ccee0a271" } } \ No newline at end of file