Merge branch 'main' of db:dotfiles

37 files changed, 606 insertions, 94 deletions

diff --git a/.gitignore b/.gitignore
index 4e42516..958754b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 config/essentials/zsh/.zcompdump
 config/essentials/zsh/histfile
 config/essentials/gnupg/*
-config/X/mpv/watch_later/*
+config/common/mpv/watch_later/*
+config/common/mpv/playfile.txt
 config/common/mpd/database
 config/essentials/nvim/plugin/
 config/common/newsboat/urls
+config/extra/jftui/settings
diff --git a/bin/extra/1xsearch b/bin/extra/1xsearch
new file mode 100755
index 0000000..a248d38
--- /dev/null
+++ b/bin/extra/1xsearch
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# dependencies
+which pup > /dev/null ||
+	exit 1
+
+test -z "${query:=$1}" && 
+	query="$(cat /dev/stdin)"
+
+url="https://1337x.to"
+query="$(echo "$query" | tr ' ' '+' )"
+result="$(curl -s "$url/search/$query/1/" |
+	pup -p 'a attr{href}' |
+	grep "^/torrent" | 
+	head -n 1)"
+# result contains / as first char
+curl -s "$url$result" |
+	pup -p 'a attr{href}' |
+	grep "^magnet:" |
+	head -n 1
diff --git a/bin/guiscripts/dmapimg b/bin/guiscripts/dmapimg
index 3677ed3..151b8d0 100755
--- a/bin/guiscripts/dmapimg
+++ b/bin/guiscripts/dmapimg
@@ -1,7 +1,17 @@
 #!/bin/sh
-dest="$XDG_DATA_HOME"/appimages/
-appimage="$(\
-  find "$dest" -type f -printf "%f\n" \
-  | sed 's/\.[Aa]pp[Ii]mage$//g' \
-  | dmenu -x -l 10 -g 1 -p "AppImage:")"
-setsid "${dest}/${appimage:-NOSEL}"*
+
+if [ -z "$MENUCMD" ]
+then
+	menucmd="fzf"
+elif [ "$MENUCMD" = "tofi" ]
+then
+	menucmd='tofi --width 700 --height 300 --prompt-text Appimage:'
+else
+	menucmd="dmenu -x -l 10 -g 1 -p Appimage:"
+fi
+
+dest="$XDG_DATA_HOME"/appimages
+appimage="$(find "$dest" -type f -printf "%f\n" |
+	sed 's/\.[Aa]pp[Ii]mage$//g' |
+	$menucmd)"
+setsid "$dest/${appimage:-NOSEL}"*
diff --git a/bin/guiscripts/dmclip b/bin/guiscripts/dmclip
index a1ca634..cd5c928 100755
--- a/bin/guiscripts/dmclip
+++ b/bin/guiscripts/dmclip
@@ -11,16 +11,16 @@ NotImage () {
 
 selection="$(echo "primary\nclipboard\nswap" | 
 	dmenu -l 1 -g 3 -p "selection:")"
-if [[ "$selection" == "swap" ]]
+if [ "$selection" = "swap" ]
 then
     clipboard="$(xclip -o)"
     xclip -o | xclip -sel c
     echo -n "$clipboard" | xclip -sel c
     exit
-elif [ "$selection" == "" ]
+elif [ "$selection" = "" ]
 then
     exit 1
-elif  [ "$selection" == "primary" ]
+elif  [ "$selection" = "primary" ]
 then
     selection2="clipboard"
 else
diff --git a/bin/guiscripts/dmpassgen b/bin/guiscripts/dmpassgen
index d193998..a60112b 100755
--- a/bin/guiscripts/dmpassgen
+++ b/bin/guiscripts/dmpassgen
@@ -1,17 +1,44 @@
 #!/usr/bin/env sh
-choice="$(echo "multiline\nsingle" | dmenu -l 1 -g 2)"
+
+input ()
+{
+	# menu prompt for output
+	if [ "$MENUCMD" = "tofi" ]
+	then
+		inp="$(tofi --prompt-text "$1 " </dev/null)"
+	elif [ "$MENUCMD" = "dmenu" ]
+	then
+		inp="$(dmenu -p "$1" < /dev/null)"
+	else
+		echo -n "$1:" >&2
+		read inp
+	fi
+	echo $inp
+}
+# menu select long
+if [ "$MENUCMD" = "tofi" ]
+then
+	menucmd="tofi --prompt login:"
+elif [ "$MENUCMD" = "dmenu" ]
+then
+	menucmd="dmenu -l 10 -g 1 -x -i -p login:" 
+else
+	menucmd="fzf"
+fi
+
+choice="$(echo "multiline\nsingle" | $MENUCMD)"
 test -z "${choice}" && exit 1
 
-password="$(dmenu -p "name:" </dev/null)"
+password="$(input "name:")"
 test -z "${password}" && exit 1
 
 if [ "${choice}" = "multiline" ]
 then
 	login="$(ls -1 ~/.password-store/e-mails |
 		sed 's/\.gpg$//' | 
-		dmenu -g 1 -l 8 -p "login:")"
+		$menucmd)"
     test -z "${login}" && exit 1
-    url="$(dmenu -p "url:" </dev/null)"
+    url="$(input "url:")"
     test -z "${url}" && exit 1
     echo "${password}\nlogin: ${login}\nurl: ${url}" |
 		pass insert -mf "${password}"
@@ -19,4 +46,3 @@ then
 else
     pass generate -cf "${password}"
 fi
-
diff --git a/bin/guiscripts/dmpdf b/bin/guiscripts/dmpdf
index e8d4601..56356d7 100755
--- a/bin/guiscripts/dmpdf
+++ b/bin/guiscripts/dmpdf
@@ -6,9 +6,10 @@ choice="$(\
         sed 's|^/home/aluc|\~| ; s|\([^/]\)[^/]*/|\1/|g' "$tmp" | 
 		awk '{printf "%s %s\n", NR ":", $0}' | 
 		dmenu -p "pdf:" -l 10 -g 1 -x -i | 
