Merge branch 'main' of db:dotfiles

55 files changed, 273 insertions, 319 deletions

diff --git a/bin/common/wt b/bin/common/wt
index d19539b..3cd739a 100755
--- a/bin/common/wt
+++ b/bin/common/wt
@@ -2,6 +2,6 @@
 while true
 do
   clear
-  $@
+  eval "$*"
   sleep 1
 done
diff --git a/bin/common/ytclipo b/bin/common/ytclipo
index 567e357..712b068 100755
--- a/bin/common/ytclipo
+++ b/bin/common/ytclipo
@@ -8,7 +8,7 @@ then paste() { termux-clipboard-get; }
 else paste() { xclip -o -sel c; }
 fi
 
-inp=”$1”
+inp="$1"
 [ "${inp:=$(paste)}" ] || inp="$(cat /dev/stdin)"
 
 # take last link from clipboard
diff --git a/bin/extra/confirm b/bin/extra/confirm
index 116b468..630d701 100755
--- a/bin/extra/confirm
+++ b/bin/extra/confirm
@@ -5,8 +5,8 @@ read_char ()
 	old_stty_cfg=$(stty -g 2> /dev/null)
 	stty raw -echo  2> /dev/null
 	dd ibs=1 count=1 2> /dev/null
-	stty $old_stty_cfg 2> /dev/null
+	stty "$old_stty_cfg" 2> /dev/null
 }
 
->&2 printf "$1 "
+>&2 printf "%s " "$1" 
 read_char | grep -q "[yY]"
diff --git a/bin/extra/gml b/bin/extra/gml
index 0f2f143..f8d6b7e 100755
--- a/bin/extra/gml
+++ b/bin/extra/gml
@@ -32,14 +32,14 @@ minecraft()
 				-mindepth 1 -maxdepth 1 \
 				-type d \
 				-printf "%f\n"
-							) | commander -d -c -s)"
+			) | commander -d -c -s)"
 
-							[ -z "$world" ] && exit 1
+			[ -z "$world" ] && exit 1
 
-							if [ "$world" = 'none' ]
-							then setsid multimc -l "$instance" > /dev/null 2>&1
-							else setsid multimc -l "$instance" -w "$world" > /dev/null 2>&1
-							fi
+			if [ "$world" = 'none' ]
+			then setsid multimc -l "$instance" > /dev/null 2>&1
+			else setsid multimc -l "$instance" -w "$world" > /dev/null 2>&1
+			fi
 
 		fi
 }
@@ -47,24 +47,27 @@ minecraft()
 steam()
 {
 	choice="$(
-	cat <<-EOF | column -t -l 2 | commander -d -x -c | awk '{printf $1}'
-	274190 broforce
-	291550 brawlhalla
-	1712840 tiny tina
-	105600 terraria
-	kill
-EOF
-	)"
+		cat <<-EOF |
+		274190 broforce
+		291550 brawlhalla
+		1712840 tiny tina
+		105600 terraria
+		kill
+		EOF
+		column -t -l 2 | commander -d -x -c | awk '{printf $1}')"
+
 	case "$choice" in
 		kill) pkill steam ;;
+		"") ;;
 		*) setsid steam steam://rungameid/"$choice" ;;
 	esac
 	exit
 }
 
 eval "$(
-	cat <<-EOF | commander -c -w 9 -y 2
+	cat <<-EOF | commander -c -w 9 -y 3
 	minecraft
 	steam
+	lutris
 	EOF
 )"
diff --git a/bin/extra/pomo b/bin/extra/pomo
deleted file mode 100755
index a2c371d..0000000
--- a/bin/extra/pomo
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-notif() { notify-send -t 1000 -w "pomo" "$1"; }
-
-for msg in "three" "two" "one"
-do notif "$msg"
-done
-
-# $1: time in minutes
-# $2: msg for notification
-ring_ring()
-{
-	date '+%R B'
-	notify-send -w "$(($1*1000*60))" -u critical "pomo" "$2"
-}
-
-i="${1-0}"
-while true
-
-do 
-	notif "<b>START</b>"
-	date '+%R S'
-	sleep 20m
-	if [ "$i" -eq 3 ]
-	then
-		i=0
-		ring_ring 20 "GIGA BREAK TIME"
-	else
-		ring_ring 5 "BREAK TIME"
-		i=$((i+1))
-	fi
-done
diff --git a/bin/extra/setip b/bin/extra/setip
new file mode 100755
index 0000000..b10e7cc
--- /dev/null
+++ b/bin/extra/setip
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+ips="192.168.178.79 192.168.178.52 10.7.0.1 none"
+
+for ip in $ips
+do ping -i .2 -c 1 "$ip" > /dev/null 2>&1 && break 
+done
+
+if [ "$ip" = "none" ]
+then
+	>&2 printf 'No ip.\n'
+	exit 1
+fi
+
+sed -i "/Host db/,/^$/s/.*HostName.*/\tHostname $ip/" "$HOME"/.ssh/config
+>&2 printf 'Done: %s \n' "$ip"
diff --git a/bin/guiscripts/dmfm b/bin/guiscripts/dmfm
index 969c111..d1dd8b8 100755
--- a/bin/guiscripts/dmfm
+++ b/bin/guiscripts/dmfm
@@ -1,17 +1,19 @@
 #!/bin/sh
 
