From 012f4fa8cc95cf65f78eceed2f05712232dfdba8 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 10 Nov 2021 17:42:28 +0100 Subject: [PATCH] config: slight directory adjustments --- .config/git/config | 2 +- .local/bin/scripts/clean | 8 +++++--- .local/bin/scripts/zfz | 6 +++++- .zprofile | 6 +++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.config/git/config b/.config/git/config index 857ddca..103000e 100644 --- a/.config/git/config +++ b/.config/git/config @@ -132,7 +132,7 @@ sd = switch -d sm = !git switch $(git main) - fzf = !fzf --preview='git diff HEAD --color=always -- {}' --tiebreak=end,index --multi + fzf = !fzf --tiebreak=end,index --multi --preview-window=wrap --preview='git diff HEAD --color=always -- {}' fzs = !cut -z -c2- | git fzf --read0 -d' ' --nth=2.. --bind='alt-enter:execute(nvim {2..})' --preview='test {1} != \\? && git diff --color HEAD -U5 -- {2..} | $(git config interactive.diffFilter) || find {2..} -type f | xargs -I% diff --recursive --color=always -u /dev/null %' | cut -c3- # Local Changes diff --git a/.local/bin/scripts/clean b/.local/bin/scripts/clean index afe00b6..987f473 100755 --- a/.local/bin/scripts/clean +++ b/.local/bin/scripts/clean @@ -4,7 +4,7 @@ typeset -A _clean_map _clean_map=([h]=$XDG_CACHE_HOME [t]=/var/tmp [l]=/var/log [c]=/var/cache) # Directories to always clean -_clean_folders=(~/.ant ~/.autopsy ~/.bundle ~/.cache ~/.cargo ~/.docker ~/.electron ~/.electron-gyp ~/.gradle ~/.gradle-kotlin-dsl ~/.hex ~/.java ~/.kscript ~/.konan ~/.m2 ~/.mix ~/.nix-defexpr ~/.node-gyp ~/.npm ~/.nv ~/.openjfx ~/.parallel ~/.stack ~/.surf ~/.texlive ~/.yarn luametatex-cache +_clean_folders=(~/.ant ~/.autopsy ~/.bundle ~/.cache ~/.cargo ~/.cpanm ~/.docker ~/.electron ~/.electron-gyp ~/.gradle ~/.gradle-kotlin-dsl ~/.hex ~/.java ~/.kscript ~/.konan ~/.m2 ~/.mix ~/.nix-defexpr ~/.node-gyp ~/.npm ~/.nv ~/.openjfx ~/.parallel ~/.stack ~/.surf ~/.texlive ~/.yarn luametatex-cache ~/.lesshst ~/.rubberband.wisdom.d ~/.yarnrc) @@ -41,8 +41,10 @@ if [[ $1 =~ "d" ]]; then -type d \( -name ".gradle" -o -name "generated" -o -name "dist-newstyle" -o -name "cache" -o -name "node_modules" -o -name "cmake_build" \) \ -print -exec rm -r {} + -prune echo -n " " && highlight "build directories" - find \( -name ".git" -o -path "*/mixxx/build" -o -name "Leaflet" -o -name "www" -o -name "src" \) -prune \ - -o -name "build" -type d \ + find $DATA/2-standards/dev/aur -mindepth 2 -maxdepth 2 -type d -not -name ".*" \ + -print -exec sudo rm -rI {} + + find \( -name ".git" -o -path "*/mixxx/build" -o -name "Leaflet" -o -name "www" -o -name "src" \) \ + -prune -o -name "build" -type d \ -print -exec rm -rI {} + -prune fi diff --git a/.local/bin/scripts/zfz b/.local/bin/scripts/zfz index 59d91d8..024291c 100755 --- a/.local/bin/scripts/zfz +++ b/.local/bin/scripts/zfz @@ -1,3 +1,7 @@ #!/bin/sh # fzf for zoxide -fzf -0 -1 -n2.. --tiebreak=index --preview="ls -a --color --human-readable --group-directories-first --file-type {2..}" --preview-window=20% | sed 's|.* /|/|' +# returns the selected path stripped of its score +fzf -0 -1 -n2.. --tiebreak=index \ + --preview-window=20% --preview="ls -a --color --human-readable --group-directories-first --file-type {2..}" \ + --height=80% --reverse | + sed 's|.* /|/|' diff --git a/.zprofile b/.zprofile index c5272e0..50ab669 100644 --- a/.zprofile +++ b/.zprofile @@ -57,8 +57,8 @@ export CONFIG_SHELLS="$XDG_CONFIG_HOME/shell" # environment which nvim >/dev/null && export EDITOR='nvim' || export EDITOR='vim' export LESS="--RAW-CONTROL-CHARS --ignore-case --LONG-PROMPT --jump-target=5 $(test $(less --version | head -1 | cut -f2 -d' ') -ge 590 && echo --incsearch)" -export IGNOREDIRS_PURE="-x .sync -x .stfolder -x .gradle -x dist_newstyle -x node_modules -x generated -x .cache -x *Cache -x .local/cache -x .local/state -x share/JetBrains -x share/Zeal -x share/syncthing -x .cpan" -export IGNOREDIRS="-x dev -x *build -x .git -x .idea -x out -x cache -x Partitions $IGNOREDIRS_PURE" +export IGNOREDIRS_PURE="-x .sync -x .stfolder -x .gradle -x dist_newstyle -x node_modules -x generated -x .cache -x *Cache -x .local/cache -x .local/state -x share/JetBrains -x share/Zeal -x share/syncthing -x .cpan -x .cpanm" +export IGNOREDIRS="-x *build -x .git -x .idea -x out -x cache -x Partitions $IGNOREDIRS_PURE" # red stderr test -f "/usr/lib/libstderred.so" && export LD_PRELOAD="/usr/lib/libstderred.so${LD_PRELOAD:+:$LD_PRELOAD}" # software config @@ -83,7 +83,7 @@ alt-enter:execute(test -O {} && $EDITOR {} || sudoedit {}) alt-bspace:execute(gio trash {}) double-click:execute(xdg-open {}) ctrl-a:select-all -ctrl-k:kill-line +ctrl-h:kill-line alt-a:select-all alt-c:yank alt-w:toggle-preview-wrap