-		grep -oE "^[0-9]+:")"
+		grep -oE "^[0-9]+:" |
+		cut -f1 -d:)"
 if [ -z "$choice" ]; then
 	exit
 fi
-file="$(sed -n "${choice::-1}p" "$tmp")"
+file="$(sed -n "${choice}p" "$tmp")"
 zathura "$file" &
diff --git a/bin/guiscripts/dmvid b/bin/guiscripts/dmvid
index 23e2c56..a31a221 100755
--- a/bin/guiscripts/dmvid
+++ b/bin/guiscripts/dmvid
@@ -1,12 +1,24 @@
 #!/usr/bin/env sh
 
-find ${1:-~/vids ~/dl} 2> /dev/null |
+dirs="${1:-$HOME/vids $HOME/dl}"
+find -L $dirs 2> /dev/null |
 	grep ".\+\.\(webm\|mp4\|mpeg\|mkv\)$" |
 	sort > /tmp/dmvids
+cat /tmp/dmvids
+
+if [ "$MENUCMD" = "tofi" ]
+then
+	menucmd="tofi --width 30% --height 30%"
+elif [ "$MENUCMD" = "dmenu" ]
+then
+	menucmd="dmenu -l 10 -g 1 -x -i" 
+else
+	menucmd="fzf"
+fi
 
 choice="$(sed 's|^/home/aluc|\~| ; s|\([^/]\)[^/]*/|\1/|g' /tmp/dmvids | 
 	awk '{printf "%s %s\n", NR ":", $0}' | 
-	dmenu -l 10 -g 1 -x -i | 
+	$menucmd | 
 	cut -f 1 -d ':')"
 test -z "$choice" &&
 	exit 1
diff --git a/bin/guiscripts/dmvol b/bin/guiscripts/dmvol
deleted file mode 100755
index 8909de7..0000000
--- a/bin/guiscripts/dmvol
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-while true
-do 
-	volume="$(mpc volume | awk '{print $2}' | cut -f1 -d'%')"
-	choice="$(echo "plus\nmin" |
-		dmenu -g 2 -l 1 -p "$volume" |
-		sed 's/plus/+/;s/min/-/')"
-	test -z "$choice" && break
-	nb="$(dmenu -g 2 -l 1 -p "$volume$choice" < /dev/null)"
-	test -z "$nb" && break
-	mpc volume "$choice$nb"
-done
diff --git a/bin/guiscripts/mmpcvol b/bin/guiscripts/mmpcvol
new file mode 100755
index 0000000..0f36e18
--- /dev/null
+++ b/bin/guiscripts/mmpcvol
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ "$MENUCMD" = "tofi" ]
+then
+	menucmd="tofi --width 5% --height 10% --prompt-text" 
+elif [ "$MENUCMD" = "dmenu" ]
+then
+	menucmd="dmenu -g 2 -l 1 -p"
+else
+	menucmd="fzf --prompt"
+fi
+
+while true
+do 
+	volume="$(mpc volume | awk '{print $2}' | cut -f1 -d'%')"
+	choice="$(echo "plus\nmin" |
+		$menucmd "$volume" |
+		sed 's/plus/+/;s/min/-/')"
+	test -z "$choice" && break
+	nb="$($menucmd "$volume$choice" < /dev/null)"
+	test -z "$nb" && break
+	mpc volume "$choice$nb"
+done
diff --git a/bin/guiscripts/mplay b/bin/guiscripts/mplay
new file mode 100755
index 0000000..4c991fa
--- /dev/null
+++ b/bin/guiscripts/mplay
@@ -0,0 +1,16 @@
+#!/bin/sh
+# menu select long
+if [ "$MENUCMD" = "tofi" ]
+then
+	menucmd="tofi --width 50% --height 30%"
+elif [ "$MENUCMD" = "dmenu" ]
+then
+	menucmd="dmenu -l 10 -g 1 -x -i" 
+else
+	menucmd="fzf"
+fi
+choice="$(mpc listall | $menucmd)"
+test -z "$choice" &&
+	exit 1
+mpc insert "$choice" &&
+	mpc next
diff --git a/config/X/mpv/playfile.txt b/config/X/mpv/playfile.txt
deleted file mode 100755
index 9cd1e1c..0000000
--- a/config/X/mpv/playfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-https://www.youtube.com/watch?v=0C6p5wQ5SwQ
-https://www.youtube.com/watch?v=aEWptdD32iA
diff --git a/config/X/mpv/watch_later/9EDC60703A9785FE514694A824A11563 b/config/X/mpv/watch_later/9EDC60703A9785FE514694A824A11563
deleted file mode 100644
index 8356b1e..0000000
--- a/config/X/mpv/watch_later/9EDC60703A9785FE514694A824A11563
+++ /dev/null
@@ -1,2 +0,0 @@
-start=9052.872000
-volume=45.000000
diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc
index 00fc41c..ea956af 100755
--- a/config/X/x11/xinitrc
+++ b/config/X/x11/xinitrc
@@ -29,6 +29,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  unset f
 fi
 
+export MENUCMD="dmenu"
 xcompmgr &
 feh --no-fehbg --bg-scale ~/pics/wallpaper
 setxkbmap -option ctrl:nocaps
