diff options
| -rwxr-xr-x | bin/extra/202020 | 2 | ||||
| -rwxr-xr-x | bin/menuscripts/mpotp (renamed from bin/menuscripts/mpass-otp) | 0 | ||||
| -rw-r--r-- | config/essentials/shell/aliases.sh | 5 | ||||
| -rw-r--r-- | config/essentials/shell/functions.sh | 7 | ||||
| -rw-r--r-- | config/home/.zshenv | 3 | ||||
| -rw-r--r-- | config/wayland/hypr/binds.conf | 2 | ||||
| -rw-r--r-- | config/wayland/hypr/hyprland.conf | 2 |
7 files changed, 13 insertions, 8 deletions
diff --git a/bin/extra/202020 b/bin/extra/202020 index 2bdbece..2380786 100755 --- a/bin/extra/202020 +++ b/bin/extra/202020 @@ -7,5 +7,5 @@ do herbe '202020' 'avert!' sleep 20s mpv --volume=100 ~/.local/share/sounds/avert2.ogg & - herbe 'stop averting' & + herbe '202020' 'stop averting' & done diff --git a/bin/menuscripts/mpass-otp b/bin/menuscripts/mpotp index 2be6186..2be6186 100755 --- a/bin/menuscripts/mpass-otp +++ b/bin/menuscripts/mpotp diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh index 239dc47..c37c702 100644 --- a/config/essentials/shell/aliases.sh +++ b/config/essentials/shell/aliases.sh @@ -292,7 +292,7 @@ alias fzh="fzf --tac < $HISTFILE | tee /dev/stderr | clipp" alias ffwin='hyprctl clients -j | jq '\''.[].pid'\'' | fzf --preview "hyprctl clients -j | jq '\''.[] | select(.pid == {}) | {class, title, workspace, xwayland}'\''"' alias pff='find ${PASSWORD_STORE_DIR:=~/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c' alias fzps='fzf --print0 | xargs -0I{}' -alias ytdl='yt-dlp --restrict-filenames --embed-chapters -f "b" -S "res:1080" -P "$HOME/vids/youtube/" -o "%(channel)s/%(title)s.%(ext)s"' +alias ytdl='yt-dlp --restrict-filenames --embed-chapters -S "res:1080" -o "%(channel)s - %(title)s.%(ext)s"' # emacs aliases alias emacsd='emacs --daemon' @@ -318,7 +318,8 @@ alias dbsmu='rsync -rlpP db:/media/basilisk/music/ /media/kilimanjaro/music' # git alias config='GIT_WORK_TREE=~/src/dotfiles/ GIT_DIR=~/src/dotfiles/.git' -alias cfg='vi ~/src/dotfiles/"$(config git ls-files | fzf || exit)"' +alias cfg='edit_git_file ~/src/dotfiles/' +alias nvcfg='edit_git_file ~/.config/nvim' alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs vi' alias gclc='git clone "$(clipo)"' diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh index cf10365..2a21655 100644 --- a/config/essentials/shell/functions.sh +++ b/config/essentials/shell/functions.sh @@ -348,3 +348,10 @@ prj () { [ -d "$d" ] || exit 1 cd "$pfx"/"$d" } + +edit_git_file () { + GIT_WORK_TREE="$1" GIT_DIR="$1"/.git git rev-parse --show-toplevel > /dev/null 2>&1 || return 1 + f="$(GIT_WORK_TREE="$1" GIT_DIR="$1"/.git git ls-files | fzf)" + [ "$f" ] || return 2 + $EDITOR "$1"/"$f" +} diff --git a/config/home/.zshenv b/config/home/.zshenv index 2b4e8ea..f4b6118 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -97,7 +97,4 @@ export PATH="$PATH:$GOPATH/bin" export PLAN9=/usr/lib/plan9 export PATH="$PATH:$PLAN9/bin" -export SSH_ASKPASS=askpass -export SSH_ASKPASS_REQUIRE=prefer - export MAKEFLAGS="-j$(nproc)" diff --git a/config/wayland/hypr/binds.conf b/config/wayland/hypr/binds.conf index 15af7dd..9e6f07f 100644 --- a/config/wayland/hypr/binds.conf +++ b/config/wayland/hypr/binds.conf @@ -31,7 +31,7 @@ binde = $mainMod SHIFT, K, resizeactive, 0 -60 binde = $mainMod SHIFT, L, resizeactive, 60 0 bind = $mainMod SHIFT, F, fullscreen -bind = $mainMod CTRL, F, fakefullscreen +# bind = $mainMod CTRL, F, fakefullscreen bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 diff --git a/config/wayland/hypr/hyprland.conf b/config/wayland/hypr/hyprland.conf index d084eb9..80f34d4 100644 --- a/config/wayland/hypr/hyprland.conf +++ b/config/wayland/hypr/hyprland.conf @@ -77,7 +77,7 @@ dwindle { } master { - new_is_master = false + # new_is_master = false } gestures { |