From c6f68bcca9c568c57e842fb405ccd4158bdd1e3d Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Tue, 13 Dec 2022 10:43:56 +0100
Subject: small update

---
 .xinitrc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
index 7065cfb..9c5ce38 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -11,22 +11,26 @@ if [ -f $HOME/.local/bin/statusbar ]; then
   . $HOME/.local/bin/statusbar
 fi
 
-# exec ck-launch-session dbus-launch --exit-with-session /usr/local/bin/dwm
+rfkill block all
+xset s off -dpms
+setxkbmap -option "ctrl:nocaps"
 
 # export GTK_IM_MODULE='ibus'
 # export QT_IM_MODULE='ibus'
 # export XMODIFIERS='@im=ibus'
-
-rfkill block all
+export XDG_SESSION_TYPE='x11'
 
 # ibus-daemon -dxrR
 
 xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
 xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
 
-xset s off -dpms
 
-setxkbmap -option "ctrl:nocaps"
+dbus-launch --sh-syntax --exit-with-session
+
+pipewire &
+mpd &
+/usr/local/bin/emacs --daemon &
 
 xwallpaper --maximize "$(/usr/bin/ls -d -1 /hdd/pics/wallpaper/* | shuf -n1)" &
 
-- 
cgit v1.2.3


From 750eecccdb229debde1854601daf190b51ae2536 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Thu, 15 Dec 2022 21:29:12 +0100
Subject: cleaned up my aliases, added evil-surround to emacs

---
 .bash_aliases                 | 104 ++++++++++++++++++++----------------------
 .config/sxiv/exec/key-handler |   2 +-
 .emacs.d/config.el            |   2 +
 .emacs.d/packages.el          |   5 ++
 .xinitrc                      |   9 ++++
 5 files changed, 66 insertions(+), 56 deletions(-)

(limited to '.xinitrc')

diff --git a/.bash_aliases b/.bash_aliases
index 3e8c813..d50ddf2 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -5,10 +5,9 @@
 #  \___\__,_|_|  \___|_.__/ \__,_|_.__/ \___|
 #
 
-#################
-# Miscellaneous # 
-#################
+## MISCELLANEOUS
 
+# various shortcuts
 alias reboot='sudo reboot'
 alias poweroff='sudo poweroff'
 alias refresh='source ~/.bashrc'
@@ -17,6 +16,22 @@ alias open='xdg-open'
 alias rsync='rsync -avh --progress'
 alias cwp='xwallpaper --maximize "$(/usr/bin/ls -1 -d /hdd/pics/wallpaper/* | shuf -n1)"'
 alias fd='fdfind'
+alias mutt='pushd ~/.mutt/attachments; mutt; popd'
+alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
+alias emacs='emacsclient -c -a "emacs"'
+alias cn='clear;macchina'
+
+# cp mv and rm always verbose
+alias cp='cp -v'
+alias mv='mv -v'
+alias rm='rm -v'
+
+# Colorize grep output
+alias grep='grep --color=auto -i'
+
+# color ls, always full info and human readable; group dirs
+alias ls='ls -hl --color=always --group-directories-first'
+alias la='ls -a'
 
 # Control Audio
 alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)"
@@ -31,17 +46,9 @@ alias setrmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left
 alias setrmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0'
 alias setrmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0'
 
-alias cn='clear;macchina'
+## FUNCTIONS FOR CONVERTING DATE TO ISO 8601
 
-# Colorize grep output
-alias grep='grep --color=auto -i'
-
-alias ls='ls -hl --color=always --group-directories-first'
-alias la='ls -a'
-
-alias nnn='nnn -Hde'
-
-# Convert date from YYYYMMDD to YYYY-MM-DD
+# convert date from YYYYMMDD to YYYY-MM-DD
 date-convert() {
     for i in *; do
         mv "${i}" "$(echo "${i}" |
@@ -49,7 +56,7 @@ date-convert() {
     done;
 }
 
-# Reverse date from DD-MM-YYYY to YYYY-MM-DD
+# reverse date from DD-MM-YYYY to YYYY-MM-DD
 date-reverse() {
     for i in *; do
         mv "${i}" "$(echo "${i}" |
@@ -57,10 +64,7 @@ date-reverse() {
     done;
 }
 
-# Convert video files to webm
-mkwebm() {
-    ffmpeg -i "${1}" -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm
-}
+## RECORDING, DOWNLOADING AND CONVERTING VIDEO
 
 # record primary monitor with audio output and input
 record() {
@@ -74,10 +78,26 @@ record() {
         ~/vids/"$1".mkv
 }
 
-#######
-# git #
-#######
+# shortcuts for most used yt-dlp calls
+alias ytvid='yt-dlp -o "/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"'
+alias ytreact='yt-dlp -o "/hdd/pics/reactions/gif/%(title)s.%(ext)s" --recode-video "webm"'
+alias ytarchive='yt-dlp -o "/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"'
+
+# function to specify filename, so I can avoid total chaos in my library
+ytmp3() {
+    read -p "Enter filename: " name;
+    yt-dlp -x --audio-format mp3 --download-archive "/hdd/music/Archive_goodMusic.txt" \
+        --embed-metadata -o "/hdd/music/Youtube Downloads/$name.%(ext)s" $1
+}
+
+# convert video files to webm
+mkwebm() {
+    ffmpeg -i "${1}" -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm
+}
+
+## GIT
 
+# general shortcuts
 alias commit='git commit -m'
 alias fetch='git fetch'
 alias upstream='git push --set-upstream origin'
@@ -85,45 +105,19 @@ alias remote='git remote add origin'
 alias pull='git pull origin'
 alias push='git push origin'
 
-# Shortcut for dotfiles repo
+# shortcut for dotfiles repo
 alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias dcomm='dfiles commit -m'
+alias dpush='dfiles push origin'
 
-###################
-# Package Manager #
-###################
+## PACKAGE MANAGER
 
 alias aptin='sudo apt install'
 alias aptup='sudo apt update && sudo apt upgrade'
 alias aptupd='sudo apt update'
 alias aptupg='sudo apt upgrade'
 alias aptrm='sudo apt remove'
-alias aptsr='apt search'
-alias listup='apt list --upgradeable'
-alias listin='apt list --installed'
-
-##########
-# yt-dlp #
-##########
-
-alias ytvid='yt-dlp -o "/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"'
-alias ytarchive='yt-dlp -o "/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"'
-
-# Function to specify filename, so I can avoid total chaos in my library
-ytmp3() {
-    read -p "Enter filename: " name;
-    yt-dlp -x --audio-format mp3 --download-archive "/hdd/music/Archive_goodMusic.txt" \
-        --embed-metadata -o "/hdd/music/Youtube Downloads/$name.%(ext)s" $1
-}
-
-###########
-# Network #
-###########
-
-alias flush-dns='sudo /etc/init.d/dns-clean start'
-
-#############
-# Shortcuts #
-#############
-
-alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
-alias emacs='emacsclient -c -a "emacs"'
+alias aptsr='sudo apt search'
+alias aptsh='sudo apt show'
+alias listup='sudo apt list --upgradeable'
+alias listin='sudo apt list --installed'
diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler
index 5ca4443..19bcc67 100755
--- a/.config/sxiv/exec/key-handler
+++ b/.config/sxiv/exec/key-handler
@@ -3,7 +3,7 @@
 while read file
 do
     case "$1" in
-        "C-d") trash-put "$file" ;;
+        "C-d") rm "$file" ;;
         "C-c") cat "$file" | xclip -sel c -t image/png ;;
         "C-w") xwallpaper --maximize "$file" ;;
     esac
