Merge branch 'main' of /var/git/dotfiles

6 files changed, 39 insertions, 114 deletions

diff --git a/config/common/mpv/input.conf b/config/common/mpv/input.conf
index 9de1b1b..295dd4d 100644
--- a/config/common/mpv/input.conf
+++ b/config/common/mpv/input.conf
@@ -181,6 +181,8 @@
 
 q quit-watch-later
 
+Alt+l cycle-values loop-file "inf" "no"    # toggle infinite looping
+
 # seeking
 H add chapter -1
 L add chapter 1
diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf
index 7508667..409ad66 100755
--- a/config/common/tmux/tmux.conf
+++ b/config/common/tmux/tmux.conf
@@ -1,98 +1,47 @@
-#
 # By Nicholas Marriott. Public domain.
 # but -now- me.
-#
 
-
-###########################################################################
-################# MISC. ###################################################
-###########################################################################
-###########################################################################
 # Some tweaks to the status line
 set -g status-right "%H:%M"
 set -g window-status-current-style "underscore"
-
-# If running inside (nested) tmux ($TMUX is set), then change the status line to red
-%if #{TMUX}
-set -g status-bg red
-%endif
-
 # Enable RGB color if running in xterm
 set-option -sa terminal-overrides ",xterm*:Tc"
-
 # Change the default $TERM to xterm-256color
 # Necessary because vim ctrl arrows must be defined through TERM
 set -g default-terminal "xterm-256color"
 set-window-option -g xterm-keys on
-
 # No bells at all
 set -g bell-action none
-
 # Keep windows around after they exit
 set -g remain-on-exit off
-
 # More history lines
 set -g history-limit 16384
-
 # Base window is Numero Uno
 set -g base-index 1
 set-window-option -g pane-base-index 1
-
 # Set vi mode when copying
 set-window-option -g mode-keys vi
 # compatibility with vim for focus based events
 set -g focus-events on
 
-###########################################################################
-################# KEYBINDINGS #############################################
-###########################################################################
-###########################################################################
-
-
+# KEYBINDINGS 
 # Reload config file
-unbind r
 bind r source-file ~/.tmux.conf \; display "Reloaded ~/.tmux.conf"
-
-########## CLIPBOARD  ##########
-unbind -T copy-mode-vi Space; #Default for begin-selection
-unbind -T copy-mode-vi Enter; #Default for copy-selection
+# Clipboard
 bind -T copy-mode-vi v send-keys -X begin-selection
 bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -r -selection clipboard"
 bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -r -selection clipboard"
-
 # Unbind ESC
 set -sg escape-time 0
-
 # Toggle status bar
-unbind t
 bind t set-option status
-
 # Toggle monitoring window activity
 bind m set monitor-activity\; display 'monitor-activity #{?monitor-activity,on,off}'
-
 bind M run-shell "tmux set monitor-silence #{?monitor-silence,0,10}"\; display "monitor-silence #{?monitor-silence,on,off}"
-
-
-
-
-# if-shell "true" {
-#   if-shell "#{?monitor-silence,true,false}" {
-#     set monitor-silence 0
-#   }
-#   if-shell "#{?monitor-silence,false,true}" {
-#     set monitor-silence 10
-#   }
-#   display "monitor-silence #{?monitor-silence,on,off} #{monitor-silence}"
-# }
-
 # Toggle synchronized panes (sending keys to every pane)
-unbind y 
 bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,on,off}'
-
 # Paste from tmux buffer
-unbind p
 bind p paste-buffer
-
 # Kill all windows
 bind  x     confirm -p "Kill Pane?"     kill-pane
 bind  X     confirm -p "Kill Window?"   kill-window
@@ -100,16 +49,10 @@ bind  M-x   confirm -p "Kill Session?"  kill-session
 bind  M-X   confirm -p "Kill Server?"   kill-server
 # Restart pane
 bind k run -C "respawn-pane -k; send-keys !! 'C-j'"
-
-########## SPLIT AND SWAP ###########
 # Splitting
-unbind v 
 bind v split-window -h -c "#{pane_current_path}"
-unbind h 
 bind h split-window -v -c "#{pane_current_path}"
 # Swapping left and right a la vim
-unbind -n M-H
-unbind -n M-L
 bind -n M-H swap-pane -U
 bind -n M-L swap-pane -D
 ## Resizing panes
@@ -117,70 +60,31 @@ bind -r C-H  resize-pane -L 5
 bind -r C-J  resize-pane -D 5
 bind -r C-K  resize-pane -U 5
 bind -r C-L  resize-pane -R 5
-
-## Default keybindings for resizing
-unbind C-Up
-unbind C-Left
-unbind C-Down
-unbind C-Right
-unbind M-Up
-unbind M-Left
-unbind M-Down
-unbind M-Right
-
 # Join and break windows
-unbind j
 bind j command-prompt -1p "Take window:" "join-pane -s %%"
-unbind J
 bind J command-prompt -1p "Send to window:" "join-pane -t \:%% ; select-window -l"
 # Break pane without losing focus
-unbind b
 bind b break-pane -t :
 # Reset length and shit
-unbind z 
 bind z select-layout main-vertical
-
-########## NAVIGATION ##########
 # Pane navigating with h|j|k|l a la vim
-unbind -n M-h
-unbind -n M-j
-unbind -n M-k
-unbind -n M-l
 bind -n -N "select leftwards pane"  M-h select-pane -L
 bind -n -N "select downwards pane"  M-j select-pane -D
 bind -n -N "select upwards pane"    M-k select-pane -U
 bind -n -N "select rightwards pane" M-l select-pane -R
 # Window navigating with M-u|i
