Merge branch 'main' of db:dotfiles

8 files changed, 20 insertions, 48 deletions

diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf
index d8a4969..9300c97 100755
--- a/config/common/tmux/tmux.conf
+++ b/config/common/tmux/tmux.conf
@@ -43,11 +43,11 @@ bind  X     confirm -p "Kill Window?"   kill-window
 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'"
-bind K respawn-pane -k
+bind C-r run -C "respawn-pane -k; send-keys !! 'C-j'"
+bind C-R respawn-pane -k
 # Splitting
 bind v split-window -h -c "#{pane_current_path}"
-bind h split-window -v -c "#{pane_current_path}"
+bind s split-window -v -c "#{pane_current_path}"
 # Swapping left and right a la vim
 bind -n M-H swap-pane -U
 bind -n M-L swap-pane -D
@@ -64,8 +64,10 @@ bind b break-pane -t :
 # Reset length and shit
 bind z select-layout main-vertical
 
-
-
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
 
 # Pane navigating with h|j|k|l a la vim
 # Smart pane switching with awareness of Vim splits.
@@ -88,9 +90,6 @@ bind-key -T copy-mode-vi 'M-k' select-pane -U
 bind-key -T copy-mode-vi 'M-l' select-pane -R
 bind-key -T copy-mode-vi 'M-\' select-pane -l
 
-
-
-
 bind -n M-u previous-window
 bind -n M-i next-window
 # Session navigeting with S-M-u|i
diff --git a/config/essentials/git/config b/config/essentials/git/config
index ba81b18..99cf21e 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -12,3 +12,5 @@
 	ff = false
 [alias]
 	change-commits = "!f() { VAR1=$1; VAR='$'$1; OLD=$2; NEW=$3; echo \"Are you sure for replace $VAR  $OLD => $NEW ?(Y/N)\";read OK;if [ \"$OK\" = 'Y' ] ; then shift 3; git filter-branch  --env-filter \"if [ \\\"${VAR}\\\" = '$OLD' ]; then export $VAR1='$NEW';echo 'to $NEW'; fi\" $@; fi;};  f "
+[commit]
+	gpgsign = true
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 77c7684..a8b9036 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -2,7 +2,7 @@
 # s/alias \([^-]\)/alias -g \1
 
 # The most important one
-alias vi='nvim'
+alias vi='vis'
 alias cd='z'
 
 # Zsh specific aliases
@@ -81,7 +81,7 @@ alias lst2='ls --tree -L2'
 alias lst3='ls --tree -L3'
 alias ls.='ls -dl .*'
 which eza >/dev/null 2>&1 &&
-	alias ls='eza --sort extension --group-directories-first --no-time --git' ||
+	alias ls='eza --sort extension --group-directories-first --git' ||
 	alias ls='ls --color --group-directories-first --sort=extension'
 
 # pacman aliases
@@ -195,7 +195,7 @@ alias gdate='date +%y_%m_%d-%T'
 alias tpid='tail -f /dev/null --pid'
 alias pwdcp='pwd | clipp'
 alias gw="grep -ri"
-alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} ~/proj/suckless/*/ ~/proj/personal/scripts/*/ ~/.config/emacs ~/.config/nvim | supd'
+alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} ~/proj/suckless/*/ ~/.config/emacs ~/.config/nvim | supd'
 
 # systemctl aliases
 alias smc='systemctl'
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 9f7f4ce..b69b775 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -109,7 +109,7 @@ clip() {
 	then
 		echo -n "$@" | wl-copy
 	else
-		echo -n "$@" | xclip -selection clipboard -rmlastnl
+		echo -n "$@" | xsel -b
 	fi
 }
 
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 91a1618..545f9cc 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -31,17 +31,12 @@ eval "$(zoxide init zsh)"
 
 ### Plugins
 [ -f "$HOME/.local/share/zap/zap.zsh" ] && source "$HOME/.local/share/zap/zap.zsh"
-plug "MichaelAquilina/zsh-you-should-use"
 plug "chivalryq/git-alias"
-plug "kutsan/zsh-system-clipboard"
 # plug "marlonrichert/zsh-autocomplete"
-plug "xPMo/zsh-toggle-command-prefix"
 plug "zap-zsh/fzf"
-plug "zap-zsh/vim"
 plug "zdharma-continuum/fast-syntax-highlighting"
 plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-completions"
-plug "zsh-users/zsh-history-substring-search"
 
 plug "MichaelAquilina/zsh-auto-notify"
 export AUTO_NOTIFY_TITLE="zsh"
diff --git a/config/essentials/zsh/comp.zsh b/config/essentials/zsh/comp.zsh
index 4836111..076882d 100644
--- a/config/essentials/zsh/comp.zsh
+++ b/config/essentials/zsh/comp.zsh
@@ -2,11 +2,10 @@
 # Find most of the stuff at https://github.com/zap-zsh/completions
 
 zmodload zsh/complist
-autoload -Uz compinit; compinit
 zstyle ':compinstall' filename '/home/aluc/.zshrc'
 # cache
-zstyle ':completion:*' use-cache on
 zstyle ':completion:*' cache-path "$ZDOTDIR/zcompcache"
+zstyle ':completion:*' use-cache on
 
 # completers
 zstyle ':completion:*' completer _extensions _complete
@@ -37,6 +36,9 @@ zstyle ':completion:*' keep-prefix true
 # ui
 zstyle ':completion:*' menu select
 
+ZSH_COMPDUMP="$ZDOTDIR"/zcompcache
+autoload -Uz compinit; compinit -d "$ZSH_COMPDUMP"
+
 _dotnet_zsh_complete()
 {
   local completions=("$(dotnet complete "$words")")
diff --git a/config/extra/qrclip b/config/extra/qrclip
deleted file mode 100755
index 2f5da5c..0000000
--- a/config/extra/qrclip
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-if [ "$WAYLAND_DISPLAY" ]
-then
-	which wl-copy > /dev/null || exit 1
-	clipp () { 
-		wl-copy
-	}
-	clipo () { 
-		wl-paste
-	}
-else
-	which xclip > /dev/null || exit 1
-	clipp () { 
-		xclip -selection clipboard -r
-	}
-	clipo () { 
-		xclip -o -selection clipboard -r
-	}
-fi
-
-case $1 in
-	'-o')
-		qrencode -s 16 "$(clipo)" -o - |
-			imv -w "imv - $(clipo)" - ;;
-	'-s')
-		qrencode -s 16 "https://duckduckgo.com/$(clipo)" -o - |
-			imv -w "imv - search $(clipo)" - ;;
-esac
diff --git a/config/home/.zshenv b/config/home/.zshenv
index 46cc3e3..1d732ab 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -93,3 +93,6 @@ export PATH="$XDG_CONFIG_HOME/cargo/bin:$PATH"
 export PATH="$PATH:./node_modules/.bin"
 export PATH="$PATH:$HOME/.dotnet/tools"
 export PATH="$PATH:$GOPATH/bin"
+
+export PLAN9=/usr/lib/plan9
+export PATH="$PATH:$PLAN9/bin"