diff --git a/config/X/alacritty/alacritty.yml b/config/common/alacritty/alacritty.yml
index e5664f1..e5664f1 100644
--- a/config/X/alacritty/alacritty.yml
+++ b/config/common/alacritty/alacritty.yml
diff --git a/config/X/mpv/input.conf b/config/common/mpv/input.conf
index 9de1b1b..9de1b1b 100644
--- a/config/X/mpv/input.conf
+++ b/config/common/mpv/input.conf
diff --git a/config/X/mpv/mpv.conf b/config/common/mpv/mpv.conf
index 4f5e251..4f5e251 100755
--- a/config/X/mpv/mpv.conf
+++ b/config/common/mpv/mpv.conf
diff --git a/config/X/mpv/scripts/script-opts/webm.conf b/config/common/mpv/scripts/script-opts/webm.conf
index 9ea44dd..9ea44dd 100644
--- a/config/X/mpv/scripts/script-opts/webm.conf
+++ b/config/common/mpv/scripts/script-opts/webm.conf
diff --git a/config/X/mpv/scripts/script-opts/youtube-quality.conf b/config/common/mpv/scripts/script-opts/youtube-quality.conf
index fc1361b..fc1361b 100755
--- a/config/X/mpv/scripts/script-opts/youtube-quality.conf
+++ b/config/common/mpv/scripts/script-opts/youtube-quality.conf
diff --git a/config/X/mpv/scripts/webm.lua b/config/common/mpv/scripts/webm.lua
index 4397b9b..4397b9b 100644
--- a/config/X/mpv/scripts/webm.lua
+++ b/config/common/mpv/scripts/webm.lua
diff --git a/config/X/mpv/scripts/youtube-quality.lua b/config/common/mpv/scripts/youtube-quality.lua
index 1331210..1331210 100755
--- a/config/X/mpv/scripts/youtube-quality.lua
+++ b/config/common/mpv/scripts/youtube-quality.lua
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 75e139b..df40b2f 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -138,7 +138,14 @@ ls.add_snippets("sh", {
 		echo "\$1" >&2
 	}
 	]], {}),
-	parse("die", "die \"$1\"$0", {}),
+	parse("die", "die \"I: $1\"$0", {}),
+	s("inp", fmt(
+	[[
+	test -z "${{{}:=$1}}" && 
+		{}="$(cat /dev/stdin)"
+	echo "{}: ${}" 1>&2{}
+	]],
+	{ i(1), rep(1), rep(1), rep(1), i(0) })),
 })
 
 ls.add_snippets("javascript", {
diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua
index 4b66c75..9290c29 100644
--- a/config/essentials/nvim/ftplugin/sh.lua
+++ b/config/essentials/nvim/ftplugin/sh.lua
@@ -1,3 +1,5 @@
-vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr><cmd>setlocal nohls<cr>")
-vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: ${\\2}\"<cr><cmd>setlocal nohls<cr>")
+vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr>")
+vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"<cr>")
+vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr><esc>A")
+vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"<cr><esc>A")
 vim.opt.formatoptions = "cqrnj"
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 30e1e2d..14f73c8 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -83,7 +83,7 @@ vim.keymap.set("n", "<Leader><C-s>", "<cmd>setlocal spell!<cr>", { noremap = tru
 -- 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 st"
+    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 })
diff --git a/config/essentials/nvim/templates/inp.sh b/config/essentials/nvim/templates/inp.sh
index ab04f7c..3507cd5 100644
--- a/config/essentials/nvim/templates/inp.sh
+++ b/config/essentials/nvim/templates/inp.sh
@@ -1,6 +1,3 @@
-#!/bin/sh
-
-test -z "${inp:=$1}" \
-	&& inp="$(cat /dev/stdin)"
-
+test -z "${inp:=$1}" && 
+	inp="$(cat /dev/stdin)"
 echo "inp: ${inp}" 1>&2
