merge: main

.config/sway/config.d/40-hotkeys.conf

@@ -10,8 +10,8 @@
     # Hotkeys
     bindsym XF86AudioRaiseVolume    exec $raise_volume
     bindsym XF86AudioLowerVolume    exec $lower_volume
-    bindsym XF86AudioMute           exec pactl set-sink-mute 0 toggle
+    bindsym XF86AudioMute           exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-    bindsym Ctrl+XF86AudioMute      exec pactl set-source-mute 0 toggle
+    bindsym Ctrl+XF86AudioMute      exec pactl set-source-mute @DEFAULT_SINK@ toggle
     bindsym XF86AudioPlay           exec playerctl play-pause
     bindsym XF86AudioPrev           exec playerctl previous
     bindsym XF86AudioNext           exec playerctl next

.config/zsh/.p10k.zsh

@@ -1304,7 +1304,7 @@
   #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]#############
   # Show kubecontext only when the command you are typing invokes one of these tools.
   # Tip: Remove the next line to always show kubecontext.
-  typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|flux|fluxctl|stern|kubeseal|skaffold'
+  #typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|flux|fluxctl|stern|kubeseal|skaffold'
 
   # Kubernetes context classes for the purpose of using different colors, icons and expansions with
   # different contexts.

.config/zsh/.zsh_aliases

@@ -10,9 +10,9 @@ alias umnt='sudo umount /mnt -R'
 alias vi="$EDITOR"
 alias tmp="cd $(mktemp -d)"
 
-function watch() {
+function fnalias() {
     # alias alias_cmd='cmd'
-    cmd="$(alias "${1}")"
+    cmd="$(alias "${2}")"
 
     if [ -n "${cmd}" ]; then
         # remove everything before and including the first =
@@ -20,8 +20,10 @@ function watch() {
         # remove first and last char in this case, quotes
         cmd="${cmd:1:-1}"
     else
-        cmd="${1}"
+        cmd="${2}"
     fi
 
-    env watch "${cmd}" "${@:2}"
+    env "${1}" "${cmd}" "${@:3}"
 }
+
+alias watch='fnalias watch'

.config/zsh/.zshrc

@@ -96,7 +96,7 @@ plugins=(git vi-mode)
 # export ARCHFLAGS="-arch x86_64"
 
 # To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
-[[ ! -f ~/.config/zsh/.p10k.zsh ]] || . ~/.config/zsh/.p10k.zsh
+[[ ! -f "$ZDOTDIR/.p10k.zsh" ]] || . "$ZDOTDIR/.p10k.zsh"
 
 eval "$(pyenv init -)"
 . "$ZDOTDIR"/.zsh_aliases

.gitmodules

@@ -1,3 +1,6 @@
+[submodule ".config/nvim/pack/plugins/opt/black"]
+	path = .config/nvim/pack/plugins/opt/black
+	url = https://github.com/psf/black.git
 [submodule ".config/nvim/pack/plugins/opt/indent-blankline"]
 	path = .config/nvim/pack/plugins/opt/indent-blankline
 	url = https://github.com/lukas-reineke/indent-blankline.nvim.git
@@ -13,6 +16,3 @@
 [submodule ".pyenv"]
 	path = .pyenv
 	url = https://github.com/pyenv/pyenv.git
-[submodule ".config/nvim/pack/plugins/opt/black"]
-	path = .config/nvim/pack/plugins/opt/black
-	url = https://github.com/psf/black.git

.zshenv

@@ -1,6 +1,6 @@
 export PYENV_ROOT="$HOME/.pyenv"
 
-path=(~/bin ~/.local/bin "$PYENV_ROOT"/bin "$path")
+PATH="$HOME/bin:$HOME/.local/bin:$PYENV_ROOT/bin:$PATH"
 
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_CONFIG_HOME="$HOME/.config"

bin/set-light

@@ -16,6 +16,8 @@ set +e
 CUR="$(cat "$CUR_FILE" || echo 50)"
 set -e
 
+CUR="$((CUR - CUR % "$1"))"
+
 case "${1:0:1}" in
     '')
         exit 1

bin/set-vol

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
 
-CUR="$(pactl get-sink-volume "@DEFAULT_SINK@" | awk '$1 == "Volume:" {print substr($5, 1, length($5) - 1)}')"
+SINK='@DEFAULT_SINK@'
+CUR="$(pactl get-sink-volume "$SINK" | awk '$1 == "Volume:" {print substr($5, 1, length($5) - 1)}')"
 CUR="$((CUR - CUR % "$1"))"
 
 case "${1:0:1}" in
@@ -19,7 +20,7 @@ esac
 [ "$NEW" -lt 0 ] && NEW=0
 [ "$NEW" -gt 100 ] && NEW=100
 
-pactl set-sink-volume "${SINK}" "$NEW"%
+pactl set-sink-volume "$SINK" "$NEW%"
-pactl set-sink-mute "${SINK}" 0
+pactl set-sink-mute "$SINK" 0
 
 echo "$NEW"