-file=1
-while [ "$file" ]; do
-	file=$(ls -1 --group-directories-first | dmenu -i -l 8 -g 1 -p "$(basename $(pwd)):")
-	if [ -e "$file" ]; then
-		owd=$(pwd)
-		if [ -d "$file" ]; then
-			cd "$file"
-		else [ -f "$file" ]
-			if which xdg-open &> /dev/null; then
-				exec xdg-open "$owd/$file" &
-				unset file
-			fi
-		fi
+while true
+do
+	file=$(find . -maxdepth 1 -mindepth 1 -not -name '.*' -printf '%y\t%f\n' |
+		sort -k 1 -k 2 | cut -f 2- |
+		commander -xcd -p "$PWD>")
+
+	[ "$file" ] || break
+	[ ! -e "$file" ] && continue
+
+	if [ -d "$file" ]
+	then
+		cd "$file" || continue
+	else
+		setsid xdg-open "$PWD/$file" &
 	fi
+
 done
diff --git a/bin/guiscripts/locker b/bin/guiscripts/locker
index 7c42cda..a0a9eac 100755
--- a/bin/guiscripts/locker
+++ b/bin/guiscripts/locker
@@ -1,9 +1,8 @@
 #!/bin/sh
-which swaylock grim pixelate > /dev/null ||
-	exit 1
+which swaylock grim pixelate > /dev/null || exit 1
 umask 077
 
-monitors="$(hyprctl monitors -j | jq -r '.[].name' | xargs)"
+monitors="$(xrandr --listactivemonitors | awk '/^ [0-9]/ {print $4}')"
 
 for monitor in $monitors
 do
@@ -15,5 +14,5 @@ do
 	files="$files $file"
 done
 
-swaylock -f -u $img_opt
+swaylock --indicator-radius 0 $img_opt
 shred -uz -- $files
diff --git a/bin/guiscripts/startdwl b/bin/guiscripts/startdwl
new file mode 100755
index 0000000..bb5fec0
--- /dev/null
+++ b/bin/guiscripts/startdwl
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)"
+
+export XCURSOR_THEME="Bibata-Modern-Classic"
+export XCURSOR_SIZE="24"
+
+export GTK_THEME="Arc-Dark"
+
+export GTK_IM_MODULE="fcitx"
+export XMODIFIERS="@im=fcitx"
+export GLFW_IM_MODULE="ibus"
+
+export MOZ_ENABLE_WAYLAND="1"
+
+export QT_IM_MODULE="fcitx"
+export QT_AUTO_SCREEN_SCALE_FACTOR="1"
+export QT_QPA_PLATFORM="wayland;xcb"
+export QT_QPA_PLATFORMTHEME="qt5ct"
+export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+
+export XDG_CURRENT_DESKTOP="dwl"
+export XDG_SESSION_TYPE="wayland"
+export XDG_SESSION_DESKTOP="dwl"
+
+export SDL_IM_MODULE="fcitx"
+export SDL_VIDEODRIVER="wayland"
+export CLUTTER_BACKEND="wayland"
+
+export TERMINAL="foot"
+export MENUCMD="tofi"
+export IMAGE="imv"
+
+# # nvidia
+# env = LIBVA_DRIVER_NAME,nvidia
+# env = XDG_SESSION_TYPE,wayland
+# env = GBM_BACKEND,nvidia-drm
+# env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+# env = WLR_NO_HARDWARE_CURSORS,1
+
+while true;
+do dwl -s "$HOME"/.config/dwl/startup.sh
+done
diff --git a/bin/guiscripts/startw b/bin/guiscripts/startw
index 9b35556..0383f48 100755
--- a/bin/guiscripts/startw
+++ b/bin/guiscripts/startw
@@ -3,4 +3,6 @@
 eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
 eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)"
 
+(cd ~/.config/waybar/ && ln -sf hyprland.jsonc config.jsonc)
+
 Hyprland
diff --git a/bin/menuscripts/mhelp b/bin/menuscripts/mhelp
index 339d6bf..cb7977b 100755
--- a/bin/menuscripts/mhelp
+++ b/bin/menuscripts/mhelp
@@ -1,16 +1,16 @@
 #!/usr/bin/env sh
 
-program="$(commander -r -c -d)"
+program="$(commander -rcd)"
 
 [ "$program" ] || exit 1
 
 option="$("$program" --help |
 	# Parse options
-	grep "^ *-[-a-zA-Z0-9]* " |
+	grep -- "^ *-[-a-zA-Z0-9]* " |
 	tr -s ' ' |
 	sort | uniq |
 	column -l 2 -t |
-	commander -l -x -c -d |
+	commander -lxcd |
 	awk '{print $1}')"
 
 [ "$option" ] || exit 1
