merge updates

17 files changed, 118 insertions, 52 deletions

diff --git a/.gitignore b/.gitignore
index bbc3215..25c91d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,11 @@ vlc/vlc-qt-interface.conf
 vdirsyncer/
 unity3d/
 ubports-installer/
+tremc/
 transmission-daemon/
 transmission/*
 !transmission/settings.json
+touchegg/
 torbrowser/
 tmux/plugins
 syncthing/
@@ -32,7 +34,9 @@ rtorrent/
 rncbc.org/
 retroarch/
 rclone/
+raveloxmidi/
 qutebrowser/jmatrix-rules
+gtk-3.0/
 qtile/__pycache__/
 !qt6ct/qt6ct.conf
 qt6ct/*
@@ -44,6 +48,8 @@ protonmail/
 protonfixes/
 profanity/profrc
 print-manager/
+pop-system-updater/
+pop-shell/
 polychromatic/
 poezio/
 pmbootstrap.cfg
@@ -98,6 +104,7 @@ ksh/history
 kritarc
 kritadisplayrc
 kicad/
+khal/
 keepassxc/
 kdenlive-layoutsrc
 kdenlive-appimagerc
@@ -114,16 +121,22 @@ isync/
 irssi/
 inkscape/
 icedtea-web/
+ibus/
 htop/htoprc
 guitarix/
 gtk-3.0/bookmarks
 gtk-2.0/gtkfilechooser.ini
 gomuks/
+goa-1.0/
+gnome-session/
+gnome-initial-setup-done
+gnome-control-center/
 glib-2.0/
 ghb/
 gaiasky/
 fontconfig/
 falkTX/
+evolution/
 enchant/
 emacs/
 dolphin-emu/
@@ -139,6 +152,8 @@ chromium/
 cef_user_data
 calibre/conversion
 calibre/
+calcurse/*
+!calcurse/keys
 blender/
 autostart/
 ardour6/
diff --git a/.gitmodules b/.gitmodules
index c2ef443..5e925b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/sayanarijit/dragon.xplr
 [submodule "awesome"]
 	path = awesome
-	url = https://git.zachir.xyz/zachir/awesome-config.git
+	url = https://git.zachir.xyz/awesome-config.git
 [submodule "qutebrowser/jmatrix"]
 	path = qutebrowser/jmatrix
 	url = https://gitlab.com/jgkamat/jmatrix.git
diff --git a/X11/Xresources b/X11/Xresources
index 367f4d4..874b459 100644
--- a/X11/Xresources
+++ b/X11/Xresources
@@ -1,6 +1,6 @@
 !! dmenu
 
-dmenu.font: mononoki Nerd Font Mono:size=12
+dmenu.font: mononoki Nerd Font Mono:size=18
 
 !! dwm
 
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 01e8d54..2c247d5 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -154,7 +154,7 @@ font:
     style: Bold Italic
 
   # Point size
-  size: 11.0
+  size: 10.0
 
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
diff --git a/autostart.sh b/autostart.sh
index d892e27..b8d1aa5 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -14,7 +14,8 @@ if type mpd >/dev/null; then
 elif type musicpd >/dev/null; then
   runifnot musicpd
 fi
-pkill pipewire ; pkill pipewire-pulse ; pkill wireplumber ; snd.sh &
+#pkill pipewire ; pkill pipewire-pulse ; pkill wireplumber ; snd.sh &
+runifnot picom
 runifnot mpd-mpris -network unix
 runifnot mpd-notification
 runifnot transmission-daemon
diff --git a/awesome b/awesome
-Subproject 98e36e5087a8855bf758c95d9e90d6feae15a61
+Subproject 3b147eb8d6c02511cbc93ee1304a953c78054e5
diff --git a/calcurse/keys b/calcurse/keys
new file mode 100644
index 0000000..28ff9e4
--- /dev/null
+++ b/calcurse/keys
@@ -0,0 +1,55 @@
+#
+# Calcurse keys configuration file
+#
+# In this file the keybindings used by Calcurse are defined.
+# It is generated automatically by Calcurse and is maintained
+# via the key configuration menu of the interactive user
+# interface. It should not be edited directly.
+
+generic-cancel  ESC
+generic-select  SPC
+generic-credits  @
+generic-help  ?
+generic-quit  q Q
+generic-save  s S ^S
+generic-reload  R
+generic-copy  c
+generic-paste  p ^V
+generic-change-view  TAB
+generic-import  i I
+generic-export  x X
+generic-goto  g G
+generic-other-cmd  o O
+generic-config-menu  C
+generic-redraw  ^R
+generic-add-appt  ^A
+generic-add-todo  ^T
+generic-prev-day  T ^H
+generic-next-day  t ^L
+generic-prev-week  W ^K
+generic-next-week  w
+generic-prev-month  M
+generic-next-month  m
+generic-prev-year  Y
+generic-next-year  y
+generic-scroll-down  ^N
+generic-scroll-up  ^P
+generic-goto-today  ^G
+generic-command  :
+move-right  l L RGT
+move-left  h H LFT
+move-down  j J DWN
+move-up  k K UP
+start-of-week  0
+end-of-week  $
+add-item  a A
+del-item  d D
+edit-item  e E
+view-item  v V RET
+pipe-item  |
+flag-item  !
+repeat  r
+edit-note  n N
+view-note  >
+raise-priority  +
+lower-priority  -
diff --git a/doas.conf b/doas.conf
index b4065ab..ab9b891 100644
--- a/doas.conf
+++ b/doas.conf
@@ -1,19 +1,12 @@
-permit persist zachir
-permit nopass zachir cmd make args install
-permit nopass zachir cmd rsm args start libvirtd virtlockd virtlogd
-permit nopass zachir cmd rsm args stop libvirtd virtlockd virtlogd
-permit nopass zachir cmd pacman
-permit nopass zachir cmd iptables
-permit nopass zachir cmd ip6tables
-permit nopass zachir cmd mount
-permit nopass zachir cmd mount.exfat
-permit nopass zachir cmd umount
-permit nopass zachir cmd modprobe
-permit nopass zachir cmd zzz
-permit nopass zachir cmd sv
-permit nopass zachir cmd swhkd args
-permit nopass zachir cmd pkill args -HUP swhkd
-permit nopass zachir cmd killall args swhkd
+permit persist setenv { XAUTHORITY LANG LC_ALL } zachir
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd make args install
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd iptables
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd ip6tables
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd mount
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd mount.exfat
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd umount
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd modprobe
+permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd zzz
 permit nopass keepenv zachir as zachir
 
 permit nopass keepenv root
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
deleted file mode 100644
index 7c143cc..0000000
--- a/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[Settings]
-gtk-theme-name=Sweet-mars-v40
-gtk-icon-theme-name=Adwaita
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Adwaita
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
diff --git a/kshrc b/kshrc
index cd372c4..82c58fb 100644
--- a/kshrc
+++ b/kshrc
@@ -5,6 +5,8 @@
 [ -f $HOME/.config/sh/aliases ] && . $HOME/.config/sh/aliases
 [ -f $HOME/.config/sh/functions ] && . $HOME/.config/sh/functions
 
+alias e='. $ENV'
+
 RED="\033[1;31m"
 GRE="\033[1;32m"
 YEL="\033[1;33m"
diff --git a/lf/preview b/lf/preview
index 4b70b2e..e24c381 100755
--- a/lf/preview
+++ b/lf/preview
@@ -20,6 +20,17 @@ batorcat() {
 	fi
 }
 
+glowormdcat() {
+	file="$1"
+	shift
+	if command -v glow > /dev/null 2>&1
+	then
+		glow "$file"
+	else
+		mdcat "$file"
+	fi
+}
+
 CACHE="$HOME/.cache/lf/thumbnail.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | awk '{print $1}'))"
 
 case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
@@ -29,7 +40,8 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 	*.tar) tar tf "$1" ;;
 	*.zip|*.jar|*.war|*.ear|*.oxt) unzip -l "$1" ;;
 	*.rar) unrar l "$1" ;;
-  *.md) glow -s dark "$1" ;;
+  *.md) 
+  	glowormdcat "$1";;
 	*.7z) 7z l "$1" ;;
 	*.[1-8]) man "$1" | col -b ;;
 	*.o) nm "$1";;
@@ -37,7 +49,7 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 	*.iso) iso-info --no-header -l "$1" ;;
 	*.odt|*.ods|*.odp|*.sxw) odt2txt "$1" ;;
 	*.doc) catdoc "$1" ;;
-	*.docx) docx2txt "$1" - ;;
+	*.docx) docx2txt "$1" ;;
   *.xml|*.html) w3m -dump "$1";;
 	*.xls|*.xlsx)
 		ssconvert --export-type=Gnumeric_stf:stf_csv "$1" "fd://1" | batorcat --language=csv
@@ -65,7 +77,7 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 			ffmpegthumbnailer -i "$1" -o "${CACHE}.jpg" -s 0 -q 5
 		image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
 		;;
-	*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.gif|*.jfif)
+	*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.tiff|*.gif|*.jfif|*.ico)
 		image "$1" "$2" "$3" "$4" "$5"
 		;;
   *.svg)
diff --git a/mksh/mkshrc b/mksh/mkshrc
index 5b61ae3..8d17b8e 100644
--- a/mksh/mkshrc
+++ b/mksh/mkshrc
@@ -26,9 +26,12 @@
 # catch non-mksh, non-lksh, trying to run this file
 case ${KSH_VERSION:-} in
 *LEGACY\ KSH*|*MIRBSD\ KSH*) ;;
-*) \return 0 ;;
+*) . $CONFIG/kshrc && exit ;;
 esac
 
+[ -f "$HOME/.config/sh/aliases" ] && . "$HOME/.config/sh/aliases"
+[ -f "$HOME/.config/sh/functions" ] && . "$HOME/.config/sh/functions"
+
 # give MidnightBSD's laffer1 a bit of csh feeling
 function setenv {
 	if (( $# )); then
diff --git a/nvim/init.vim b/nvim/init.vim
index b5831c2..2ebefca 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -76,7 +76,7 @@ set conceallevel=2
 let mapleader="'"
 
 " emmet {{{
-let g:user_emmet_leader_key=';'
+let g:user_emmet_leader_key='+'
 " }}}
 
 " zig config {{{
@@ -246,10 +246,14 @@ vnoremap <C-h> <C-w>h
 vnoremap <C-j> <C-w>j
 vnoremap <C-k> <C-w>k
 vnoremap <C-l> <C-w>l
+" these may go away soon
 noremap <leader>xx :q<CR>
 noremap <leader>x! :q!<CR>
-noremap <leader>xw :wq<CR>
-noremap <leader>w :w<CR>
+" these are the new standard
+noremap <leader>qq :q<CR>
+noremap <leader>q! :q!<CR>
+noremap <leader>wq :wq<CR>
+noremap <leader>ww :w<CR>
 
 " escape for term windows
 tnoremap <Esc> <C-\><C-n>
diff --git a/sh/aliases b/sh/aliases
index 974a1d7..6face5a 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -45,10 +45,6 @@ alias gd='git diff'
 
 ## Single Chars
 alias r='cd ~ && clear && exec $SHELL'
-case "$(echo $0 | sed 's/^-*//' | xargs basename)" in
-  "zsh") alias e='. $ZDOTDIR/.zshrc' ;;
-  "ksh"|"oksh") alias e='. ~/.config/kshrc' ;;
-esac
 alias q='exit'
 alias c='clear'
 alias m='make'
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 222425e..2c8f824 100755
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -145,13 +145,11 @@ XF86Audio{Prev,Next,Play,Stop}
 
 # turn the brightness up
 XF86MonBrightnessUp
