Merge branch 'main' of debuc.com:dotfiles

5 files changed, 29 insertions, 16 deletions

diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 09b2daa..68b66f2 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -144,6 +144,7 @@ alias mdb='mariadb -u admin -ppass admindb'
 alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb'
 alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb'
 alias tmux='pgrep tmux && tmux attach || tmux new-session'
+alias wd='dict'
 
 # ssh
 alias sha='ssh-add'
@@ -185,7 +186,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 | supd'
+alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} ~/proj/suckless/*/ ~/proj/personal/scripts/*/ ~/.config/emacs ~/.config/nvim | supd'
 
 # systemctl aliases
 alias smc='systemctl'
@@ -290,7 +291,6 @@ alias ffwin='hyprctl clients -j | jq '\''.[].pid'\'' | fzf --preview "hyprctl cl
 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 ytplay='mpv "$(ytlink)"'
 
 # emacs aliases
 alias emacsd='emacs --daemon'
@@ -330,3 +330,4 @@ alias ddeps='pactree -r -d 1'
 alias update-mirrors='reflector -p https | rankmirrors -n 10 -p -w - | doas tee /etc/pacman.d/mirrorlist'
 
 alias tmpd='cd $(mktemp -d)'
+alias brs='$BROWSER'
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index fa32446..f8b764a 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -72,8 +72,8 @@ getgit() { git clone git@db:"$1"; }
 esc() { eval "$EDITOR '$(which $1)'"; }
 compdef esc="which"
 
-delfile() { curl "${2:-https://upfast.cronyakatsuki.xyz/delete/$1}"; }
-upfile() { curl -F "file=@\"$1\"" "${2:-https://0x0.st}"; }
+delfile() { curl -s "${2:-https://upfast.cronyakatsuki.xyz/delete/$1}"; }
+upfile() { curl -s -F "file=@\"$1\"" "${2:-https://0x0.st}"; }
 to_webm() { ffmpeg -y -i "$1" -vcodec libvpx -cpu-used -12 -deadline realtime "${1%.*}".webm; }
 ngenable() { ln -sf /etc/nginx/sites-available/$1 /etc/nginx/sites-enabled/; }
 remove_audio() { ffmpeg -i "$1" -cpu-used -$(nproc) -deadline realtime -c copy -an "${2:-out.mp4}"; }
diff --git a/config/essentials/starship.toml b/config/essentials/starship.toml
index 0a9faaf..cd5832f 100644
--- a/config/essentials/starship.toml
+++ b/config/essentials/starship.toml
@@ -2,11 +2,12 @@
 
 # Inserts a blank line between shell prompts
 add_newline = false
-format = ' [\[$username@$hostname\]](bg:#000000) $all'
+# format = ' ${custom.upds}'
+format = ' [\[$username@$hostname\]](bg:#000000) ${custom.upds}$all'
 right_format = """$status"""
 
 [character]
-format = ' [❯](bold bright-yellow) '
+format = ' \$ '
 
 [username]
 style_root = "bold red"
@@ -30,3 +31,11 @@ min_time = 500
 [status]
 format = '($status)'
 disabled = false
+
+[custom.upds]
+command = 'cat ~/.cache/updates' # shows output of command
+# detect_files = ['foo'] # can specify filters but wildcards are not supported
+when = ''' test "$(cat ~/.cache/updates)" -gt 0'''
+symbol = '📦'
+format = '$output$symbol '
+
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index b7128b9..c9bf8b1 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -16,10 +16,6 @@ fi
 autoload -U select-word-style
 autoload -z edit-command-line
 zle -N edit-command-line
-autoload -Uz surround
-zle -N delete-surround surround
-zle -N add-surround surround
-zle -N change-surround surround
 
 ### Source files
 . $XDG_CONFIG_HOME/zsh/comp.zsh
@@ -49,8 +45,8 @@ plug "zsh-users/zsh-history-substring-search"
 
 plug "MichaelAquilina/zsh-auto-notify"
 export AUTO_NOTIFY_TITLE="zsh"
-export AUTO_NOTIFY_BODY="<b>%command</b> [%exit_code]"
-AUTO_NOTIFY_IGNORE+=("gurk" "ttyper" "pulsemixer" "tmux" "btop")
+export AUTO_NOTIFY_BODY="%command [%exit_code]"
+AUTO_NOTIFY_IGNORE+=("gurk" "ttyper" "pulsemixer" "tmux" "btop" "vis")
 
 # Substring search settings
 export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=blue,fg=black,bold"
@@ -86,9 +82,6 @@ fi
 
 ### Keybinds
 bindkey -v
-bindkey -a cs change-surround
-bindkey -a ds delete-surround
-bindkey -a ys add-surround
 bindkey -M visual S add-surround
 bindkey "^A"  beginning-of-line
 bindkey "^E"  end-of-line
@@ -103,6 +96,7 @@ bindkey "^Xe" edit-command-line
 bindkey "^[." insert-last-word
 bindkey "^['" quote-line
 bindkey '\ea' autosuggest-toggle
+bindkey '^Xp' push-input
 ## Move around using h j k l in completion menu
 zmodload zsh/complist
 bindkey -M menuselect 'h' vi-backward-char
diff --git a/config/essentials/zsh/widgets.zsh b/config/essentials/zsh/widgets.zsh
index c8b24f7..233ea65 100644
--- a/config/essentials/zsh/widgets.zsh
+++ b/config/essentials/zsh/widgets.zsh
@@ -1,4 +1,4 @@
-# surround line in variable
+# Surround line in variable
 surround_in_var()
 {
     BUFFER=" \"\$($BUFFER)\""
@@ -7,3 +7,12 @@ surround_in_var()
 zle -N surround_in_var
 bindkey '\ev' surround_in_var
 
+# Insert output from the previous command
+zmodload -i zsh/parameter
+insert-last-command-output() {
+  LBUFFER+="$(eval $history[$((HISTCMD-1))])"
+}
+zle -N insert-last-command-output
+bindkey "^Xl" insert-last-command-output
+
+#