diff --git a/.emacs.d/config.el b/.emacs.d/config.el
index 7634932..b05ee7e 100644
--- a/.emacs.d/config.el
+++ b/.emacs.d/config.el
@@ -2,6 +2,8 @@
 (add-hook 'prog-mode-hook 'display-line-numbers-mode)
 (add-hook 'emacs-startup-hook 'startup/revert-file-name-handler-alist)
 (add-hook 'emacs-startup-hook 'startup/reset-gc)
+;; Mutt support
+(add-to-list 'auto-mode-alist '("/tmp/mutt.*" . mail-mode))
 
 (show-paren-mode 1)
 (tool-bar-mode -1)
diff --git a/.emacs.d/packages.el b/.emacs.d/packages.el
index eddb559..9abae55 100644
--- a/.emacs.d/packages.el
+++ b/.emacs.d/packages.el
@@ -328,3 +328,8 @@
               (meghanada-mode t)))
   (setq meghanada-java-path "java")
   (setq meghanada-maven-path "mvn"))
+
+(use-package evil-surround
+  :ensure t
+  :config
+  (global-evil-surround-mode 1))
diff --git a/.xinitrc b/.xinitrc
index 9c5ce38..41825cb 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -11,6 +11,14 @@ if [ -f $HOME/.local/bin/statusbar ]; then
   . $HOME/.local/bin/statusbar
 fi
 
+envfile="$HOME/.gnupg/gpg-agent.env"
+if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then
+    eval "$(cat "$envfile")"
+else
+    eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")"
+fi
+export GPG_AGENT_INFO
+
 rfkill block all
 xset s off -dpms
 setxkbmap -option "ctrl:nocaps"
@@ -28,6 +36,7 @@ xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
 
 dbus-launch --sh-syntax --exit-with-session
 
+eval $(ssh-agent)
 pipewire &
 mpd &
 /usr/local/bin/emacs --daemon &
-- 
cgit v1.2.3


From e392d2278d2a46fee2411dec1027f07b4c6d79a3 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Fri, 16 Dec 2022 02:09:43 +0100
Subject: added emacs hook for mutt; cleaned up xinitrc

---
 .bash_aliases            |  1 +
 .config/picom/picom.conf | 12 ++++++++++++
 .emacs.d/config.el       |  1 +
 .xinitrc                 | 13 ++-----------
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 .config/picom/picom.conf

(limited to '.xinitrc')

diff --git a/.bash_aliases b/.bash_aliases
index d50ddf2..57ffc64 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -19,6 +19,7 @@ alias fd='fdfind'
 alias mutt='pushd ~/.mutt/attachments; mutt; popd'
 alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
 alias emacs='emacsclient -c -a "emacs"'
+alias emacsd='/usr/local/bin/emacs --daemon'
 alias cn='clear;macchina'
 
 # cp mv and rm always verbose
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
new file mode 100644
index 0000000..8f2753e
--- /dev/null
+++ b/.config/picom/picom.conf
@@ -0,0 +1,12 @@
+# opacity
+opacity-rule = [
+	"80:class_g = 'st-256color' && focused",
+	"80:class_g = 'st-256color' && !focused"
+]
+
+# just very slightly rounded corners
+corner-radius = 6
+
+rounded-corners-exclude = [
+	"class_g = 'dwm'"
+];
diff --git a/.emacs.d/config.el b/.emacs.d/config.el
index b05ee7e..c546588 100644
--- a/.emacs.d/config.el
+++ b/.emacs.d/config.el
@@ -2,6 +2,7 @@
 (add-hook 'prog-mode-hook 'display-line-numbers-mode)
 (add-hook 'emacs-startup-hook 'startup/revert-file-name-handler-alist)
 (add-hook 'emacs-startup-hook 'startup/reset-gc)