diff --git a/bin/menuscripts/mplay b/bin/menuscripts/mplay
deleted file mode 100755
index e4fca54..0000000
--- a/bin/menuscripts/mplay
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-choice="$(mpc listall | commander -c -l -d -x)"
-[ "$choice" ] || exit 1
-mpc insert "$choice" || exit 1
-mpc next 2> /dev/null
-mpc play 2> /dev/null
diff --git a/bin/menuscripts/mpassgen b/bin/menuscripts/mpwgen
index 51b9bc4..51b9bc4 100755
--- a/bin/menuscripts/mpassgen
+++ b/bin/menuscripts/mpwgen
diff --git a/config/X/dunst/dunstrc b/config/X/dunst/dunstrc
index 4975d0a..a83f45f 100644
--- a/config/X/dunst/dunstrc
+++ b/config/X/dunst/dunstrc
@@ -30,7 +30,7 @@
     height = 80
 
     # Position the notification in the top right corner
-    origin = right
+    origin = top-right
 
     # Offset from the origin
     offset = 10x10
@@ -171,7 +171,7 @@
     # Show age of message if message is older than show_age_threshold
     # seconds.
     # Set to -1 to disable.
-    show_age_threshold = 60
+    show_age_threshold = -1
 
     # Specify where to make an ellipsis in long lines.
     # Possible values are "start", "middle" and "end".
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 3f607ab..70d7570 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -143,6 +143,7 @@ ls.add_snippets("java", {
 
 ls.add_snippets("sh", {
 	s("TD", t "THISDIR=\"$(dirname \"$(readlink -f \"$0\")\")\""),
+	parse("pf", ">&2 printf '$1\\n'$0", {}),
 	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
 	-- Functions
 	parse("rchar",
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index 9454cc1..2781b12 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -21,6 +21,6 @@ vim.keymap.set("n", "<LocalLeader>r", require("telekasten").rename_note)
 vim.keymap.set("n", "<LocalLeader>t", require("telekasten").toggle_todo)
 vim.keymap.set("i", "<LocalLeader>t", "<cmd>Telekasten toggle_todo<cr><Esc>A")
 vim.keymap.set("n", "<LocalLeader>y", require("telekasten").yank_notelink)
-vim.keymap.set("n", "<LocalLeader>z", require("telekasten").follow_link)
+vim.keymap.set("n", "<Return>", require("telekasten").follow_link)
 
 vim.keymap.set("i", "<LocalLeader>l", "<esc>I[<esc>A]()<left><C-r>+<esc>A")
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index c50d346..e194ffa 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -79,13 +79,13 @@ vim.keymap.set("n", "<Leader>P", "<cmd>PackerSync<cr>", { noremap = true })
 -- spelling
 vim.keymap.set("n", "<Leader><C-s>", "<cmd>setlocal spell!<cr>", { noremap = true })
 
--- open terminal in file's parent director
--- this needs to be asynchrous
-vim.keymap.set("n", "<Return>", function ()
-    local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid $TERMINAL"
-	-- asynchrous go brr
-    vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end })
-end, { noremap = true })
+-- -- open terminal in file's parent director
+-- -- this needs to be asynchrous
+-- vim.keymap.set("n", "<Return>", function ()
+--     local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid $TERMINAL"
+-- 	-- asynchrous go brr
+--     vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end })
+-- end, { noremap = true })
 
 
 -- clear registers
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 989560a..7e15fa3 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -56,6 +56,11 @@ require("telekasten").setup({
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
+		SoftwareDesign = {
+			home = home .. "/" .. "SoftwareDesign",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
 		BusinessCommunication = {
 			home = home .. "/" .. "BusinessCommunication",
 			template_new_note = home .. "/" .. "templates/new_note.md",
@@ -86,8 +91,8 @@ require("telekasten").setup({
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
-		SoftwareDesign2 = {
-			home = home .. "/" .. "SoftwareDesign2",
+		SoftwareDesignAndQualityAssurance = {
+			home = home .. "/" .. "SoftwareDesignAndQualityAssurance",
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index a5b20e3..7fa61c7 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -28,7 +28,6 @@ compinit
 . $ZDOTDIR/functions.zsh
 . $ZDOTDIR/aliases.sh
 
-local PLUGPATH
 for file in /{etc,usr/lib}/os-release
 do [ -f "$file" ] && . "$file" && break
 done
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 4aff77e..db5bd4f 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -206,8 +206,8 @@ alias esl='$EDITOR ~/proj/suckless/slock/config.def.h'
 alias esls='$EDITOR ~/proj/suckless/slstatus/config.def.h'
 alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
 alias ehyb='$EDITOR ~/.config/hypr/binds.conf'
-alias ewbj='$EDITOR ~/src/dotfiles/config/hyprland/waybar/config.jsonc'
-alias ewbs='$EDITOR ~/src/dotfiles/config/hyprland/waybar/style.css'
+alias ewbj='$EDITOR ~/.config/waybar/config.jsonc'
+alias ewbs='$EDITOR ~/.config/waybar/style.css'
 alias cfd='$EDITOR config.def.h'
 # /# quick cd
jV}k:!sort -t "'" -k 2

 alias cdl='cd ~/dl'
diff --git a/config/extra/zathura/zathurarc b/config/extra/zathura/zathurarc
index f7a0781..478cd17 100644
--- a/config/extra/zathura/zathurarc
+++ b/config/extra/zathura/zathurarc
@@ -1,16 +1,14 @@
 # fullscreen mappings
 map   [fullscreen]              r            reload
 map   [fullscreen]              R            rotate
-map   [fullscreen]              +            zoom in
-map   [fullscreen]              -            zoom out
-map   [fullscreen]              i            recolor
+map   [fullscreen]              i            zoom in
+map   [fullscreen]              o            zoom out
 
 # normal mappings
 map   r                         reload
 map   R                         rotate
-map   +                         zoom in
-map   -                         zoom out
-map   i                         recolor
+map   i                         zoom in
+map   o                         zoom out
 
 set   font                      "monospace bold 11"
 set   adjust-open               "best-fit"
diff --git a/config/hyprland/hypr/screenshot.sh b/config/hyprland/hypr/screenshot.sh
deleted file mode 100755
index 694e099..0000000
--- a/config/hyprland/hypr/screenshot.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-dir="$(xdg-user-dir PICTURES)"
-dir="${dir:-$HOME/pics}/screenshots"
-date="$(date +%y%m%d_%H_%M_%S)"
-mkdir -p "$dir"
-
-case $1 in
-	"-m")
-		actwin="$(hyprctl activewindow -j | jq -r '.monitor')"
-		actmon="$(hyprctl monitors -j |
-			jq -r ".[] | select(.id == $actwin)" |
-			jq -r '.name')" 
-		grim -o "$actmon" "$dir/${date}_mon.png"
-		;;
-	"-f")
-		grim "$dir/${date}_full.png"
-		;;
-	"-s")
-		grim -g "$(slurp)" "$dir/${date}_sel.png"
-		;;
-	"-sc")
-		grim -g "$(slurp)" - | wl-copy
-		;;
-	*)
-		exit
-		;;
-esac
diff --git a/config/hyprland/waybar/style.css b/config/hyprland/waybar/style.css
deleted file mode 120000
index ba2f50f..0000000
--- a/config/hyprland/waybar/style.css
+++ /dev/null
@@ -1 +0,0 @@
-schemes/base16.css
\ No newline at end of file
diff --git a/config/theme/mimeapps.list b/config/theme/mimeapps.list
deleted file mode 100644
index 20fdce3..0000000
--- a/config/theme/mimeapps.list
+++ /dev/null
@@ -1,164 +0,0 @@
-[Default Applications]
-inode/directory=kitty-open.desktop
-text/html=firefox.desktop
-text/xml=firefox.desktop
-application/xhtml+xml=firefox.desktop
-application/vnd.mozilla.xul+xml=firefox.desktop
-text/mml=firefox.desktop
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-application/x-xpinstall=firefox.desktop
-application/pdf=org.pwmt.zathura-pdf-poppler.desktop
-application/json=firefox.desktop
-application/ogg=mpv.desktop
-application/x-ogg=mpv.desktop
-application/mxf=mpv.desktop
-application/sdp=mpv.desktop
-application/smil=mpv.desktop
-application/x-smil=mpv.desktop
-application/streamingmedia=mpv.desktop
-application/x-streamingmedia=mpv.desktop
-application/vnd.rn-realmedia=mpv.desktop
-application/vnd.rn-realmedia-vbr=mpv.desktop
-audio/aac=mpv.desktop
-audio/x-aac=mpv.desktop
-audio/vnd.dolby.heaac.1=mpv.desktop
-audio/vnd.dolby.heaac.2=mpv.desktop
-audio/aiff=mpv.desktop
-audio/x-aiff=mpv.desktop
-audio/m4a=mpv.desktop
-audio/x-m4a=mpv.desktop
-application/x-extension-m4a=mpv.desktop
-audio/mp1=mpv.desktop
-audio/x-mp1=mpv.desktop
-audio/mp2=mpv.desktop
-audio/x-mp2=mpv.desktop
-audio/mp3=mpv.desktop
-audio/x-mp3=mpv.desktop
-audio/mpeg=mpv.desktop
-audio/mpeg2=mpv.desktop
-audio/mpeg3=mpv.desktop
-audio/mpegurl=mpv.desktop
-audio/x-mpegurl=mpv.desktop
-audio/mpg=mpv.desktop
-audio/x-mpg=mpv.desktop
-audio/rn-mpeg=mpv.desktop
-audio/musepack=mpv.desktop
-audio/x-musepack=mpv.desktop
-audio/ogg=mpv.desktop
-audio/scpls=mpv.desktop
-audio/x-scpls=mpv.desktop
-audio/vnd.rn-realaudio=mpv.desktop
-audio/wav=mpv.desktop
-audio/x-pn-wav=mpv.desktop
-audio/x-pn-windows-pcm=mpv.desktop
-audio/x-realaudio=mpv.desktop
-audio/x-pn-realaudio=mpv.desktop
-audio/x-ms-wma=mpv.desktop
-audio/x-pls=mpv.desktop
-audio/x-wav=mpv.desktop
-video/mpeg=mpv.desktop
-video/x-mpeg2=mpv.desktop
-video/x-mpeg3=mpv.desktop
-video/mp4v-es=mpv.desktop
-video/x-m4v=mpv.desktop
-video/mp4=mpv.desktop
-application/x-extension-mp4=mpv.desktop
-video/divx=mpv.desktop
-video/vnd.divx=mpv.desktop
-video/msvideo=mpv.desktop
-video/x-msvideo=mpv.desktop
-video/ogg=mpv.desktop
-video/quicktime=mpv.desktop
-video/vnd.rn-realvideo=mpv.desktop
-video/x-ms-afs=mpv.desktop
-video/x-ms-asf=mpv.desktop
-audio/x-ms-asf=mpv.desktop
-application/vnd.ms-asf=mpv.desktop
-video/x-ms-wmv=mpv.desktop
-video/x-ms-wmx=mpv.desktop
-video/x-ms-wvxvideo=mpv.desktop
-video/x-avi=mpv.desktop
-video/avi=mpv.desktop
-video/x-flic=mpv.desktop
-video/fli=mpv.desktop
-video/x-flc=mpv.desktop
-video/flv=mpv.desktop
-video/x-flv=mpv.desktop
-video/x-theora=mpv.desktop
-video/x-theora+ogg=mpv.desktop
-video/x-matroska=mpv.desktop
-video/mkv=mpv.desktop
-audio/x-matroska=mpv.desktop
-application/x-matroska=mpv.desktop
-video/webm=mpv.desktop
-audio/webm=mpv.desktop
-audio/vorbis=mpv.desktop
-audio/x-vorbis=mpv.desktop
-audio/x-vorbis+ogg=mpv.desktop
-video/x-ogm=mpv.desktop
-video/x-ogm+ogg=mpv.desktop
-application/x-ogm=mpv.desktop
-application/x-ogm-audio=mpv.desktop
-application/x-ogm-video=mpv.desktop
-application/x-shorten=mpv.desktop
-audio/x-shorten=mpv.desktop
-audio/x-ape=mpv.desktop
-audio/x-wavpack=mpv.desktop
-audio/x-tta=mpv.desktop
-audio/AMR=mpv.desktop
-audio/ac3=mpv.desktop
-audio/eac3=mpv.desktop
-audio/amr-wb=mpv.desktop
-video/mp2t=mpv.desktop
-audio/flac=mpv.desktop
-audio/mp4=mpv.desktop
-application/x-mpegurl=mpv.desktop
-video/vnd.mpegurl=mpv.desktop
-application/vnd.apple.mpegurl=mpv.desktop
-audio/x-pn-au=mpv.desktop
-video/3gp=mpv.desktop
-video/3gpp=mpv.desktop
-video/3gpp2=mpv.desktop
-audio/3gpp=mpv.desktop
-audio/3gpp2=mpv.desktop
-video/dv=mpv.desktop
-audio/dv=mpv.desktop
-audio/opus=mpv.desktop
-audio/vnd.dts=mpv.desktop
-audio/vnd.dts.hd=mpv.desktop
-audio/x-adpcm=mpv.desktop
-application/x-cue=mpv.desktop
-audio/m3u=mpv.desktop
-text/english=nvim.desktop
-text/plain=nvim.desktop
-text/x-makefile=nvim.desktop
-text/x-c++hdr=nvim.desktop
-text/x-c++src=nvim.desktop
-text/x-chdr=nvim.desktop
-text/x-csrc=nvim.desktop
-text/x-java=nvim.desktop
-text/x-moc=nvim.desktop
-text/x-pascal=nvim.desktop
-text/x-tcl=nvim.desktop
-text/x-tex=nvim.desktop
-application/x-shellscript=nvim.desktop
-text/x-c=nvim.desktop
-text/x-c++=nvim.desktop
-image/bmp=imv.desktop
-image/gif=imv.desktop
-image/jpeg=imv.desktop
-image/jpg=imv.desktop
-image/pjpeg=imv.desktop
-image/png=imv.desktop
-image/tiff=imv.desktop
-image/x-bmp=imv.desktop
-image/x-pcx=imv.desktop
-image/x-png=imv.desktop
-image/x-portable-anymap=imv.desktop
-image/x-portable-bitmap=imv.desktop
-image/x-portable-graymap=imv.desktop
-image/x-portable-pixmap=imv.desktop
-image/x-tga=imv.desktop
-image/x-xbitmap=imv.desktop
-image/heif=imv.desktop
diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh
new file mode 100755
index 0000000..f38f1ab
--- /dev/null
+++ b/config/wayland/dwl/startup.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+swaybg -i ~/pics/wallpaper &
+dwl-bar &
+dwlblocks &
+gammastep &
+wl-paste --watch cliphist store &
+keyadd id_rsa &
+swayidle 300 locker &
+mako &
+$TERMINAL -e tmux a || $TERMINAL tmux &
diff --git a/config/wayland/foot/colors b/config/wayland/foot/colors
new file mode 120000
index 0000000..c813fa1
--- /dev/null
+++ b/config/wayland/foot/colors
@@ -0,0 +1 @@
+/usr/share/foot/themes/nord
\ No newline at end of file
diff --git a/config/hyprland/foot/foot.ini b/config/wayland/foot/foot.ini
index a1fc1e8..00e7a37 100644
--- a/config/hyprland/foot/foot.ini
+++ b/config/wayland/foot/foot.ini
@@ -9,7 +9,7 @@ term=xterm-256color
 title=""
 # locked-title=no
 
-font=monospace:size=10.5
+font=monospace:size=11
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
diff --git a/config/hyprland/gammastep/config.ini b/config/wayland/gammastep/config.ini
index 3a80417..3a80417 100644
--- a/config/hyprland/gammastep/config.ini
+++ b/config/wayland/gammastep/config.ini
diff --git a/config/hyprland/hypr/binds.conf b/config/wayland/hypr/binds.conf
index 9219f84..132ce3d 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/wayland/hypr/binds.conf
@@ -77,10 +77,8 @@ bind = $mainMod, D, exec, discord
 bind = , D, exec, discord
 bind = $mainMod, B, exec, $BROWSER
 bind = , B, exec, $BROWSER
-bind = $mainMod, G, exec, lutris
-bind = , G, exec, lutris
-bind = $mainMod, M, exec, mclaunch
-bind = , M, exec, mclaunch
+bind = $mainMod, G, exec, gml
+bind = , G, exec, gml
 source = ./reset-submap.conf
 submap = reset
 
@@ -105,8 +103,8 @@ bind = $mainMod, E, exec, memoji
 bind =, E, exec, memoji
 bind = $mainMod, F, exec, dmfm
 bind =, F, exec, dmfm
-bind = $mainMod, G, exec, mpassgen
-bind =, G, exec, mpassgen
+bind = $mainMod, G, exec, mpwgen
+bind =, G, exec, mpwgen
 bind = $mainMod, H, exec, mhelp
 bind =, H, exec, mhelp
 bind = $mainMod, I, exec, mapimg
@@ -138,7 +136,7 @@ bind =, XF86AudioPrev, exec, mpc prev
 bind =, XF86MonBrightnessUp, exec, light -A 5
 bind =, XF86MonBrightnessDown, exec, light -U 5
 
-bind = $mainMod SHIFT, B, exec, killall waybar; waybar
+bind = $mainMod SHIFT, B, exec, killall -USR1 waybar
 
 bind = $mainMod ALT, S, exec, $HOME/.config/hypr/screenshot.sh -m
 bind = $mainMod SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -sc
diff --git a/config/hyprland/hypr/env.conf b/config/wayland/hypr/env.conf
index 5c4f56a..5c4f56a 100644
--- a/config/hyprland/hypr/env.conf
+++ b/config/wayland/hypr/env.conf
diff --git a/config/hyprland/hypr/hyprland.conf b/config/wayland/hypr/hyprland.conf
index ed932e0..9eb0549 100644
--- a/config/hyprland/hypr/hyprland.conf
+++ b/config/wayland/hypr/hyprland.conf
@@ -85,10 +85,10 @@ gestures {
 }
 
 windowrulev2 = noanim, class:^(.*[Pp]inentry.*)$
-windowrulev2 = float, class:^(.*[Pp]inentry.*)$
-windowrulev2 = float, class:^(feh|imv)$
+
+windowrulev2 = float, class:feh|imv|$(.*[pP]inentry.*)$
+
 windowrulev2 = noanim, class:dmenu
-windowrulev2 = float, class:^(imv)$
 
 layerrule = noanim, launcher
 
diff --git a/config/hyprland/hypr/reset-submap.conf b/config/wayland/hypr/reset-submap.conf
index d10ac3b..d10ac3b 100644
--- a/config/hyprland/hypr/reset-submap.conf
+++ b/config/wayland/hypr/reset-submap.conf
diff --git a/config/wayland/hypr/screenshot.sh b/config/wayland/hypr/screenshot.sh
new file mode 100755
index 0000000..716ccdd
--- /dev/null
+++ b/config/wayland/hypr/screenshot.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+dir="$(xdg-user-dir PICTURES)"
+dir="${dir:-$HOME/pics}/screenshots"
+date="$(date +%y%m%d_%H_%M_%S)"
+mkdir -p "$dir"
+
+case $1 in
+	"-m") grim -o "$(hyprctl monitors -j |
+			jq -r ".[] | select(.id == $(hyrctl activewindow -j | jq -r '.monitor'))" |
+			jq -r '.name')" "$dir/${date}_mon.png" ;;
+	"-f") grim "$dir/${date}_full.png" ;;
+	"-s") grim -g "$(slurp)" "$dir/${date}_sel.png" ;;
+	"-sc") grim -g "$(slurp)" - | wl-copy ;;
+	*) exit ;;
+esac
diff --git a/config/hyprland/hypr/startup.sh b/config/wayland/hypr/startup.sh
index 8887cf2..4b65908 100755
--- a/config/hyprland/hypr/startup.sh
+++ b/config/wayland/hypr/startup.sh
@@ -5,4 +5,5 @@ gammastep &
 wl-paste --watch cliphist store &
 keyadd id_rsa &
 swayidle 300 locker &