-unbind -n M-u
-unbind -n M-i
 bind -n M-u previous-window
 bind -n M-i next-window
 # Session navigeting with S-M-u|i
-unbind -n M-y
-unbind -n M-o
 bind -n M-U switch-client -p
 bind -n M-I switch-client -n
-
-########## Windows ##########
-# Rename window and open new window
-unbind n # DEFAULT KEY: move to next window
-unbind N
-unbind w # DEFAULT KEY: change current window interactively aka choose-tree -zW
+# Renaming
 bind n command-prompt "rename-window '%%'"
 bind N command-prompt "rename-session '%%'"
-# Start new window where tmux started, will be home because of xmonad
-bind w new-window -c "#{pane_current_path}" #-c "#{pane_current_path}"
+# Starting new windows
+bind w new-window -c "#{pane_current_path}"
 bind W new-session -c "$HOME"
-
 # Show tree 
-unbind S
 bind S choose-tree -Z
-
-# Turn the mouse on, but without copy mode dragging
-# set -g mouse on
-# unbind -n MouseDrag1Pane
-# unbind -T copy-mode MouseDrag1Pane
-
 # Menu for mounting and ejecting devices.
-unbind E 
 bind E display-menu -T "#[align=centre]#I:#W" -x W -y W '' Mount 0 "display-popup -E 'amount'"
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index 84373a2..99372d6 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -72,6 +72,8 @@ alias dopacs='dopac -S'
 alias dopacc='dopac -Sc'
 alias doprm='dopac -Rns'
 
+alias mpkg='makepkg -si'
+
 which pikaur > /dev/null 2>&1 &&
 	alias yay='pikaur'
 alias yup='yay -Syu'
@@ -84,6 +86,11 @@ alias yrm='yay -Rns'
 
 alias pkb='pkgfile -b'
 
+# transmission
+alias tr='transmission-remote debuc.com'
+alias trls='transmission-remote debuc.com -t all -l'
+alias tradd='transmission-remote debuc.com -a'
+
 alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
 
 # vim
@@ -153,7 +160,7 @@ alias kll='killall'
 alias pi='ping archlinux.org -c4'
 alias sba='source env/bin/activate || source bin/activate'
 alias smc='systemctl'
-alias ssc='doas smc'
+alias ssc='doas systemctl'
 alias smcu='smc --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
 alias rh='rehash'
@@ -162,6 +169,7 @@ alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
 alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite'
 alias gdate="date +%y%m%d_%H%M%S"
+alias tpid='tail -f /dev/null --pid'
 
 alias vbm='vboxmanage'
 alias vbls='vbm list vms'
@@ -216,10 +224,13 @@ alias go/s='go /srv'
 alias ogo/='ogo /'
 alias ogo/s='ogo /srv'
 
+# fzf aliases
 alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp'
 alias asf='alias | fzf'
 alias fzh="tac $HISTFILE | fzf | 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:=$HOME/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 -s zip='unzip -l'
 alias -s tar='tar tf'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 2f86b5d..bfaea9d 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -112,18 +112,19 @@ upfile () {
 
 sgd () {
 	d="$PWD"
-	for dir in ${1:-$HOME/src/*} 
-	do 
-		cd $dir
+	find $HOME/src -maxdepth 1 -mindepth 1 -type d |
+		while read -r dir
+	do
+		cd "$dir"
+		git status > /dev/null 2>&1 || continue
 		git fetch > /dev/null 2>&1
-		if [ "$(git status --short 2>/dev/null | grep -v "??" | head -1)" ]
-		then
-			# There are changes, and this is a git repo
-			echo "$PWD \e[1;31m*changes\e[0m"
-		fi
+		printf "$PWD"
+		test "$(git status --short 2>/dev/null | grep -v "??" | head -1)" &&
+			printf " \e[1;31m*changes\e[0m" | sed "s#$HOME#~#" >&2
 		test "$(parse_git_remote)" && 
-			echo "$PWD \e[0;32m*push/pull\e[0m"
-		done
+			printf " \e[0;32m*push/pull\e[0m" | sed "s#$HOME#~#" >&2
+		printf "\n"
+	done
 	cd "$d"
 	unset d
 }
@@ -261,3 +262,8 @@ sms ()
 {
 	ssh phone sendmsg "$1" "'$2'"
 }
+
+trcp ()
+{
+	scp "$1" db:/media/basilisk/downloads/transmission/torrents/
+}
diff --git a/config/hyprland/foot/foot.ini b/config/hyprland/foot/foot.ini
index 8caee75..032c558 100644
--- a/config/hyprland/foot/foot.ini
+++ b/config/hyprland/foot/foot.ini
@@ -9,7 +9,7 @@ term=xterm-256color
 title=""
 # locked-title=no
 
-font=monospace:size=11
+font=monospace:size=10.5
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
@@ -121,7 +121,7 @@ search-start=Control+Shift+r
 # minimize=none
 # maximize=none
 # fullscreen=none
-# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+pipe-visible=[sh -c "cat > /tmp/footvisible"] Mod1+Shift+p
 # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
 # pipe-selected=[xargs -r firefox] none
 # show-urls-launch=Control+Shift+u
diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index 5c2dd99..eb3d4a2 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -123,3 +123,5 @@ bind = $mainMod ALT, S, exec, $HOME/.config/hypr/screenshot.sh -m
 bind = $mainMod SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -sc
 bind = $mainMod ALT SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -s
 bind = $mainMod CTRL, S, exec, $HOME/.config/hypr/screenshot.sh -f
+
+bind = $mainMod, D, exec, foot -e ssh -t db tmux a