Merge branch 'main' of /var/git/dotfiles

15 files changed, 142 insertions, 108 deletions

diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc
index d261b3f..5f595b1 100755
--- a/config/X/x11/xinitrc
+++ b/config/X/x11/xinitrc
@@ -6,21 +6,10 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f "$userresources" ] && xrdb -merge "$userresources"
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
 
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
@@ -37,5 +26,6 @@ xmodmap -e "keycode 135 = Super_L"
 xautolock -time 5 -locker slock &
 gammastep -m randr &
 slstatus &
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
 unclutter --timeout 3 --jitter 50 -b
 exec startdwm
diff --git a/config/common/mpd/mpd.conf b/config/common/mpd/mpd.conf
index 7ea7137..dda6f45 100644
--- a/config/common/mpd/mpd.conf
+++ b/config/common/mpd/mpd.conf
@@ -14,7 +14,7 @@ audio_output {
 audio_output {
 	type		"httpd"
 	name		"My HTTP Stream"
-	port		"8000"
+	port		"7721"
 	always_on       "yes"			# prevent MPD from disconnecting all listeners when playback is stopped.
 	tags            "yes"			# httpd supports sending tags to listening streams.
 }
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 43d985a..7ee274f 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -142,7 +142,7 @@ ls.add_snippets("java", {
 })
 
 ls.add_snippets("sh", {
-	s("TD", t "THISDIR=$(dirname $(readlink -f \"$0\"))"),
+	s("TD", t "THISDIR=\"$(dirname \"$(readlink -f \"$0\")\")\""),
 	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
 	-- Functions
 	parse("rchar",
diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua
index 0da4c23..01b20d6 100644
--- a/config/essentials/nvim/ftplugin/sh.lua
+++ b/config/essentials/nvim/ftplugin/sh.lua
@@ -2,5 +2,5 @@ vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"
 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.keymap.set({"i", "n"}, "<LocalLeader>v", "<esc>A)\"<esc>I\"$(<esc>0")
+vim.keymap.set({"i", "n"}, "<LocalLeader>v", "<esc>A)\"<esc>I\"$(<esc>I")
 vim.opt.formatoptions = "cqrnj"
diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua
index 99f984d..8f8291e 100644
--- a/config/essentials/nvim/lua/user/cmp/setup.lua
+++ b/config/essentials/nvim/lua/user/cmp/setup.lua
@@ -6,8 +6,8 @@ cmp.setup({
 		end,
 	},
 	window = {
-		-- completion = cmp.config.window.bordered(),
-		-- documentation = cmp.config.window.bordered(),
+		completion = cmp.config.window.bordered(),
+		documentation = cmp.config.window.bordered(),
 	},
 	mapping = cmp.mapping.preset.insert({
 		['<C-b>'] = cmp.mapping.scroll_docs(-4),
diff --git a/config/essentials/nvim/lua/user/live-server.lua b/config/essentials/nvim/lua/user/live-server.lua
index dac3c19..197809d 100644
--- a/config/essentials/nvim/lua/user/live-server.lua
+++ b/config/essentials/nvim/lua/user/live-server.lua
@@ -5,7 +5,7 @@ local live_servers = {}
 function M.start_live_server()
 	if vim.fn.executable('lsof') == 0 then
 		print("Error: 'lsof' command not found")
-	elseif vim.fn.executable('lsof') == 0 then
+	elseif vim.fn.executable('live-server') == 0 then
 		print("Error: 'live-server' command not found")
 		return
 	end
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 0fe4164..7c6d87f 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -34,6 +34,8 @@ vim.keymap.set("c", "<C-a>", "<Home>", { noremap = true })
 vim.keymap.set("v", "J",  "<cmd>m '>+1<cr>gv=gv<cr>", { noremap = true })
 vim.keymap.set("v", "K", "<cmd>m '<-2<cr>gv=gv<cr>", { noremap = true })
 
+vim.keymap.set("n", "+", "<cmd>tabe .<cr>", { noremap = true })
+
 -- clipboard
 vim.keymap.set("n", "<Leader>y", "\"+y", { noremap = true })
 
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 58974ba..d8675d4 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -25,7 +25,7 @@ zle -N add-surround surround
 zle -N change-surround surround
 compinit
 
-if grep -qi "debian\|ubuntu" /etc/os-release 2>/dev/null
+if grep -qi "debian\|ubuntu" /usr/lib/os-release /etc/os-release 2>/dev/null
 then
     sfiles=(
         /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index cf2a397..3df6234 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -136,13 +136,14 @@ alias fif='find . -type "f" | grep'
 alias fid='find . -type "d" | grep'
 alias sxt='sxiv -t'
 alias wgsh='wget --quiet --show-progress'
+alias wgc='wgsh "$(clipo)"'
 alias ss4='ss -tln4p'
 alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb'
 alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb'
 
 # ssh
 alias sha='ssh-add'
-alias ssh-start='eval "$(ssh-agent)" && ssh-add'
+alias sshs='eval "$(ssh-agent)" && ssh-add'
 
 alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i'
 alias whatsmyip='curl -s "ifconfig.co"'
@@ -167,15 +168,14 @@ alias penv='python3 -m venv env'
 alias phttp='python3 -m http.server'
 alias pipreq='pip install -r requirements.txt'
 
-alias cx='chmod +x'
 alias ch='chown ${USER}:${USER} -R'
 alias kll='killall'
 alias pi='ping archlinux.org -c4'
 alias sba='source env/bin/activate || source bin/activate'
 alias smc='systemctl'
-alias ssc='doas systemctl'
+alias dsmc='doas systemctl'
 alias smcu='smc --user'
-alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
+alias zsr='source ${ZDOTDIR:-~}/.zshrc && rehash'
 alias rh='rehash'
 alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
@@ -190,7 +190,7 @@ alias vblsr='vbm list runningvms'
 alias vb='vbm startvm'
 
 # quick config
-alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
+alias ez='$EDITOR ${ZDOTDIR:-~}/.zshrc'
 alias eza='$EDITOR ${ZDOTDIR}/aliases.sh'
 alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh'
 alias eto='$EDITOR ~/sync/TODO'
@@ -202,34 +202,36 @@ alias est='$EDITOR ~/proj/suckless/st/config.def.h'
 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 ewbj='$EDITOR ~/src/dotfiles/config/hyprland/waybar/config.jsonc'
+alias ewbs='$EDITOR ~/src/dotfiles/config/hyprland/waybar/style.css'
 alias cfd='$EDITOR config.def.h'
-# quick cd
-# !sort -t "'" -k 2
-alias cdl='cd $HOME/dl'
-alias cdoc='cd $HOME/docs'
-alias cda='cd $HOME/docs/android/projects'
-alias cdm='cd $HOME/music'
-alias cdp='cd $HOME/pics'
-alias cdpa='cd $HOME/pics/ai-outputs/'
-alias cdpp='cd $HOME/proj/personal/'
-alias chom='cd $HOME/proj/personal/homepage'
-alias cdsw='cd $HOME/proj/personal/WheelAdvisor'
-alias cddm='cd $HOME/proj/suckless/dmenu'
-alias cdw='cd $HOME/proj/suckless/dwm'
-alias cdslo='cd $HOME/proj/suckless/slock'
-alias cdsl='cd $HOME/proj/suckless/slstatus'
-alias cdst='cd $HOME/proj/suckless/st'
-alias cdsta='cd $HOME/proj/suckless/stable-diffusion-webui'
-alias cdsu='cd $HOME/proj/suckless/surf'
-alias cds='cd $HOME/src/'
-alias cdsb='cd $HOME/src/build'
-alias cdsc='cd $HOME/src/comfyui/'
-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 czo='cd $HOME/zot/'
-alias cdpw='cd ${PASSWORD_STORE_DIR:-$HOME/.password-store}'
+# /# quick cd
jV}k:!sort -t "'" -k 2

+alias cdl='cd ~/dl'
+alias cdoc='cd ~/docs'
+alias cda='cd ~/docs/android/projects'
+alias cdm='cd ~/music'
+alias cdp='cd ~/pics'
+alias cdpa='cd ~/pics/ai-outputs/'
+alias cdpp='cd ~/proj/personal/'
+alias chom='cd ~/proj/personal/homepage'
+alias lov='cd ~/proj/personal/lola'
+alias cdsw='cd ~/proj/personal/WheelAdvisor'
+alias cddm='cd ~/proj/suckless/dmenu'
+alias cdw='cd ~/proj/suckless/dwm'
+alias cdslo='cd ~/proj/suckless/slock'
+alias cdsl='cd ~/proj/suckless/slstatus'
+alias cdst='cd ~/proj/suckless/st'
+alias cdsta='cd ~/proj/suckless/stable-diffusion-webui'
+alias cdsu='cd ~/proj/suckless/surf'
+alias cds='cd ~/src/'
+alias cdsb='cd ~/src/build'
+alias cdsc='cd ~/src/comfyui/'
+alias cdo='cd ~/src/dotfiles'
+alias cdi='cd ~/src/installdrier'
+alias cdia='cd ~/src/installdrier/arch'
+alias cdib='cd ~/src/installdrier/deb'
+alias czo='cd ~/zot/'
+alias cdpw='cd ${PASSWORD_STORE_DIR:-~/.password-store}'
 alias cdng='cd /etc/nginx'
 alias cdrs='cd /srv/'
 
@@ -238,7 +240,7 @@ alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' |
 alias asf='alias | fzf'
 alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp"
 alias ffwin='hyprctl clients -j | jq '\''.[].pid'\'' | fzf --preview "hyprctl clients -j | jq '\''.[] | select(.pid == {}) | {class, title, workspace, xwayland}'\''"'
-alias pff='find ${PASSWORD_STORE_DIR:=$HOME/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c'
+alias pff='find ${PASSWORD_STORE_DIR:=~/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c'
 alias fzps='fzf --print0 | xargs -0I{}'
 
 alias dcb='docker build'
@@ -254,7 +256,7 @@ alias dbinf='ssh db dlinfo'
 alias sshdb='ssh -t db tmux a'
 alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music'
 
-alias cfg='git --git-dir=$HOME/src/dotfiles/.git --work-tree=$HOME/src/dotfiles'
+alias cfg='git --git-dir=~/src/dotfiles/.git --work-tree=~/src/dotfiles'
 # oh-my-zsh git aliases
 alias g='git'
 alias ga='git add'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index ada523d..671e6fb 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -278,3 +278,11 @@ muttmail ()
 	die -n 'Press [Enter to login]'
 	read && mutt
 }
+
+resize ()
+{
+	test $# -lt 2 &&
+		printf "usage: %s <format> <file> [out]\n" "$0" >&2 &&
+		return 1
+	convert -resize $1^ -gravity center -crop $1+0+0 -- "$2" "${3:-$1}"
+}
diff --git a/config/extra/tridactyl/tridactylrc b/config/extra/tridactyl/tridactylrc
index 2b98c9d..2de07b4 100644
--- a/config/extra/tridactyl/tridactylrc
+++ b/config/extra/tridactyl/tridactylrc
@@ -1,62 +1,62 @@
-" General Settings
-set newtab https://www.duckduckgo.com
-set searchengine duckduckgo
-set searchurls.wi https://www.wikipedia.org/w/index.php?title=Special:Search&search=%s
-set searchurls.g https://www.google.com/search?q=%s
-set searchurls.y https://www.youtube.com/results?search_query=%s
-set searchurls.gm https://www.google.com/maps?q=%s
-set searchurls.aw https://wiki.archlinux.org/title/%s
-set searchurls.aur https://aur.archlinux.org/packages?O=0&K=%s
-set searchurls.tw https://tweakers.net/zoeken/?keyword=%s
-set searchurls.im https://www.imdb.com/find?q=%s
+set newtab http://localhost:28669
+set searchengine qwant
+
+" Searchurls
 set searchurls.1x https://www.1377x.to/search/%s/1
 set searchurls.am https://www.amazon.com.be/s?k=%s
-set searchurls.pyp https://pypi.org/search/?q=%s
+set searchurls.aur https://aur.archlinux.org/packages?O=0&K=%s
+set searchurls.aw https://wiki.archlinux.org/title/%s
+set searchurls.cnrtl http://www.cnrtl.fr/lexicographie/
+set searchurls.dhu https://hub.docker.com/search?q=%s
+set searchurls.g https://www.qwant.com/?q=%s
+set searchurls.google https://www.qwant.com/?q=%s
+set searchurls.gm https://www.google.com/maps?q=%s
+set searchurls.gwi https://wiki.gentoo.org/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search=
+set searchurls.im https://www.imdb.com/find?q=%s
+set searchurls.lg https://libgen.gs/index.php?req=%s
 set searchurls.mc https://minecraft.fandom.com/wiki/%s
 set searchurls.mcf https://www.curseforge.com/minecraft/mc-mods/search?search=%s
 set searchurls.mcm https://modrinth.com/mods?q=%s
-set searchurls.dhu https://hub.docker.com/search?q=%s
-set searchurls.plu https://app.pluralsight.com/search/?q=%s
-set searchurls.ru https://rutracker.org/forum/tracker.php?nm=%s
-set searchurls.google https://www.google.com/search?q=
-set searchurls.googlelucky https://www.google.com/search?btnI=I'm+Feeling+Lucky&q=
-set searchurls.scholar https://scholar.google.com/scholar?q=
-set searchurls.googleuk https://www.google.co.uk/search?q=
-set searchurls.bing https://www.bing.com/search?q=
-set searchurls.duckduckgo https://duckduckgo.com/?q=
-set searchurls.yahoo https://search.yahoo.com/search?p=
-set searchurls.twitter https://twitter.com/search?q=
-set searchurls.wikipedia https://en.wikipedia.org/wiki/Special:Search/
-set searchurls.youtube https://www.youtube.com/results?search_query=
-set searchurls.amazon https://www.amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords=
-set searchurls.amazonuk https://www.amazon.co.uk/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords=
-set searchurls.startpage https://startpage.com/do/search?language=english&cat=web&query=
-set searchurls.github https://github.com/search?utf8=✓&q=
-set searchurls.searx https://searx.me/?category_general=on&q=
-set searchurls.cnrtl http://www.cnrtl.fr/lexicographie/
-set searchurls.osm https://www.openstreetmap.org/search?query=
 set searchurls.mdn https://developer.mozilla.org/en-US/search?q=
-set searchurls.gentoo_wiki https://wiki.gentoo.org/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search=
+set searchurls.osm https://www.openstreetmap.org/search?query=
+set searchurls.plu https://app.pluralsight.com/search/?q=%s
+set searchurls.pyp https://pypi.org/search/?q=%s
 set searchurls.qwant https://www.qwant.com/?q=
-
+set searchurls.ru https://rutracker.org/forum/tracker.php?nm=%s
+set searchurls.tw https://tweakers.net/zoeken/?keyword=%s
+set searchurls.wi https://www.wikipedia.org/w/index.php?title=Special:Search&search=%s
+set searchurls.y https://www.youtube.com/results?search_query=%s
 " Binds
+
 " vim macro:
-" Ibind gnp tabopen yy2pwwdtojRwinbblrwkro
+" yy2pwlrnjrpwitabbkiwin2j0
 bind J tabnext
 bind K tabprev
-" chat gpt
-bind gnc tabopen https://chat.openai.com/chat
+
 bind goc open https://chat.openai.com/chat
-bind gwc winopen https://chat.openai.com/chat
-" awesome pixel tutorials
-bind gnp tabopen https://github.com/Siilwyn/awesome-pixel-art#tutorials
+bind gnc winopen https://chat.openai.com/chat
+bind gpc tabopen https://chat.openai.com/chat
 bind gop open https://github.com/Siilwyn/awesome-pixel-art#tutorials
-bind gwp winopen https://github.com/Siilwyn/awesome-pixel-art#tutorials
-" transmission
-bind godb open http://debuc.com/
-bind godt open http://debuc.com:9091
-bind gods open http://debuc.com:5030
+bind gnp winopen https://github.com/Siilwyn/awesome-pixel-art#tutorials
+bind gpp tabopen https://github.com/Siilwyn/awesome-pixel-art#tutorials
+bind godb open http://debuc.com:32095
+bind gndb winopen http://debuc.com:32095
+bind gpdb tabopen http://debuc.com:32095
+bind godc open http://debuc.com:8384
+bind gndc winopen http://debuc.com:8384
+bind gpdc tabopen http://debuc.com:8384
 bind godj open http://debuc.com:8096
+bind gndj winopen http://debuc.com:8096
+bind gpdj tabopen http://debuc.com:8096
+bind gods open http://debuc.com:5030
+bind gnds winopen http://debuc.com:5030
+bind gpds tabopen http://debuc.com:5030
+bind godt open http://debuc.com:9091
+bind gndt winopen http://debuc.com:9091
+bind gpdt tabopen http://debuc.com:9091
+bind gody open http://debuc.com:9010
+bind gndy winopen http://debuc.com:9010
+bind gpdy tabopen http://debuc.com:9010
 
 " For syntax highlighting see https://github.com/tridactyl/vim-tridactyl
 " vim: set filetype=tridactyl
diff --git a/config/home/.bashrc b/config/home/.bashrc
new file mode 100644
index 0000000..33dbba4
--- /dev/null
+++ b/config/home/.bashrc
@@ -0,0 +1,9 @@
+SHELL=/bin/bash
+PATH=$HOME/bin:$PATH
+color1="\[\033[35m\]"
+color2="\[\033[36m\]"
+bold="\[\033[1m\]"
+reset="\[\033[0m\]"
+PS1="${color1}${bold} [\\u${reset}@${color2}${bold}\\h]${reset} \\w "
+HISTFILE=
+. $HOME/.config/zsh/aliases.sh
diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf
index 8aa437e..a8a99c2 100644
--- a/config/hyprland/hypr/hyprland.conf
+++ b/config/hyprland/hypr/hyprland.conf
@@ -82,6 +82,7 @@ gestures {
 }
 
 windowrulev2 = noanim, class:^(.*[Pp]inentry.*)$
+windowrulev2 = float, class:^(.*[Pp]inentry.*)$
 windowrulev2 = noanim, class:dmenu
 
 layerrule = noanim, launcher
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index 816a851..d2bad38 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,10 +1,21 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "clock", "wlr/workspaces", "mpd"],
+	"modules-left": ["battery", "clock", "hyprland/workspaces", "mpd"],
 	"modules-center": ["hyprland/window"],
-	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
-	"wlr/workspaces": {
-		"on-click": "activate",
+	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
+	"hyprland/workspaces": {
+		"format": "{icon}",
+		"format-icons": {
+			"1": "I",
+			"2": "II",
+			"3": "III",
+			"4": "IV",
+			"5": "V",
+			"6": "VI",
+			"7": "VII",
+			"8": "VIII",
+			"9": "IX",
+		},
 	},
 	"mpd": {
 		"tooltip": false,
@@ -44,6 +55,11 @@
 			"default":["", "", "", "", ""]
 		},
 	},
+	"custom/wireguard": {
+		"exec": "ip addr show dev wg0",
+		"format": "wg0",
+		"restart-interval": 3,
+	},
 	"network": {
 		"format-wifi": " ",
 		"tooltip-format-wifi": "{ifname} {essid}",
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index eced638..589cc12 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -39,7 +39,7 @@ window#waybar.PCSX2 #window {
 
 #mpd, #battery,
 #window,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory {
+#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
 	padding-right: 16px;
@@ -48,7 +48,7 @@ window#waybar.PCSX2 #window {
 
 #workspaces, #mpd, #battery, #clock,
 #window,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
+#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
 	border: solid @background 2px;
 	margin-top: 4px;
 	margin-bottom: 2px;
@@ -75,7 +75,7 @@ window#waybar.PCSX2 #window {
 }
 
 #workspaces button.active {
-	text-shadow: 1px 0px 1px @background;
+	text-shadow: 0px 1px 0px @color1;
 }
 
 #workspaces button:hover {
@@ -112,6 +112,12 @@ window#waybar.PCSX2 #window {
 	background: @color4;
 }
 
+#custom-wireguard {
+	color: @color5;
+	border-color: @color8;
+	background: @background;
+}
+
 #network {
 	color: @background;
 	background: @color5;