+mako &
 $TERMINAL -e tmux a || $TERMINAL tmux &
diff --git a/config/wayland/mako/config b/config/wayland/mako/config
new file mode 100644
index 0000000..2df4b1d
--- /dev/null
+++ b/config/wayland/mako/config
@@ -0,0 +1,25 @@
+sort=-time
+layer=overlay
+background-color=#2e3440e5
+border-size=2
+border-color=#88c0d0
+border-radius=5
+icons=0
+default-timeout=1000
+font=monospace 10
+format=<u><b>%s</b></u>\n\n%b
+padding=7
+
+[urgency=low]
+border-color=#0087bd
+
+[urgency=normal]
+border-color=#5e81ac
+
+[urgency=high]
+border-color=#bf616a
+default-timeout=0
+
+[category=mpd]
+default-timeout=2000
+group-by=category
diff --git a/config/wayland/tofi/config b/config/wayland/tofi/config
new file mode 120000
index 0000000..845f2a4
--- /dev/null
+++ b/config/wayland/tofi/config
@@ -0,0 +1 @@
+/home/aluc/.config/tofi/themes/nord
\ No newline at end of file
diff --git a/config/hyprland/tofi/themes/base16 b/config/wayland/tofi/themes/base16
index b18efb4..b18efb4 100644
--- a/config/hyprland/tofi/themes/base16
+++ b/config/wayland/tofi/themes/base16
diff --git a/config/wayland/tofi/themes/colors b/config/wayland/tofi/themes/colors
new file mode 100644
index 0000000..66edd5b
--- /dev/null
+++ b/config/wayland/tofi/themes/colors
@@ -0,0 +1,14 @@
+# tofi
+text-color = #e9e3cb
+prompt-color = #ADAB92
+placeholder-color = #ADAB92
+input-color = #e9e3cb
+default-result-color = #E9D68C
+selection-color = #a39e8e
+selection-match-color = #e9e3cb
+
+background-color = #372318f0
+
+outline-color = #ADAB92
+
+border-color = #E9D68C
diff --git a/config/hyprland/tofi/themes/config b/config/wayland/tofi/themes/config
index 953d912..953d912 120000
--- a/config/hyprland/tofi/themes/config
+++ b/config/wayland/tofi/themes/config
diff --git a/config/hyprland/tofi/themes/dark-paper b/config/wayland/tofi/themes/dark-paper
index c58b292..c58b292 100644
--- a/config/hyprland/tofi/themes/dark-paper
+++ b/config/wayland/tofi/themes/dark-paper
diff --git a/config/hyprland/tofi/themes/dmenu b/config/wayland/tofi/themes/dmenu
index 55a23d9..55a23d9 100644
--- a/config/hyprland/tofi/themes/dmenu
+++ b/config/wayland/tofi/themes/dmenu
diff --git a/config/hyprland/tofi/themes/dos b/config/wayland/tofi/themes/dos
index 7c2fff5..7c2fff5 100644
--- a/config/hyprland/tofi/themes/dos
+++ b/config/wayland/tofi/themes/dos
diff --git a/config/hyprland/tofi/themes/fullscreen b/config/wayland/tofi/themes/fullscreen
index aa3a2cd..aa3a2cd 100644
--- a/config/hyprland/tofi/themes/fullscreen
+++ b/config/wayland/tofi/themes/fullscreen
diff --git a/config/hyprland/tofi/themes/nord b/config/wayland/tofi/themes/nord
index c8a6192..c8a6192 100644
--- a/config/hyprland/tofi/themes/nord
+++ b/config/wayland/tofi/themes/nord
diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
new file mode 120000
index 0000000..95d200a
--- /dev/null
+++ b/config/wayland/waybar/config.jsonc
@@ -0,0 +1 @@
+configs/dwm.jsonc
\ No newline at end of file
diff --git a/config/wayland/waybar/configs/dwm.jsonc b/config/wayland/waybar/configs/dwm.jsonc
new file mode 100644
index 0000000..211f776
--- /dev/null
+++ b/config/wayland/waybar/configs/dwm.jsonc
@@ -0,0 +1,16 @@
+{
+	"modules-left": ["hyprland/workspaces", "custom/layout", "hyprland/window"],
+	"modules-right": ["custom/status"],
+	"hyprland/window": {
+		"format": " {} "
+	},
+	"custom/layout": { 
+		"format": " []= ",
+		"interval": "once",
+	},
+	"custom/status": { 
+		"exec": "~/.config/waybar/scripts/status.sh",
+		"format": " {} ",
+		"interval": 1
+	}
+}
diff --git a/config/hyprland/waybar/config.jsonc b/config/wayland/waybar/configs/hyprland.jsonc
index 4c95c25..cd24d14 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/wayland/waybar/configs/hyprland.jsonc
@@ -2,7 +2,7 @@
 	"layer": "top",
 	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
 	"modules-center": ["clock"],
