From 1378553559056c2ec491f5b60da494b0a54e24f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Fri, 31 May 2024 16:45:21 +0200 Subject: [PATCH] Add search Script --- NixOS/modules/zsh/files/{zshrc => extra.zsh} | 49 +---------- NixOS/modules/zsh/files/search.zsh | 90 ++++++++++++++++++++ 2 files changed, 94 insertions(+), 45 deletions(-) rename NixOS/modules/zsh/files/{zshrc => extra.zsh} (70%) create mode 100644 NixOS/modules/zsh/files/search.zsh diff --git a/NixOS/modules/zsh/files/zshrc b/NixOS/modules/zsh/files/extra.zsh similarity index 70% rename from NixOS/modules/zsh/files/zshrc rename to NixOS/modules/zsh/files/extra.zsh index dc0e0aa..85d4f9d 100644 --- a/NixOS/modules/zsh/files/zshrc +++ b/NixOS/modules/zsh/files/extra.zsh @@ -1,24 +1,11 @@ -source ~/.profile - -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.config/zsh/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - -# Home Manager -if [ -f "$XDG_STATE_HOME/nix/profile/etc/profile.d/hm-session-vars.sh" ]; then - source $XDG_STATE_HOME/nix/profile/etc/profile.d/hm-session-vars.sh -fi - # Use LS colors for ZSH completion -export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:' zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} zstyle ':completion:*' menu select -# Use cd without cd -setopt autocd +if [ -n "${commands[fzf-share]}" ]; then + source "$(fzf-share)/key-bindings.zsh" + source "$(fzf-share)/completion.zsh" +fi # create a zkbd compatible hash; # to add other keys to this hash, see: man 5 terminfo @@ -30,7 +17,6 @@ if command -v fdfind &> /dev/null; then fi # Use vi-mode -source ${XDG_CONFIG_HOME}/zsh/zsh-vi-mode/zsh-vi-mode.plugin.zsh ZVM_VI_INSERT_ESCAPE_BINDKEY=jj # Finally, make sure the terminal is in application mode, when zle is @@ -212,11 +198,6 @@ export HISTFILE="$XDG_STATE_HOME"/zsh/history export HISTSIZE=10000000 export SAVEHIST=10000000 -source $XDG_CONFIG_HOME/zsh/powerlevel10k/powerlevel10k.zsh-theme - -# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh. -[[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh - unsetopt share_history BROWSER=/usr/bin/firefox @@ -297,25 +278,3 @@ function git() { /usr/bin/git "$@" fi } - -alias mallorea="run_waypipe mallorea" -alias vault="run_waypipe vault" -alias riva="run_waypipe riva" -alias kell="run_waypipe kell" -alias aloria="run_waypipe aloria" - -alias ls="ls --color=auto" -alias gdb='gdb -q' -alias ll='ls -lhat' -alias compress="tar --use-compress-program=lbzip2 -cvf" -alias vim="nvim" -alias dot='/usr/bin/git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME" "$@"' -alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" -alias python=python3 -alias v="nvim -c ':lua require(\"oil\").open()' && cd \"\$(cat /tmp/oil_dir 2> /dev/null || pwd)\"" -alias cpr="rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1" -alias mvr="rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 --remove-source-files" -alias rg="rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'" -alias ag="rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'" -alias push="git add -A && git commit -m '`date`' && git push" -alias reset="tput reset" diff --git a/NixOS/modules/zsh/files/search.zsh b/NixOS/modules/zsh/files/search.zsh new file mode 100644 index 0000000..2c1c6ec --- /dev/null +++ b/NixOS/modules/zsh/files/search.zsh @@ -0,0 +1,90 @@ +function cd_to() { + setopt localoptions pipefail no_aliases 2> /dev/null + local dir=$1 + if [[ -z "$dir" ]]; then + zle redisplay + return 0 + fi + zle push-line # Clear buffer. Auto-restored on next prompt. + cd $dir + zle accept-line + local ret=$? + unset dir # ensure this doesn't end up appearing in prompt expansion + zle reset-prompt +} + +function find_local() { + fd . -t $1 | fzy -l 20 +} + +function find_global() { + file_type=$1 + FZY_CACHE=~/.cache/fzy_paths_$file_type + if [ -f $FZY_CACHE ]; then + if [ $(stat -c %Y $FZY_CACHE) -lt $(date +%s -d '-1 day') ]; then + rm $FZY_CACHE + fi + fi + if [ ! -f $FZY_CACHE ]; then + PATHS="$(/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME ls-files)" + if [ "$file_type" = "d" ]; then + PATHS="$(echo -e $PATHS | xargs -n 1 dirname | uniq | grep -v '^\.$' | parallel echo ~/{})" + else + PATHS="$(echo -e $PATHS | parallel echo ~/{})" + fi + search_dirs=(~/Workspace/ ~/Containers/ /home/server/Storage/Thomas/) + for i in "$search_dirs[@]"; do + if [ -d $i ]; then + PATHS="$PATHS\n$i" + PATHS+="\n$(fd . $i -t $file_type -d 8)" + fi + done + echo -e "$PATHS" > $FZY_CACHE + fi + file="$(cat $FZY_CACHE | fzy -l 20)" + echo "$file" | cat - $FZY_CACHE | awk '!x[$0]++' > /tmp/fzy_paths_$file_type && mv /tmp/fzy_paths_$file_type $FZY_CACHE + echo "$file" +} + +function open_path() { + file_type=$1 + search_fn=$2 + selection="$($search_fn $file_type)" + if [ "$selection" = "" ]; then + zle reset-prompt + return + fi + if [ "$LBUFFER" = "" ]; then + if [ "$file_type" = "d" ]; then + cd_to "$selection" + else + selection=$(realpath "$selection") + cd_to "$(dirname \"$selection\")" + nvim "$selection" + fi + else + emulate -L zsh + zle -I + LBUFFER="${LBUFFER}\"$selection\"" + zle reset-prompt + fi +} + +function open_global_path_d() { open_path d find_global } +function open_global_path_f() { open_path f find_global } +function open_local() { open_path f find_local } + +zle -N push_local_files +zle -N find_local_directories + +function register_key() { + zle -N $2 + bindkey "^$1" $2 + bindkey -M emacs "^$1" $2 + bindkey -M vicmd "^$1" $2 + bindkey -M viins "^$1" $2 +} + +register_key "T" open_global_path_d +register_key "E" open_global_path_f +register_key "W" open_local