-	xbacklight -inc 1
-        # light -A 1
+        bl -i 1
 
 # turn the brightness down
 XF86MonBrightnessDown
-        xbacklight -dec 1
-        # light -U 1
+        bl -d 1
 
 # raise the volume
 XF86AudioRaiseVolume
diff --git a/zsh/.zshenv b/zsh/.zshenv
index d0753e6..f01a440 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -71,8 +71,8 @@ export OPENER="xdg-open"
 export PAGER="less"
 
 # KSH
-export ENV="$XDG_CONFIG_HOME/kshrc"
+export ENV="$XDG_CONFIG_HOME/mksh/mkshrc"
 
-export PATH="$HOME/.local/bin/generics:$HOME/.local/volsv:$HOME/.local/bin/shortcmds:$HOME/.local/bin/scripts:$HOME/.local/bin/blocks:$HOME/.local/bin:$HOME/.local/bin/ignore:$HOME/.local/bin/testing:$CARGO_HOME/bin:$GOPATH/bin:/opt/REAPER:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+export PATH="$HOME/.local/bin/generics:$HOME/.local/volsv:$HOME/.local/bin/shortcmds:$HOME/.local/bin/flatpak-sc:$HOME/.local/bin/scripts:$HOME/.local/bin/blocks:$HOME/.local/bin:$HOME/.local/share/flatpak/exports/bin/:$HOME/.local/bin/ignore:$HOME/.local/bin/testing:$CARGO_HOME/bin:$GOPATH/bin:/opt/REAPER:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 
 . /etc/profile.d/nix-daemon.sh
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 1c13e80..5442bc9 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -9,6 +9,8 @@ setopt HIST_IGNORE_DUPS
 setopt INC_APPEND_HISTORY
 setopt HIST_REDUCE_BLANKS
 
+_SH="zsh"
+
 if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
 	source "$XDG_CONFIG_HOME"/sh/aliases
 fi