-	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "bluetooth", "tray"],
+	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "custom/bluetooth", "tray"],
 	"mpd": {
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
@@ -67,14 +67,10 @@
 		"format-alt": "{:(%T) %A %d %B}",
 		"interval": 1,
 	},
-	"bluetooth": {
+	"custom/bluetooth": {
+		"exec": "bluetoothctl info",
 		"format": "",
-		"format-disabled": "",
-		"format-connected": "",
-		"format-on": "",
-		"tooltip-format": "{controller_alias}\t{controller_address}",
-		"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}",
-		"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}"
+		"interval": 3,
 	},
 	"tray": {
 		"spacing": 5,
diff --git a/config/wayland/waybar/scripts/status.sh b/config/wayland/waybar/scripts/status.sh
new file mode 100755
index 0000000..3b658e5
--- /dev/null
+++ b/config/wayland/waybar/scripts/status.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+printf 'Hyprland %s' "$(expac %v hyprland)"
diff --git a/config/wayland/waybar/style.css b/config/wayland/waybar/style.css
new file mode 120000
index 0000000..4d2790d
--- /dev/null
+++ b/config/wayland/waybar/style.css
@@ -0,0 +1 @@
+styles/dwm.css
\ No newline at end of file
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/wayland/waybar/styles/base16.css
index b32d3df..c9e3170 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/wayland/waybar/styles/base16.css
@@ -10,7 +10,7 @@
 /* https://github.com/jakehamilton/dotfiles */
 /* Amazing I love it :))) */
 
-@import "colors.css";
+@import "styles/colors/colors.css";
 
 * {
 	border: none;
@@ -54,9 +54,9 @@ window#waybar.PCSX2 #window {
 	margin-left: 3px;
 }
 
-#workspaces, #mpd, #battery, 
+#workspaces, #tags, #mpd, #battery, 
 #clock,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #bluetooth, #tray {
+#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
 	border: solid @background;
 	border-width: 2px 2px 2px 0;
 	margin-top: 4px;
@@ -73,26 +73,38 @@ window#waybar.PCSX2 #window {
 	margin-right: 16px;
 }
 
-#workspaces {
+#workspaces, #tags {
 	border: solid @background 2px;
 	background: @color3;
 }
 