diff --git a/config/essentials/nvim/templates/minp.sh b/config/essentials/nvim/templates/minp.sh
new file mode 100644
index 0000000..d91d249
--- /dev/null
+++ b/config/essentials/nvim/templates/minp.sh
@@ -0,0 +1,9 @@
+if [ "$MENUCMD" ] && [ -z "${inp:=$1}" ]
+then
+	inp="$($MENUCMD < /dev/null)"
+else
+	echo "input:" >&2
+	read inp
+fi
+test -z "$inp" &&
+	exit 1
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 279c07b..afe1eb6 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -104,6 +104,7 @@ parse_git_status() {
 export REPORTTIME=2
 export TIMEFMT="-> %*E"
 alias time='/usr/bin/time'
+export MENUCMD='fzf'
 
 # Options
 setopt correct 
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index a632089..0b7b629 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -93,7 +93,7 @@ alias xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HD
 alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
  
 alias d='du -d 0 -h'
-alias dud='du * -d 0 -h 2>/dev/null | sort -h'
+alias dud='du .* * -d 0 -h 2>/dev/null | sort -h'
 alias df='df -h'
 alias shred='shred -uz'
 alias lsblk='lsblk -o name,type,fsused,size,fstype,label,mountpoint'
@@ -101,6 +101,7 @@ alias floc='doas find / -type "f" 2> /dev/null | grep'
 alias dloc='doas find / -type "d" 2> /dev/null | grep'
 alias fif='find . -type "f" | grep'
 alias fid='find . -type "d" | grep'
+alias sxt='sxiv -t'
 
 # ssh
 alias sha='ssh-add'
@@ -128,10 +129,16 @@ alias -g sba='source env/bin/activate || source bin/activate'
 alias -g smc='systemctl'
 alias smcu='systemctl --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
+alias rh='rehash'
 alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
 
+alias vbm='vboxmanage'
+alias vbls='vbm list vms'
+alias vblsr='vbm list runningvms'
+alias vb='vbm startvm'
+
 # quick config
 alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
 alias eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
@@ -145,11 +152,19 @@ alias est='$EDITOR ~/src/st/config.def.h'
 alias esl='$EDITOR ~/src/slock/config.def.h'
 alias esls='$EDITOR ~/src/slstatus/config.def.h'
 alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
-# quick cd
 alias cfd='$EDITOR config.def.h'
+# quick cd
 alias cds='cd $HOME/src/'
+alias cdw='cd $HOME/src/dwm'
+alias cddm='cd $HOME/src/dmenu'
+alias cdslo='cd $HOME/src/slock'
+alias cdsl='cd $HOME/src/slstatus'
+alias cdst='cd $HOME/src/st'
+alias cdsta='cd $HOME/src/stable-diffusion-webui'
 alias cdo='cd $HOME/src/dotfiles'
 alias cdi='cd $HOME/src/installdrier'
+alias cdia='cd $HOME/src/installdrier/arch'
+alias cdib='cd $HOME/src/installdrier/deb'
 alias cdm='cd $HOME/music'
 alias cdd='cd $HOME/dl'
 alias cdrs='cd /srv/'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index f21ce9b..fefc125 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -79,10 +79,10 @@ esc () {
 }
 
 delfile () {
-	curl ${2:-"https://upfast.craftmenners.men/delete/$1"}
+	curl ${2:-"https://up.kallipso.be/delete/$1"}
 }
 upfile () {
-	curl -F "file=@\"$1\"" ${2:-"https://upfast.craftmenners.men"}
+	curl -F "file=@\"$1\"" ${2:-"https://up.kallipso.be"}
 }
 
 sgd () {
diff --git a/config/extra/jftui/input.conf b/config/extra/jftui/input.conf
new file mode 120000
index 0000000..dd02820
--- /dev/null
+++ b/config/extra/jftui/input.conf
@@ -0,0 +1 @@
+/home/aluc/src/dotfiles/config/common/mpv/input.conf
\ No newline at end of file
diff --git a/config/extra/jftui/mpv.conf b/config/extra/jftui/mpv.conf
new file mode 120000
index 0000000..55c1286
--- /dev/null
+++ b/config/extra/jftui/mpv.conf
@@ -0,0 +1 @@
+/home/aluc/src/dotfiles/config/common/mpv/mpv.conf
\ No newline at end of file
diff --git a/config/home/.zshenv b/config/home/.zshenv
index 9fd39fa..d2290b9 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -21,15 +21,8 @@ export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
 export NVM_DIR="$XDG_DATA_HOME/nvm"
 export W3M_DIR="$XDG_STATE_HOME"/w3m
 
-if [ -n  "$WAYLAND_DISPLAY" ]
-then
-	export TERMINAL="foot"
-	export MENUCMD="tofi"
-else
-	export TERMINAL="dmenu"
-	export XINITRC="$XDG_CONFIG_HOME/x11"/xinitrc
-	export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
-fi
+export XINITRC="$XDG_CONFIG_HOME/x11"/xinitrc
+export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
 
 export ZDOTDIR="$XDG_CONFIG_HOME"/zsh
 export HISTFILE="$ZDOTDIR"/histfile
@@ -43,6 +36,7 @@ export QT_QPA_PLATFORMTHEME="qt5ct"
 
 # export _JAVA_AWT_WM_NONREPARENTING=1
 # export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+# export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on'
 
 export PASSWORD_STORE_CLIP_TIME=5
 
diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index 05355ce..459080e 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -72,55 +72,44 @@ bindm = $mainMod, mouse:273, resizewindow
 
 bind = $mainMod, M, submap, menuscripts
 submap = menuscripts
-bind =, A, exec, dmapimg
+bind =, A, exec, dmask
 bind =, C, exec, dmclip
 bind =, D, exec, dmdsktp
+bind =, E, exec, dmemoji
 bind =, F, exec, dmfm
-bind =, G, exec, passgen
+bind =, G, exec, dmpassgen
 bind =, H, exec, dmhelp
+bind =, I, exec, dmapimg
 bind =, L, exec, dmlang
 bind =, M, exec, dmpass
 bind =, P, exec, dmpdf
 bind =, O, exec, dmpower
+bind =, U, exec, dmcurs
 bind =, V, exec, dmvid
-bind =, A, submap, reset
-bind =, C, submap, reset
-bind =, D, submap, reset
-bind =, F, submap, reset
-bind =, G, submap, reset
-bind =, H, submap, reset
-bind =, L, submap, reset
-bind =, M, submap, reset
-bind =, P, submap, reset
-bind =, O, submap, reset
-bind =, V, submap, reset
-bind = $mainMod, A, exec, dmapimg
+bind = $mainMod, A, exec, dmask
 bind = $mainMod, C, exec, dmclip
 bind = $mainMod, D, exec, dmdsktp
+bind = $mainMod, E, exec, dmemoji
 bind = $mainMod, F, exec, dmfm
-bind = $mainMod, G, exec, passgen
+bind = $mainMod, G, exec, dmpassgen
 bind = $mainMod, H, exec, dmhelp
+bind = $mainMod, I, exec, dmapimg
 bind = $mainMod, L, exec, dmlang
 bind = $mainMod, M, exec, dmpass
 bind = $mainMod, P, exec, dmpdf
 bind = $mainMod, O, exec, dmpower
+bind = $mainMod, U, exec, dmcurs
 bind = $mainMod, V, exec, dmvid
-bind = $mainMod, A, submap, reset
-bind = $mainMod, C, submap, reset
-bind = $mainMod, D, submap, reset
-bind = $mainMod, F, submap, reset
-bind = $mainMod, G, submap, reset
-bind = $mainMod, H, submap, reset
-bind = $mainMod, L, submap, reset
-bind = $mainMod, M, submap, reset
-bind = $mainMod, P, submap, reset
-bind = $mainMod, O, submap, reset
-bind = $mainMod, V, submap, reset
+source = ./reset-submap.conf
+source = ./reset-submap.conf
 submap = reset
 
 bind =, XF86AudioLowerVolume, exec, pamixer -d 5
 bind =, XF86AudioRaiseVolume, exec, pamixer -i 5
 bind =, XF86AudioMute, exec, pamixer -t
+bind =, XF86AudioPlay, exec, mpc toggle
+bind =, XF86AudioNext, exec, mpc next
+bind =, XF86AudioPrev, exec, mpc prev
 
 bind = $mainMod SHIFT, B, exec, killall waybar; waybar
 
diff --git a/config/hyprland/hypr/env.conf b/config/hyprland/hypr/env.conf
index 162c911..f7ff6b9 100644
--- a/config/hyprland/hypr/env.conf
+++ b/config/hyprland/hypr/env.conf
@@ -26,6 +26,9 @@ env = SDL_IM_MODULE,fcitx
 env = SDL_VIDEODRIVER,wayland
 env = CLUTTER_BACKEND,wayland
 
+env = TERMINAL,foot
+env = MENUCMD,tofi
+
 # # nvidia
 # env = LIBVA_DRIVER_NAME,nvidia
 # env = XDG_SESSION_TYPE,wayland
diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf
index c1ba96c..e7048ae 100644
--- a/config/hyprland/hypr/hyprland.conf
+++ b/config/hyprland/hypr/hyprland.conf
@@ -1,8 +1,8 @@
-monitor=HDMI-A-1, 1920x1080, 0x0, 1
+monitor=HDMI-A-4, 1920x1080, 0x0, 1
 monitor=VGA-1, 1920x1080, 1920x0, 1
 monitor=,preferred,auto,1
 
-source = ~/.config/hypr/env.conf
+source = ./env.conf
 
 exec-once = gammastep & waybar
 exec-once = swaybg -i ~/pics/wallpaper
@@ -87,4 +87,4 @@ windowrulev2 = noanim, class:dmenu
 
 layerrule = noanim, launcher
 
-source = ~/.config/hypr/binds.conf
+source = ./binds.conf
diff --git a/config/hyprland/hypr/reset-submap.conf b/config/hyprland/hypr/reset-submap.conf
new file mode 100644
index 0000000..d10ac3b
--- /dev/null
+++ b/config/hyprland/hypr/reset-submap.conf
@@ -0,0 +1,398 @@
+bind = , A, submap, reset
+bind = , B, submap, reset
+bind = , C, submap, reset
+bind = , D, submap, reset
+bind = , E, submap, reset
+bind = , F, submap, reset
+bind = , G, submap, reset
+bind = , H, submap, reset
+bind = , I, submap, reset
+bind = , J, submap, reset
+bind = , K, submap, reset
+bind = , L, submap, reset
+bind = , M, submap, reset
+bind = , N, submap, reset
+bind = , O, submap, reset
+bind = , P, submap, reset
+bind = , Q, submap, reset
+bind = , R, submap, reset
+bind = , S, submap, reset
+bind = , T, submap, reset
+bind = , U, submap, reset
+bind = , V, submap, reset
+bind = , W, submap, reset
+bind = , X, submap, reset
+bind = , Y, submap, reset
+bind = , Z, submap, reset
+bind = , 1, submap, reset
+bind = , 2, submap, reset
+bind = , 3, submap, reset
+bind = , 4, submap, reset
+bind = , 5, submap, reset
+bind = , 6, submap, reset
+bind = , 7, submap, reset
+bind = , 8, submap, reset
+bind = , 9, submap, reset
+bind = , 0, submap, reset
+
+
+# all modifier combinations for all the characters above
+bind = $mainMod                , A, submap, reset
+bind = $mainMod ALT            , A, submap, reset
+bind = $mainMod CTRL           , A, submap, reset
+bind = $mainMod SHIFT          , A, submap, reset
+bind = $mainMod ALT CTRL       , A, submap, reset
+bind = $mainMod ALT SHIFT      , A, submap, reset
+bind = $mainMod CTRL SHIFT     , A, submap, reset
+bind = $mainMod ALT CTRL SHIFT , A, submap, reset
+
+
+bind = $mainMod                , B, submap, reset
+bind = $mainMod ALT            , B, submap, reset
+bind = $mainMod CTRL           , B, submap, reset
+bind = $mainMod SHIFT          , B, submap, reset
+bind = $mainMod ALT CTRL       , B, submap, reset
+bind = $mainMod ALT SHIFT      , B, submap, reset
+bind = $mainMod CTRL SHIFT     , B, submap, reset
+bind = $mainMod ALT CTRL SHIFT , B, submap, reset
+
+
+bind = $mainMod                , C, submap, reset
+bind = $mainMod ALT            , C, submap, reset
+bind = $mainMod CTRL           , C, submap, reset
+bind = $mainMod SHIFT          , C, submap, reset
+bind = $mainMod ALT CTRL       , C, submap, reset
+bind = $mainMod ALT SHIFT      , C, submap, reset
+bind = $mainMod CTRL SHIFT     , C, submap, reset
+bind = $mainMod ALT CTRL SHIFT , C, submap, reset
+
+
+bind = $mainMod                , D, submap, reset
+bind = $mainMod ALT            , D, submap, reset
+bind = $mainMod CTRL           , D, submap, reset
+bind = $mainMod SHIFT          , D, submap, reset
+bind = $mainMod ALT CTRL       , D, submap, reset
+bind = $mainMod ALT SHIFT      , D, submap, reset
+bind = $mainMod CTRL SHIFT     , D, submap, reset
+bind = $mainMod ALT CTRL SHIFT , D, submap, reset
+
+
+bind = $mainMod                , E, submap, reset
+bind = $mainMod ALT            , E, submap, reset
+bind = $mainMod CTRL           , E, submap, reset
+bind = $mainMod SHIFT          , E, submap, reset
+bind = $mainMod ALT CTRL       , E, submap, reset
+bind = $mainMod ALT SHIFT      , E, submap, reset
+bind = $mainMod CTRL SHIFT     , E, submap, reset
+bind = $mainMod ALT CTRL SHIFT , E, submap, reset
+
+
+bind = $mainMod                , F, submap, reset
+bind = $mainMod ALT            , F, submap, reset
+bind = $mainMod CTRL           , F, submap, reset
+bind = $mainMod SHIFT          , F, submap, reset
+bind = $mainMod ALT CTRL       , F, submap, reset
+bind = $mainMod ALT SHIFT      , F, submap, reset
+bind = $mainMod CTRL SHIFT     , F, submap, reset
+bind = $mainMod ALT CTRL SHIFT , F, submap, reset
+
+
+bind = $mainMod                , G, submap, reset
+bind = $mainMod ALT            , G, submap, reset
+bind = $mainMod CTRL           , G, submap, reset
+bind = $mainMod SHIFT          , G, submap, reset
+bind = $mainMod ALT CTRL       , G, submap, reset
+bind = $mainMod ALT SHIFT      , G, submap, reset
+bind = $mainMod CTRL SHIFT     , G, submap, reset
+bind = $mainMod ALT CTRL SHIFT , G, submap, reset
+
+
+bind = $mainMod                , H, submap, reset
+bind = $mainMod ALT            , H, submap, reset
+bind = $mainMod CTRL           , H, submap, reset
+bind = $mainMod SHIFT          , H, submap, reset
+bind = $mainMod ALT CTRL       , H, submap, reset
+bind = $mainMod ALT SHIFT      , H, submap, reset
+bind = $mainMod CTRL SHIFT     , H, submap, reset
+bind = $mainMod ALT CTRL SHIFT , H, submap, reset
+
+
+bind = $mainMod                , I, submap, reset
+bind = $mainMod ALT            , I, submap, reset
+bind = $mainMod CTRL           , I, submap, reset
+bind = $mainMod SHIFT          , I, submap, reset
+bind = $mainMod ALT CTRL       , I, submap, reset
+bind = $mainMod ALT SHIFT      , I, submap, reset
+bind = $mainMod CTRL SHIFT     , I, submap, reset
+bind = $mainMod ALT CTRL SHIFT , I, submap, reset
+
+
+bind = $mainMod                , J, submap, reset
+bind = $mainMod ALT            , J, submap, reset
+bind = $mainMod CTRL           , J, submap, reset
+bind = $mainMod SHIFT          , J, submap, reset
+bind = $mainMod ALT CTRL       , J, submap, reset
+bind = $mainMod ALT SHIFT      , J, submap, reset
+bind = $mainMod CTRL SHIFT     , J, submap, reset
+bind = $mainMod ALT CTRL SHIFT , J, submap, reset
+
+
+bind = $mainMod                , K, submap, reset
+bind = $mainMod ALT            , K, submap, reset
+bind = $mainMod CTRL           , K, submap, reset
+bind = $mainMod SHIFT          , K, submap, reset
+bind = $mainMod ALT CTRL       , K, submap, reset
+bind = $mainMod ALT SHIFT      , K, submap, reset
+bind = $mainMod CTRL SHIFT     , K, submap, reset
+bind = $mainMod ALT CTRL SHIFT , K, submap, reset
+
+
+bind = $mainMod                , L, submap, reset
+bind = $mainMod ALT            , L, submap, reset
+bind = $mainMod CTRL           , L, submap, reset
+bind = $mainMod SHIFT          , L, submap, reset
+bind = $mainMod ALT CTRL       , L, submap, reset
+bind = $mainMod ALT SHIFT      , L, submap, reset
+bind = $mainMod CTRL SHIFT     , L, submap, reset
+bind = $mainMod ALT CTRL SHIFT , L, submap, reset
+
+
+bind = $mainMod                , M, submap, reset
+bind = $mainMod ALT            , M, submap, reset
+bind = $mainMod CTRL           , M, submap, reset
+bind = $mainMod SHIFT          , M, submap, reset
+bind = $mainMod ALT CTRL       , M, submap, reset
+bind = $mainMod ALT SHIFT      , M, submap, reset
+bind = $mainMod CTRL SHIFT     , M, submap, reset
+bind = $mainMod ALT CTRL SHIFT , M, submap, reset
+
+
+bind = $mainMod                , N, submap, reset
+bind = $mainMod ALT            , N, submap, reset
+bind = $mainMod CTRL           , N, submap, reset
+bind = $mainMod SHIFT          , N, submap, reset
+bind = $mainMod ALT CTRL       , N, submap, reset
+bind = $mainMod ALT SHIFT      , N, submap, reset
+bind = $mainMod CTRL SHIFT     , N, submap, reset
+bind = $mainMod ALT CTRL SHIFT , N, submap, reset
+
+
+bind = $mainMod                , O, submap, reset
+bind = $mainMod ALT            , O, submap, reset
+bind = $mainMod CTRL           , O, submap, reset
+bind = $mainMod SHIFT          , O, submap, reset
+bind = $mainMod ALT CTRL       , O, submap, reset
+bind = $mainMod ALT SHIFT      , O, submap, reset
+bind = $mainMod CTRL SHIFT     , O, submap, reset
+bind = $mainMod ALT CTRL SHIFT , O, submap, reset
+
+
+bind = $mainMod                , P, submap, reset
+bind = $mainMod ALT            , P, submap, reset
+bind = $mainMod CTRL           , P, submap, reset
+bind = $mainMod SHIFT          , P, submap, reset
+bind = $mainMod ALT CTRL       , P, submap, reset
+bind = $mainMod ALT SHIFT      , P, submap, reset
+bind = $mainMod CTRL SHIFT     , P, submap, reset
+bind = $mainMod ALT CTRL SHIFT , P, submap, reset
+
+
+bind = $mainMod                , Q, submap, reset
+bind = $mainMod ALT            , Q, submap, reset
+bind = $mainMod CTRL           , Q, submap, reset
+bind = $mainMod SHIFT          , Q, submap, reset
+bind = $mainMod ALT CTRL       , Q, submap, reset
+bind = $mainMod ALT SHIFT      , Q, submap, reset
+bind = $mainMod CTRL SHIFT     , Q, submap, reset
+bind = $mainMod ALT CTRL SHIFT , Q, submap, reset
+
+
+bind = $mainMod                , R, submap, reset
+bind = $mainMod ALT            , R, submap, reset
+bind = $mainMod CTRL           , R, submap, reset
+bind = $mainMod SHIFT          , R, submap, reset
+bind = $mainMod ALT CTRL       , R, submap, reset
+bind = $mainMod ALT SHIFT      , R, submap, reset
+bind = $mainMod CTRL SHIFT     , R, submap, reset
+bind = $mainMod ALT CTRL SHIFT , R, submap, reset
+
+
+bind = $mainMod                , S, submap, reset
+bind = $mainMod ALT            , S, submap, reset
+bind = $mainMod CTRL           , S, submap, reset
+bind = $mainMod SHIFT          , S, submap, reset
+bind = $mainMod ALT CTRL       , S, submap, reset
+bind = $mainMod ALT SHIFT      , S, submap, reset
+bind = $mainMod CTRL SHIFT     , S, submap, reset
+bind = $mainMod ALT CTRL SHIFT , S, submap, reset
+
+
+bind = $mainMod                , T, submap, reset
+bind = $mainMod ALT            , T, submap, reset
+bind = $mainMod CTRL           , T, submap, reset
+bind = $mainMod SHIFT          , T, submap, reset
+bind = $mainMod ALT CTRL       , T, submap, reset
+bind = $mainMod ALT SHIFT      , T, submap, reset
+bind = $mainMod CTRL SHIFT     , T, submap, reset
+bind = $mainMod ALT CTRL SHIFT , T, submap, reset
+
+
+bind = $mainMod                , U, submap, reset
+bind = $mainMod ALT            , U, submap, reset
+bind = $mainMod CTRL           , U, submap, reset
+bind = $mainMod SHIFT          , U, submap, reset
+bind = $mainMod ALT CTRL       , U, submap, reset
+bind = $mainMod ALT SHIFT      , U, submap, reset
+bind = $mainMod CTRL SHIFT     , U, submap, reset
+bind = $mainMod ALT CTRL SHIFT , U, submap, reset
+
+
+bind = $mainMod                , V, submap, reset
+bind = $mainMod ALT            , V, submap, reset
+bind = $mainMod CTRL           , V, submap, reset
+bind = $mainMod SHIFT          , V, submap, reset
+bind = $mainMod ALT CTRL       , V, submap, reset
+bind = $mainMod ALT SHIFT      , V, submap, reset
+bind = $mainMod CTRL SHIFT     , V, submap, reset
+bind = $mainMod ALT CTRL SHIFT , V, submap, reset
+
+
+bind = $mainMod                , W, submap, reset
+bind = $mainMod ALT            , W, submap, reset
+bind = $mainMod CTRL           , W, submap, reset
+bind = $mainMod SHIFT          , W, submap, reset
+bind = $mainMod ALT CTRL       , W, submap, reset
+bind = $mainMod ALT SHIFT      , W, submap, reset
+bind = $mainMod CTRL SHIFT     , W, submap, reset
+bind = $mainMod ALT CTRL SHIFT , W, submap, reset
+
+
+bind = $mainMod                , X, submap, reset
+bind = $mainMod ALT            , X, submap, reset
+bind = $mainMod CTRL           , X, submap, reset
+bind = $mainMod SHIFT          , X, submap, reset
+bind = $mainMod ALT CTRL       , X, submap, reset
+bind = $mainMod ALT SHIFT      , X, submap, reset
+bind = $mainMod CTRL SHIFT     , X, submap, reset
+bind = $mainMod ALT CTRL SHIFT , X, submap, reset
+
+
+bind = $mainMod                , Y, submap, reset
+bind = $mainMod ALT            , Y, submap, reset
+bind = $mainMod CTRL           , Y, submap, reset
+bind = $mainMod SHIFT          , Y, submap, reset
+bind = $mainMod ALT CTRL       , Y, submap, reset
+bind = $mainMod ALT SHIFT      , Y, submap, reset
+bind = $mainMod CTRL SHIFT     , Y, submap, reset
+bind = $mainMod ALT CTRL SHIFT , Y, submap, reset
+
+
+bind = $mainMod                , Z, submap, reset
+bind = $mainMod ALT            , Z, submap, reset
+bind = $mainMod CTRL           , Z, submap, reset
+bind = $mainMod SHIFT          , Z, submap, reset
+bind = $mainMod ALT CTRL       , Z, submap, reset
+bind = $mainMod ALT SHIFT      , Z, submap, reset
+bind = $mainMod CTRL SHIFT     , Z, submap, reset
+bind = $mainMod ALT CTRL SHIFT , Z, submap, reset
+
+
+bind = $mainMod                , 1, submap, reset
+bind = $mainMod ALT            , 1, submap, reset
+bind = $mainMod CTRL           , 1, submap, reset
+bind = $mainMod SHIFT          , 1, submap, reset
+bind = $mainMod ALT CTRL       , 1, submap, reset
+bind = $mainMod ALT SHIFT      , 1, submap, reset
+bind = $mainMod CTRL SHIFT     , 1, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 1, submap, reset
+
+
+bind = $mainMod                , 2, submap, reset
+bind = $mainMod ALT            , 2, submap, reset
+bind = $mainMod CTRL           , 2, submap, reset
+bind = $mainMod SHIFT          , 2, submap, reset
+bind = $mainMod ALT CTRL       , 2, submap, reset
+bind = $mainMod ALT SHIFT      , 2, submap, reset
+bind = $mainMod CTRL SHIFT     , 2, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 2, submap, reset
+
+
+bind = $mainMod                , 3, submap, reset
+bind = $mainMod ALT            , 3, submap, reset
+bind = $mainMod CTRL           , 3, submap, reset
+bind = $mainMod SHIFT          , 3, submap, reset
+bind = $mainMod ALT CTRL       , 3, submap, reset
+bind = $mainMod ALT SHIFT      , 3, submap, reset
+bind = $mainMod CTRL SHIFT     , 3, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 3, submap, reset
+
+
+bind = $mainMod                , 4, submap, reset
+bind = $mainMod ALT            , 4, submap, reset
+bind = $mainMod CTRL           , 4, submap, reset
+bind = $mainMod SHIFT          , 4, submap, reset
+bind = $mainMod ALT CTRL       , 4, submap, reset
+bind = $mainMod ALT SHIFT      , 4, submap, reset
+bind = $mainMod CTRL SHIFT     , 4, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 4, submap, reset
+
+
+bind = $mainMod                , 5, submap, reset
+bind = $mainMod ALT            , 5, submap, reset
+bind = $mainMod CTRL           , 5, submap, reset
+bind = $mainMod SHIFT          , 5, submap, reset
+bind = $mainMod ALT CTRL       , 5, submap, reset
+bind = $mainMod ALT SHIFT      , 5, submap, reset
+bind = $mainMod CTRL SHIFT     , 5, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 5, submap, reset
+
+
+bind = $mainMod                , 6, submap, reset
+bind = $mainMod ALT            , 6, submap, reset
+bind = $mainMod CTRL           , 6, submap, reset
+bind = $mainMod SHIFT          , 6, submap, reset
+bind = $mainMod ALT CTRL       , 6, submap, reset
+bind = $mainMod ALT SHIFT      , 6, submap, reset
+bind = $mainMod CTRL SHIFT     , 6, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 6, submap, reset
+
+
+bind = $mainMod                , 7, submap, reset
+bind = $mainMod ALT            , 7, submap, reset
+bind = $mainMod CTRL           , 7, submap, reset
+bind = $mainMod SHIFT          , 7, submap, reset
+bind = $mainMod ALT CTRL       , 7, submap, reset
+bind = $mainMod ALT SHIFT      , 7, submap, reset
+bind = $mainMod CTRL SHIFT     , 7, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 7, submap, reset
+
+
+bind = $mainMod                , 8, submap, reset
+bind = $mainMod ALT            , 8, submap, reset
+bind = $mainMod CTRL           , 8, submap, reset
+bind = $mainMod SHIFT          , 8, submap, reset
+bind = $mainMod ALT CTRL       , 8, submap, reset
+bind = $mainMod ALT SHIFT      , 8, submap, reset
+bind = $mainMod CTRL SHIFT     , 8, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 8, submap, reset
+
+
+bind = $mainMod                , 9, submap, reset
+bind = $mainMod ALT            , 9, submap, reset
+bind = $mainMod CTRL           , 9, submap, reset
+bind = $mainMod SHIFT          , 9, submap, reset
+bind = $mainMod ALT CTRL       , 9, submap, reset
+bind = $mainMod ALT SHIFT      , 9, submap, reset
+bind = $mainMod CTRL SHIFT     , 9, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 9, submap, reset
+
+
+bind = $mainMod                , 0, submap, reset
+bind = $mainMod ALT            , 0, submap, reset
+bind = $mainMod CTRL           , 0, submap, reset
+bind = $mainMod SHIFT          , 0, submap, reset
+bind = $mainMod ALT CTRL       , 0, submap, reset
+bind = $mainMod ALT SHIFT      , 0, submap, reset
+bind = $mainMod CTRL SHIFT     , 0, submap, reset
+bind = $mainMod ALT CTRL SHIFT , 0, submap, reset
+
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index c325c96..4760ad3 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -2,7 +2,7 @@
 	"layer": "top",
 	"modules-left": ["wlr/workspaces", "mpd"],
 	"modules-center": ["hyprland/window"],
-	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "memory", "clock", "tray"],
+	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "clock", "tray"],
 	"wlr/workspaces": {
 		"on-click": "activate",
 	},