+
 ;; Mutt support
 (add-to-list 'auto-mode-alist '("/tmp/mutt.*" . mail-mode))
 
diff --git a/.xinitrc b/.xinitrc
index 41825cb..883a8ab 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,17 +7,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
-if [ -f $HOME/.local/bin/statusbar ]; then
-  . $HOME/.local/bin/statusbar
-fi
+[ -f $HOME/.local/bin/statusbar ] && . $HOME/.local/bin/statusbar
 
-envfile="$HOME/.gnupg/gpg-agent.env"
-if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then
-    eval "$(cat "$envfile")"
-else
-    eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")"
-fi
-export GPG_AGENT_INFO
+eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")"
 
 rfkill block all
 xset s off -dpms
@@ -33,7 +25,6 @@ export XDG_SESSION_TYPE='x11'
 xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
 xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
 
-
 dbus-launch --sh-syntax --exit-with-session
 
 eval $(ssh-agent)
-- 
cgit v1.2.3


From 6f4dbbbd64b91e7a13df567e990eb3712ce3a5a3 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Sat, 17 Dec 2022 15:44:37 +0100
Subject: re-added ibus configs

---
 .xinitrc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
index 883a8ab..d4f599c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,19 +15,18 @@ rfkill block all
 xset s off -dpms
 setxkbmap -option "ctrl:nocaps"
 
-# export GTK_IM_MODULE='ibus'
-# export QT_IM_MODULE='ibus'
-# export XMODIFIERS='@im=ibus'
+export GTK_IM_MODULE='ibus'
+export QT_IM_MODULE='ibus'
+export XMODIFIERS='@im=ibus'
 export XDG_SESSION_TYPE='x11'
 
-# ibus-daemon -dxrR
-
 xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
 xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
 
 dbus-launch --sh-syntax --exit-with-session
 
 eval $(ssh-agent)
+ibus-daemon -dxrR
 pipewire &
 mpd &
 /usr/local/bin/emacs --daemon &
-- 
cgit v1.2.3


From ee92c6100fd18a80309bcaa86d1cbc20f8f2cd49 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Fri, 23 Dec 2022 21:20:52 +0100
Subject: added a bunch of stuff and relocated some files

---
 .bash_aliases                                      | 124 ---------------------
 .bash_profile                                      |  14 ---
 .bashrc                                            | 117 -------------------
 .config/mpd/mpd.conf                               |  12 +-
 .config/shell/aliasrc                              |  99 ++++++++++++++++
 .config/shell/profile                              |  30 +++++
 .config/starship/starship.toml                     |  48 --------
 .config/tmux/tmux.conf                             |  41 +++++++
 .../51-camera-microphone-input-rename.lua          |  13 +++
 .../main.lua.d/51-soundblaster-output-rename.lua   |  14 +++
 .../51-starshipmatisse-output-rename.lua           |  14 +++
 .../main.lua.d/52-hdmi-card-disable.lua            |  12 ++
 .../main.lua.d/52-soundblaster-input-disable.lua   |  12 ++
 .../52-starshipmatisse-input-disable.lua           |  12 ++
 .config/x11/xinitrc                                |  26 +++++
 .config/zathura/zathurarc                          |  15 +++
 .config/zsh/.zshrc                                 | 112 +++++++++++++++++++
 .emacs.d/config.el                                 |   8 ++
 .ncmpcpp/bindings                                  |  18 +--
 .tmux.conf                                         |  41 -------
 .xinitrc                                           |  40 +------
 .zprofile                                          |   1 +
 22 files changed, 425 insertions(+), 398 deletions(-)
 delete mode 100644 .bash_aliases
 delete mode 100644 .bash_profile
 delete mode 100644 .bashrc
 create mode 100644 .config/shell/aliasrc
 create mode 100644 .config/shell/profile
 delete mode 100644 .config/starship/starship.toml
 create mode 100644 .config/tmux/tmux.conf
 create mode 100644 .config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua
 create mode 100644 .config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua
 create mode 100644 .config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua
 create mode 100644 .config/wireplumber/main.lua.d/52-hdmi-card-disable.lua
 create mode 100644 .config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua
 create mode 100644 .config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua
 create mode 100644 .config/x11/xinitrc
 create mode 100644 .config/zathura/zathurarc
 create mode 100644 .config/zsh/.zshrc
 delete mode 100644 .tmux.conf
 mode change 100644 => 120000 .xinitrc
 create mode 120000 .zprofile

(limited to '.xinitrc')