-#workspaces button {
+#workspaces button, #tags button {
 	transition: none;
 	background: transparent;
 	color: @background;
 }
 
-#workspaces button.active {
-	text-shadow: 0px 1px 0px @color1;
+#tags button.occupied {
+	background: @color2;
 }
 
-#workspaces button:hover {
+#workspaces button.active, #tags button.focused {
+	background-color: @color6;
+	border-bottom: 6px solid @color4;
+
+}
+
+#workspaces button:hover, #tags button:hover {
 	transition: none;
 	color: @color8;
 }
 
+#tags button {
+	margin: 0;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
 #mpd {
 	color: @background;
 	padding: 0 16px;
@@ -152,7 +164,7 @@ window#waybar.PCSX2 #window {
 	background: @color5;
 }
 
-#bluetooth {
+#custom-bluetooth {
 	color: @color6;
 	background: @color8;
 }
diff --git a/config/hyprland/waybar/colors/colors-nord b/config/wayland/waybar/styles/colors/colors-nord
index 9622792..9622792 100644
--- a/config/hyprland/waybar/colors/colors-nord
+++ b/config/wayland/waybar/styles/colors/colors-nord
diff --git a/config/wayland/waybar/styles/colors/colors.css b/config/wayland/waybar/styles/colors/colors.css
new file mode 120000
index 0000000..801cf92
--- /dev/null
+++ b/config/wayland/waybar/styles/colors/colors.css
@@ -0,0 +1 @@
+colors-nord
\ No newline at end of file
diff --git a/config/wayland/waybar/styles/dwm.css b/config/wayland/waybar/styles/dwm.css
new file mode 100644
index 0000000..31eacf0
--- /dev/null
+++ b/config/wayland/waybar/styles/dwm.css
@@ -0,0 +1,20 @@
+* {
+	border: none;
+	border-radius: 0;
+	font-family: monospace;
+	font-size: 14px;
+	min-height: 16px;
+}
+
+window#waybar, #workspaces button.active  {
+	background-color: #4c566a;
+}
+
+#workspaces button, #custom-layout, #custom-status {
+	background-color: #2e3440;
+}
+
+#workspaces button {
+	padding: 0 2px;
+	margin: 0;
+}
diff --git a/config/hyprland/waybar/schemes/nord.css b/config/wayland/waybar/styles/nord.css
index efd0e81..efd0e81 100644
--- a/config/hyprland/waybar/schemes/nord.css
+++ b/config/wayland/waybar/styles/nord.css
diff --git a/stowdots b/stowdots
index b16c572..918a76c 100755
--- a/stowdots
+++ b/stowdots
@@ -34,7 +34,7 @@ cd "$(dirname "$(realpath "$0")")" || exit 1
 case "$MACH" in
 	"desktop" | "d" | "laptop" | "l")
 		stow -d bin/ -t "$HOME/bin" -R common guiscripts menuscripts extra
-		stow -d config/ -t "$HOME/.config" -R essentials common extra X theme hyprland
+		stow -d config/ -t "$HOME/.config" -R essentials common extra X theme wayland
 		stow -d config/ -t "$HOME/" -R home
 		;;
 	"server" | "s")