@@ -39,10 +39,10 @@
 		"format": " {usage:2}%",
 		"interval": 3,
 	},
-	"memory": {
-		"tooltip": false,
-		"format": " {used:.2f}G",
-		"interval": 3,
+	"custom/memory": {
+		"exec": "/home/aluc/script.sh",
+		"format": "{}",
+		"restart-interval": 3,
 	},
 	"clock": {
 		"format": "{:%H:%M}",
diff --git a/config/hyprland/waybar/style.css b/config/hyprland/waybar/style.css
index 29b429b..4b12d00 100644
--- a/config/hyprland/waybar/style.css
+++ b/config/hyprland/waybar/style.css
@@ -36,7 +36,7 @@ window#waybar.PCSX2 #window {
 }
 
 #mpd,
-#network, #pulseaudio, #temperature, #cpu, #memory {
+#network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
 	padding-right: 16px;
@@ -44,7 +44,7 @@ window#waybar.PCSX2 #window {
 }
 
 #workspaces, #mpd,
-#network, #pulseaudio, #temperature, #cpu, #memory, #workspaces, #clock, #tray {
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	transition: none;
@@ -107,7 +107,7 @@ window#waybar.PCSX2 #window {
 	background: #ebcb8b;
 }
 
-#memory {
+#custom-memory {
 	color: #2e3440;
 	background: #a3be8c;
 }