diff --git a/.bash_aliases b/.bash_aliases
deleted file mode 100644
index 57ffc64..0000000
--- a/.bash_aliases
+++ /dev/null
@@ -1,124 +0,0 @@
-#             __      _           _          
-#   ___ __ _ / _| ___| |__   __ _| |__   ___ 
-#  / __/ _` | |_ / _ \ '_ \ / _` | '_ \ / _ \
-# | (_| (_| |  _|  __/ |_) | (_| | |_) |  __/
-#  \___\__,_|_|  \___|_.__/ \__,_|_.__/ \___|
-#
-
-## MISCELLANEOUS
-
-# various shortcuts
-alias reboot='sudo reboot'
-alias poweroff='sudo poweroff'
-alias refresh='source ~/.bashrc'
-alias fuck='sudo $(history -p !!)'
-alias open='xdg-open'
-alias rsync='rsync -avh --progress'
-alias cwp='xwallpaper --maximize "$(/usr/bin/ls -1 -d /hdd/pics/wallpaper/* | shuf -n1)"'
-alias fd='fdfind'
-alias mutt='pushd ~/.mutt/attachments; mutt; popd'
-alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
-alias emacs='emacsclient -c -a "emacs"'
-alias emacsd='/usr/local/bin/emacs --daemon'
-alias cn='clear;macchina'
-
-# cp mv and rm always verbose
-alias cp='cp -v'
-alias mv='mv -v'
-alias rm='rm -v'
-
-# Colorize grep output
-alias grep='grep --color=auto -i'
-
-# color ls, always full info and human readable; group dirs
-alias ls='ls -hl --color=always --group-directories-first'
-alias la='ls -a'
-
-# Control Audio
-alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)"
-alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)"
-alias setvol='pactl set-sink-volume @DEFAULT_SINK@'
-
-# Monitor / Resolution settings, mainly for playing old-ass games
-alias setlmon-lowres='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary'
-alias setlmon-midres='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary'
-alias setlmon-default='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary'
-alias setrmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0'
-alias setrmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0'
-alias setrmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0'
-
-## FUNCTIONS FOR CONVERTING DATE TO ISO 8601
-
-# convert date from YYYYMMDD to YYYY-MM-DD
-date-convert() {
-    for i in *; do
-        mv "${i}" "$(echo "${i}" |
-        sed 's/\([0-9][0-9][0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)/\1-\2-\3/')"
-    done;
-}
-
-# reverse date from DD-MM-YYYY to YYYY-MM-DD
-date-reverse() {
-    for i in *; do
-        mv "${i}" "$(echo "${i}" |
-        sed 's/\([0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9][0-9][0-9]\)/\3-\1-\2/')"
-    done;
-}
-
-## RECORDING, DOWNLOADING AND CONVERTING VIDEO
-
-# record primary monitor with audio output and input
-record() {
-    ffmpeg -s 1920x1080 \
-        -framerate 60 -f x11grab -i :0.0+1600 \
-        -f pulse -ac 2 -ar 44100 -i alsa_output.pci-0000_29_00.0.analog-stereo.monitor \
-        -f pulse -ac 1 -ar 44100 -i alsa_input.usb-SunplusIT_Inc_FHD_Camera_Microphone_01.00.00-02.analog-stereo \
-        -filter_complex amix=inputs=2 \
-        -vcodec libx265 -s 1920x1080 \
-        -acodec libvorbis -ab 128k \
-        ~/vids/"$1".mkv
-}
-
-# shortcuts for most used yt-dlp calls
-alias ytvid='yt-dlp -o "/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"'
-alias ytreact='yt-dlp -o "/hdd/pics/reactions/gif/%(title)s.%(ext)s" --recode-video "webm"'
-alias ytarchive='yt-dlp -o "/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"'
-
-# function to specify filename, so I can avoid total chaos in my library
-ytmp3() {
-    read -p "Enter filename: " name;
-    yt-dlp -x --audio-format mp3 --download-archive "/hdd/music/Archive_goodMusic.txt" \
-        --embed-metadata -o "/hdd/music/Youtube Downloads/$name.%(ext)s" $1
-}
-
-# convert video files to webm
-mkwebm() {
-    ffmpeg -i "${1}" -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm
-}
-
-## GIT
-
-# general shortcuts
-alias commit='git commit -m'
-alias fetch='git fetch'
-alias upstream='git push --set-upstream origin'
-alias remote='git remote add origin'
-alias pull='git pull origin'
-alias push='git push origin'
-
-# shortcut for dotfiles repo
-alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
-alias dcomm='dfiles commit -m'
-alias dpush='dfiles push origin'
-
-## PACKAGE MANAGER
-
-alias aptin='sudo apt install'
-alias aptup='sudo apt update && sudo apt upgrade'
-alias aptupd='sudo apt update'
-alias aptupg='sudo apt upgrade'
-alias aptrm='sudo apt remove'
-alias aptsr='sudo apt search'
-alias aptsh='sudo apt show'
-alias listup='sudo apt list --upgradeable'
-alias listin='sudo apt list --installed'
diff --git a/.bash_profile b/.bash_profile
deleted file mode 100644
index e65e24b..0000000
--- a/.bash_profile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Path for Android Development
-export ANDROID_HOME=$HOME/.local/src/android/Sdk
-export PATH=$PATH:$ANDROID_HOME/emulator
-export PATH=$PATH:$ANDROID_HOME/tools
-export PATH=$PATH:$ANDROID_HOME/tools/bin
-export PATH=$PATH:$ANDROID_HOME/platform-tools
-
-# Add various paths
-export PATH="$PATH:$HOME/.fzf/bin:$HOME/.cargo/bin"
-export _JAVA_AWT_WM_NONREPARENTING=1
-
-[[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile
-
-umask 0077
diff --git a/.bashrc b/.bashrc
deleted file mode 100644
index 7da912f..0000000
--- a/.bashrc
+++ /dev/null
@@ -1,117 +0,0 @@
-#               __       _           _
-#   ___   __ _ / _| ___ | |__   __ _| |__   ___
-#  / __| / _' | |_ / _ \|  _ \ / _' |  _ \ / _ \
-# | |__ / (_| |  _|  __/| |_) / (_| | |_) |  __/
-#  \___|\___._/_|  \___/|____/\___._/____/ \___/
-
-export LC_ALL=en_US.UTF-8
-
-export STARSHIP_CONFIG=~/.config/starship/starship.toml
-export MAIL=~/.mutt/Maildir
-
-if [ -f "/etc/profile.d/rvm.sh" ]; then
-    source /etc/profile.d/rvm.sh
-fi
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-export NO_AT_BRIDGE=1
-
-stty start undef
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# Enable globbing hidden/dot files (.filename).
-shopt -s dotglob
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-
-# enable colors
-if  [ -f ~/.dircolors ]; then
-    eval "`dircolors -b ~/.dircolors`"
-fi
-
-
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-# Generated for envman. Do not edit.
-[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
-
-# fzf configs
-[ -f ~/.config/fzf/fzf.bash ] && source ~/.config/fzf/fzf.bash
-export FZF_DEFAULT_OPS="--extended"
-export FZF_DEFAULT_COMMAND="fd --type f"
-export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
-
-# NNN
-[ -f ~/.config/nnn/nnn.bash ] && source ~/.config/nnn/nnn.bash
-
-macchina
-
-export NVM_DIR=$HOME/.nvm
-
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-[[ -s "$HOME/.rvm/environments/ruby-3.1.2" ]] && source "$HOME/.rvm/environments/ruby-3.1.2"
-
-
-# BEGIN_KITTY_SHELL_INTEGRATION
-if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
-# END_KITTY_SHELL_INTEGRATION
-
-eval "$(starship init bash)"
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index afdcb5a..1b10341 100755
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -1,15 +1,15 @@
-bind_to_address		"127.0.0.1"
+bind_to_address		"0.0.0.0"
 #bind_to_address "/run/mpd/socket"
 
 music_directory		"/hdd/music"
 playlist_directory	"~/.config/mpd/playlists"
-db_file			"~/.config/mpd/database"
-log_file		"~/.config/mpd/log"
-pid_file		"~/.config/mpd/pid"
-state_file		"~/.config/mpd/mpdstate"
+db_file				"~/.config/mpd/database"
+log_file			"~/.config/mpd/log"
+pid_file			"~/.config/mpd/pid"
+state_file			"~/.config/mpd/mpdstate"
 
 audio_output {
-	type		"pulse"
+	type		"pipewire"
 	name		"Default"
 #	sink		"alsa_output.pci-0000_29_00.0.analog-stereo"
 }
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
new file mode 100644
index 0000000..63b4434
--- /dev/null
+++ b/.config/shell/aliasrc
@@ -0,0 +1,99 @@
+## MISCELLANEOUS
+
+# various shortcuts
+alias reboot='sudo openrc-shutdown -r'
+alias poweroff='sudo openrc-shutdown -p'
+alias pms='sudo pm-suspend'
+alias refresh='source $ZDOTDIR/.zshrc'
+alias fuck='sudo $(fc -Lln -1)'
+alias open='xdg-open'
+alias mutt='pushd ~/.mutt/attachments; mutt; popd'
+alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
+alias emacsd='/usr/local/bin/emacs --daemon'
+alias e="$EDITOR"
+alias z='zathura'
+alias cn='clear;macchina'
+alias nnn='nnn -Hde'
+alias freyr='sudo docker run -it --rm -v /hdd/music:/data freyrcli/freyrjs'
+
+# cp mv and rm always verbose
+alias cp='cp -iv'
+alias mv='mv -iv'
+alias rm='rm -Iv'
+alias mkd='mkdir -pv'
+
+# Colorize grep output
+alias grep='grep --color=auto -i'
+
+# color ls, always full info and human readable; group dirs
+alias ls='ls -hl --color=always --group-directories-first'
+alias la='ls -a'
+
+# Control Audio
+alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)"
+alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)"
+alias setvol='pactl set-sink-volume @DEFAULT_SINK@'
+
+# Monitor / Resolution settings, mainly for playing old-ass games
+alias setrmon-lowres='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary'
+alias setrmon-midres='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary'
+alias setrmon-default='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary'
+alias setlmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0'
+alias setlmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0'
+alias setlmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0'
+
+## FUNCTIONS FOR CONVERTING DATE TO ISO 8601
+
+# convert date from YYYYMMDD to YYYY-MM-DD
+date-convert() {
+    for i in *; do
+        mv "${i}" "$(echo "${i}" |
+        sed 's/\([0-9][0-9][0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)/\1-\2-\3/')"
+    done;
+}
+
+# reverse date from DD-MM-YYYY to YYYY-MM-DD
+date-reverse() {
+    for i in *; do
+        mv "${i}" "$(echo "${i}" |
+        sed 's/\([0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9][0-9][0-9]\)/\3-\1-\2/')"
+    done;
+}
+
+## DOWNLOADING AND CONVERTING VIDEO
+
+# shortcuts for most used yt-dlp settings
+alias ytvid='yt-dlp -o "/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"'
+alias ytarchive='yt-dlp -o "/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"'
+
+# convert video files to webm
+mkwebm() {
+    ffmpeg -i "${1}" -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm
+}
+
+## GIT
+
+# general shortcuts
+alias commit='git commit -m'
+alias fetch='git fetch'
+alias upstream='git push --set-upstream origin'
+alias remote='git remote add origin'
+alias pull='git pull origin'
+alias push='git push origin'
+
+# shortcut for dotfiles repo
+alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias dcomm='dfiles commit -m'
+alias dpush='dfiles push origin'
+
+## PACKAGE MANAGER
+
+alias aptin='sudo apt install'
+alias aptup='sudo apt update && sudo apt upgrade'
+alias aptupd='sudo apt update'
+alias aptupg='sudo apt upgrade'
+alias aptrm='sudo apt remove'
+alias aptsr='sudo apt search'
+alias aptsh='sudo apt show'
+alias listup='sudo apt list --upgradeable'
+alias listin='sudo apt list --installed'
diff --git a/.config/shell/profile b/.config/shell/profile
new file mode 100644
index 0000000..da7ff8f
--- /dev/null
+++ b/.config/shell/profile
@@ -0,0 +1,30 @@
+umask 0077
+
+export _JAVA_AWT_WM_NONREPARENTING=1
+export EDITOR="emacsclient -t"
+export TERMINAL="st"
+export BROWSER="firefox"
+
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+
+export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
+export LC_ALL=en_US.UTF-8
+
+export STARSHIP_CONFIG=~/.config/starship/starship.toml
+export MAIL=~/.mutt/Maildir
+export NO_AT_BRIDGE=1
+
+export GTK_IM_MODULE='ibus'
+export QT_IM_MODULE='ibus'
+export XMODIFIERS='@im=ibus'
+export XDG_SESSION_TYPE='x11'
+
+export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.cargo/bin:/sbin:/usr/sbin"
+
+# if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
+# 	exec startx
+# fi
diff --git a/.config/starship/starship.toml b/.config/starship/starship.toml
deleted file mode 100644
index 63ba159..0000000
--- a/.config/starship/starship.toml
+++ /dev/null
@@ -1,48 +0,0 @@
-format = """
-[](#CA5FCA)\
-$username\
-[](fg:#CA5FCA bg:#A92BA9 )\
-$directory\
-[](fg:#A92BA9 bg:#DC317D)\
-$git_branch\
-$git_status\
-[ ](fg:#DC317D)\
-"""
-
-# Disable the blank line at the start of the prompt
-# add_newline = false
-
-# You can also replace your username with a neat symbol like  to save some space
-[username]
-show_always = true
-style_user = "fg:#FFFFFF bg:#CA5FCA"
-style_root = "bg:#9A348E"
-format = '[$user ]($style)'
-
-[directory]
-style = "fg:#FFFFFF bg:#A92BA9"
-format = "[ $path ]($style)"
-truncation_length = 3
-truncation_symbol = "…/"
-
-# Here is how you can shorten some long paths by text replacement
-# similar to mapped_locations in Oh My Posh:
-[directory.substitutions]
-"Documents" = " "
-"Downloads" = " "
-"Music" = " "
-"Pictures" = " "
-# Keep in mind that the order matters. For example:
-# "Important Documents" = "  "
-# will not be replaced, because "Documents" was already substituted before.
-# So either put "Important Documents" before "Documents" or use the substituted version:
-# "Important  " = "  "
-
-[git_branch]
-symbol = ""
-style = "fg:#FFFFFF bg:#DC317D"
-format = '[ $symbol $branch ]($style)'
-
-[git_status]
-style = "fg:#FFFFFF bg:#DC317D"
-format = '[$all_status$ahead_behind ]($style)'
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
new file mode 100644
index 0000000..1db3b54
--- /dev/null
+++ b/.config/tmux/tmux.conf
@@ -0,0 +1,41 @@
+# Status-bar settings
+set -g status-right "%H:%M"
+set -g window-status-current-style "underscore"
+set -g message-command-style 'fg=#000000,bg=#FFFF00' 
+set -g message-style 'fg=#000000, bg=#FFFF00'
+set -g status-bg '#333333'
+set -g status-fg '#FFFFFF'
+set -g set-titles on
+set -g set-titles-string "#T"
+
+# Enable RGB colour if running in xterm(1)
+set-option -sa terminal-overrides ",xterm*:Tc"
+
+# Change the default $TERM to tmux-256color
+set -g default-terminal "tmux-256color"
+
+# Set history-limit
+set -g history-limit 30000
+
+## KEYBINDS
+
+# Change the prefix key to C-a
+set -g prefix C-a
+unbind C-b
+bind C-a send-prefix
+
+bind C-v split-window -v # split vertically
+bind C-h split-window -h # split horizontally
+bind C-w killp # kill pane
+bind C-q killw # kill window
+bind -n M-h select-pane -L
+bind -n M-l select-pane -R
+bind -n M-k select-pane -U
+bind -n M-j select-pane -D
+
+# Turn the mouse on, but without copy mode dragging
+set -g mouse off
+
+# Keys to toggle monitoring activity in a window and the synchronize-panes option
+bind m set monitor-activity
+bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,on,off}'
diff --git a/.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua b/.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua
new file mode 100644
index 0000000..c7db70e
--- /dev/null
+++ b/.config/wireplumber/main.lua.d/51-camera-microphone-input-rename.lua
@@ -0,0 +1,13 @@
+rule = {
+   matches = {
+	  {
+		 { "node.name", "equals", "alsa_input.usb-SunplusIT_Inc_FHD_Camera_Microphone_01.00.00-02.analog-stereo"},
+      },
+   },
+   apply_properties = {
+	  ["node.description"] = "Camera Microphone",
+	  ["node.nick"] = "Camera Microphone",
+   },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua b/.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua
new file mode 100644
index 0000000..cb5d4a3
--- /dev/null
+++ b/.config/wireplumber/main.lua.d/51-soundblaster-output-rename.lua
@@ -0,0 +1,14 @@
+rule = {
+   matches = {
+	  {
+		 { "node.name", "equals", "alsa_output.pci-0000_29_00.0.analog-stereo"},
+	  },
+   },
+
+   apply_properties = {
+	  ["node.description"] = "Headphones",
+	  ["node.nick"] = "Headphones",
+   },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua b/.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua
new file mode 100644
index 0000000..0a3c278
--- /dev/null
+++ b/.config/wireplumber/main.lua.d/51-starshipmatisse-output-rename.lua
@@ -0,0 +1,14 @@
+rule = {
+   matches = {
+	  {
+		 { "node.name", "equals", "alsa_output.pci-0000_31_00.4.analog-stereo"},
+	  },
+   },
+
+   apply_properties = {
+	  ["node.description"] = "Speakers",
+	  ["node.nick"] = "Speakers",
+   },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua b/.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua
new file mode 100644
index 0000000..63eb9e4
--- /dev/null
+++ b/.config/wireplumber/main.lua.d/52-hdmi-card-disable.lua
@@ -0,0 +1,12 @@
+rule = {
+   matches = {
+	  {
+		 { "device.name", "equals", "alsa_card.pci-0000_2f_00.1"},
+      },
+   },
+   apply_properties = {
+	  ["device.disabled"] = true,
+   },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua b/.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua
new file mode 100644
index 0000000..825c7d9
--- /dev/null
+++ b/.config/wireplumber/main.lua.d/52-soundblaster-input-disable.lua
@@ -0,0 +1,12 @@
+rule = {
+   matches = {
+	  {
+		 { "node.name", "equals", "alsa_input.pci-0000_29_00.0.analog-stereo"},
+      },
+   },
+   apply_properties = {
+	  ["node.disabled"] = true,
+   },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua b/.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua
new file mode 100644
index 0000000..51edd83
--- /dev/null
+++ b/.config/wireplumber/main.lua.d/52-starshipmatisse-input-disable.lua
@@ -0,0 +1,12 @@
+rule = {
+   matches = {
+	  {
+		 { "node.name", "equals", "alsa_input.pci-0000_31_00.4.analog-stereo"},
+      },
+   },
+   apply_properties = {
+	  ["node.disabled"] = true,
+   },
+}
+
+table.insert(alsa_monitor.rules,rule)
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
new file mode 100644
index 0000000..cbaec52
--- /dev/null
+++ b/.config/x11/xinitrc
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+rfkill block all
+
+eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")"
+eval "$(ssh-agent)"
+
+xset r rate 300 30
+xset s off -dpms
+setxkbmap -option "ctrl:nocaps"
+
+xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
+xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
+
+dbus-launch --sh-syntax --exit-with-session
+
+ibus-daemon -dxrR
+statusbar &
+pipewire &
+mpd &
+/usr/local/bin/emacs --daemon &
+picom &
+set-wallpaper &
+
+exec dwm >/dev/null 2>&1
+
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
new file mode 100644
index 0000000..452e116
--- /dev/null
+++ b/.config/zathura/zathurarc
@@ -0,0 +1,15 @@
+set sandbox none
+set statusbar-h-padding 0
+set statusbar-v-padding 0
+set page-padding 1
+set selection-clipboard clipboard
+map u scroll half-up
+map d scroll half-down
+map D toggle_page_mode
+map r reload
+map R rotate
+map K zoom in
+map J zoom out
+map i recolor
+map p print
+map g goto top
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
new file mode 100644
index 0000000..ec2f9e0
--- /dev/null
+++ b/.config/zsh/.zshrc
@@ -0,0 +1,112 @@
+autoload -U colors && colors
+
+# PS1="%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
+
+stty stop undef
+
+autoload -U compinit
+zstyle ':completion:*' menu select
+zmodload zsh/complist
+compinit
+_comp_options+=(globdots)
+
+# vi mode
+setopt PROMPT_SUBST
+
+THEME_VI_INS_MODE_SYMBOL=${THEME_VI_INS_MODE_SYMBOL:-'λ'}
+THEME_VI_CMD_MODE_SYMBOL=${THEME_VI_CMD_MODE_SYMBOL:-'ᐅ'}
+
+THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}"
+
+bindkey -v
+export KEYTIMEOUT=1
+
+# Use vim keys in tab complete menu:
+bindkey -M menuselect 'h' vi-backward-char
+bindkey -M menuselect 'k' vi-up-line-or-history
+bindkey -M menuselect 'l' vi-forward-char
+bindkey -M menuselect 'j' vi-down-line-or-history
+bindkey -v '^?' backward-delete-char
+
+bindkey '^a' vi-beginning-of-line
+bindkey '^e' vi-end-of-line
+
+zle-keymap-select() {
+  if [ "${KEYMAP}" = 'vicmd' ]; then
+    THEME_VI_MODE_SYMBOL="${THEME_VI_CMD_MODE_SYMBOL}"
+  else
+    THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}"
+  fi
+  zle reset-prompt
+}
+zle -N zle-keymap-select
+
+# reset to default mode at the end of line input reading
+zle-line-finish() {
+  THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}"
+}
+zle -N zle-line-finish
+
+# Fix a bug when you C-c in CMD mode, you'd be prompted with CMD mode indicator
+# while in fact you would be in INS mode.
+# Fixed by catching SIGINT (C-c), set mode to INS and repropagate the SIGINT,
+# so if anything else depends on it, we will not break it.
+TRAPINT() {
+  THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}"
+  return $(( 128 + $1 ))
+}
+
+PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%{$reset_color%}%b %(?.%F{green}$THEME_VI_MODE_SYMBOL.%F{red}$THEME_VI_MODE_SYMBOL) '
+
+setopt extendedGlob
+
+HISTFILE=$ZDOTDIR/.zsh_history
+HISTSIZE='2000'
+SAVEHIST='1000'
+
+# ignore duplicate in history
+setopt hist_expire_dups_first
+setopt hist_ignore_dups
+setopt hist_ignore_all_dups
+setopt hist_find_no_dups
+setopt hist_save_no_dups
+
+DIRSTACKFILE="${XDG_CACHE_HOME/.cache}/zsh/dirs"
+if [[ -f "$DIRSTACKFILE" ]] && (( ${#dirstack} == 0 )); then
+	dirstack=("${(@f)"$(< "$DIRSTACKFILE")"}")
+	[[ -d "${dirstack[1]}" ]] && cd -- "${dirstack[1]}"
+fi
+
+DIRSTACKSIZE='20'
+
+setopt auto_pushd
+setopt pushd_silent
+setopt pushd_ignore_dups
+setopt pushd_minus
+
+macchina
+
+if [ -f $XDG_CONFIG_HOME/.dircolors ]; then
+	eval "$(dircolors -b $XDG_CONFIG_HOME/.dircolors)"
+fi
+
+if [ -f $XDG_CONFIG_HOME/shell/aliasrc ]; then
+    . $XDG_CONFIG_HOME/shell/aliasrc
+fi
+
+if [ -f $HOME/.fzf/fzf.zsh ]; then
+	. $HOME/.fzf/fzf.zsh
+fi
+
+export FZF_DEFAULT_OPS="--extended"
+export FZF_DEFAULT_COMMAND="fdfind --type f"
+export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+
+# NNN
+if [ -f $XDG_CONFIG_HOME/nnn/nnn.bash ]; then
+	. $XDG_CONFIG_HOME/nnn/nnn.bash
+fi
+
+if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
+	. $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi
diff --git a/.emacs.d/config.el b/.emacs.d/config.el
index c546588..a46bca5 100644
--- a/.emacs.d/config.el
+++ b/.emacs.d/config.el
@@ -3,6 +3,14 @@
 (add-hook 'emacs-startup-hook 'startup/revert-file-name-handler-alist)
 (add-hook 'emacs-startup-hook 'startup/reset-gc)
 
+;; dirty fix for having AC everywhere
+(define-globalized-minor-mode real-global-auto-complete-mode
+  auto-complete-mode (lambda ()
+                       (if (not (minibufferp (current-buffer)))
+                         (auto-complete-mode 1))
+                       ))
+(real-global-auto-complete-mode t)
+
 ;; Mutt support
 (add-to-list 'auto-mode-alist '("/tmp/mutt.*" . mail-mode))
 
diff --git a/.ncmpcpp/bindings b/.ncmpcpp/bindings
index b7057ff..6962dea 100644
--- a/.ncmpcpp/bindings
+++ b/.ncmpcpp/bindings
@@ -178,12 +178,12 @@ def_key "j"
 #def_key "}"
 #  scroll_down_artist
 #
-#def_key "page_up"
-#  page_up
-#
-#def_key "page_down"
-#  page_down
-#
+def_key "u"
+  page_up
+
+def_key "d"
+  page_down
+
 #def_key "home"
 #  move_home
 #
@@ -367,9 +367,9 @@ def_key "j"
 #def_key "X"
 #  set_crossfade
 #
-#def_key "u"
-#  update_database
-#
+def_key "U"
+  update_database
+
 #def_key "ctrl-s"
 #  sort_playlist
 #
diff --git a/.tmux.conf b/.tmux.conf
deleted file mode 100644
index 686ce8d..0000000
--- a/.tmux.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Status-bar settings
-set -g status-right "%H:%M"
-set -g window-status-current-style "underscore"
-set -g message-command-style 'fg=#000000,bg=#FFFF00' 
-set -g message-style 'fg=#000000, bg=#FFFF00'
-set -g status-bg '#333333'
-set -g status-fg '#FFFFFF'
-set -g set-titles on
-set -g set-titles-string "#T"
-
-# Enable RGB colour if running in xterm(1)
-set-option -sa terminal-overrides ",xterm*:Tc"
-
-# Change the default $TERM to tmux-256color
-set -g default-terminal "tmux-256color"
-
-# Set history-limit
-set -g history-limit 10000
-
-## KEYBINDS
-
-# Change the prefix key to C-a
-set -g prefix C-a
-unbind C-b
-bind C-a send-prefix
-
-bind C-v split-window -v # split vertically
-bind C-h split-window -h # split horizontally
-bind C-w killp # kill pane
-bind C-q killw # kill window
-bind -n M-h select-pane -L
-bind -n M-l select-pane -R
-bind -n M-k select-pane -U
-bind -n M-j select-pane -D
-
-# Turn the mouse on, but without copy mode dragging
-set -g mouse off
-
-# Keys to toggle monitoring activity in a window and the synchronize-panes option
-bind m set monitor-activity
-bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,on,off}'
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100644
index d4f599c..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-[ -f $HOME/.local/bin/statusbar ] && . $HOME/.local/bin/statusbar
-
-eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")"
-
-rfkill block all
-xset s off -dpms
-setxkbmap -option "ctrl:nocaps"
-
-export GTK_IM_MODULE='ibus'
-export QT_IM_MODULE='ibus'
-export XMODIFIERS='@im=ibus'
-export XDG_SESSION_TYPE='x11'
-
-xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
-xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
-
-dbus-launch --sh-syntax --exit-with-session
-
-eval $(ssh-agent)
-ibus-daemon -dxrR
-pipewire &
-mpd &
-/usr/local/bin/emacs --daemon &
-
-xwallpaper --maximize "$(/usr/bin/ls -d -1 /hdd/pics/wallpaper/* | shuf -n1)" &
-
-picom --config $HOME/.config/picom/picom.conf -b
-
-exec dwm
-
diff --git a/.xinitrc b/.xinitrc
new file mode 120000
index 0000000..518bb5d
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1 @@
+.config/x11/xinitrc
\ No newline at end of file
diff --git a/.zprofile b/.zprofile
new file mode 120000
index 0000000..8486fca
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1 @@
+.config/shell/profile
\ No newline at end of file
-- 
cgit v1.2.3