From db8f32037483ade8fc3d8fc2cb2c0e18331e442e Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 13 Oct 2023 16:19:33 +0200
Subject: changed mappings for zooming

---
 config/extra/zathura/zathurarc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'config')

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"
-- 
cgit v1.2.3


From 4d4a846253b492fae3da17a43c4f5f559a0776e3 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sun, 15 Oct 2023 15:27:47 +0200
Subject: disabled age threshold

---
 config/X/dunst/dunstrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/X/dunst/dunstrc b/config/X/dunst/dunstrc
index 4975d0a..3d0eaed 100644
--- a/config/X/dunst/dunstrc
+++ b/config/X/dunst/dunstrc
@@ -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".
-- 
cgit v1.2.3


From ab321c0ce1a90fd0d690db6ef94bc170167795a9 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 16 Oct 2023 12:07:26 +0200
Subject: added pf snippet

---
 config/essentials/nvim/after/plugin/luasnip.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

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",
-- 
cgit v1.2.3


From 6c78112e19f44ef79eebf1076041feff83c303e6 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 16 Oct 2023 12:08:31 +0200
Subject: fix typo

---
 config/X/dunst/dunstrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/X/dunst/dunstrc b/config/X/dunst/dunstrc
index 3d0eaed..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
-- 
cgit v1.2.3


From 368d0f90400e9fe1d2d4dfe2fea583e54561057e Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 16 Oct 2023 12:09:47 +0200
Subject: remapped return to follow link

---
 config/essentials/nvim/ftplugin/telekasten.lua |  2 +-
 config/essentials/nvim/lua/user/remap.lua      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3


From 8f901edc752d7c34336af333b2622488135c09c7 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 16 Oct 2023 12:10:09 +0200
Subject: use custom bluetooth module

---
 config/hyprland/waybar/config.jsonc       | 12 ++++--------
 config/hyprland/waybar/schemes/base16.css |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index 4c95c25..cd24d14 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.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/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index b32d3df..61696d0 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -56,7 +56,7 @@ window#waybar.PCSX2 #window {
 
 #workspaces, #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;
@@ -152,7 +152,7 @@ window#waybar.PCSX2 #window {
 	background: @color5;
 }
 
-#bluetooth {
+#custom-bluetooth {
 	color: @color6;
 	background: @color8;
 }
-- 
cgit v1.2.3


From 08fe7f54c0daf00f49993eb74f56e1ce4d0be781 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 17 Oct 2023 00:04:16 +0200
Subject: refactor

---
 config/essentials/zsh/.zshrc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'config')

diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 414a7d7..993ae8a 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -1,15 +1,14 @@
 #!/bin/zsh
 
-if [[ "/dev/tty1" = "$TTY" || "/dev/tty2" = "$TTY" ]] && [[ "$(id -u)" -ne 0 ]]
+if [ "$(id -u)" -ne 0 ]
 then
 	clear
-	if [ "/dev/tty1" = "$TTY" ]
-	then
-		exec startw > /dev/null 2>&1
-	else
-		exec startx > /dev/null 2>&1
-	fi
-	exit
+	case "${TTY#/dev/}" in
+		tty1) exec startw ;;
+		tty2) exec startx ;;
+		tty3) exec startdwl ;;
+		*) false ;;
+	esac && exit
 fi
 
 autoload -U select-word-style
-- 
cgit v1.2.3


From 10a76057151c068eadce9832204cc9a50685c282 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 17 Oct 2023 22:12:46 +0200
Subject: use gml for games

---
 config/hyprland/hypr/binds.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index 9219f84..406c7ba 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/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
 
-- 
cgit v1.2.3


From e1b593d8fd1e9050e18ab906e97293a3c2cfb54c Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 17 Oct 2023 22:14:10 +0200
Subject: use one rule for multiple windows

---
 config/hyprland/hypr/hyprland.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf
index ed932e0..9eb0549 100644
--- a/config/hyprland/hypr/hyprland.conf
+++ b/config/hyprland/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
 
-- 
cgit v1.2.3


From 742f9d99da745f639df1f321a5580fd5b19c19ef Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 17 Oct 2023 22:14:48 +0200
Subject: removed mimeapps

---
 config/theme/mimeapps.list | 164 ---------------------------------------------
 1 file changed, 164 deletions(-)
 delete mode 100644 config/theme/mimeapps.list

(limited to 'config')

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
-- 
cgit v1.2.3


From a3aca5cf6bc7e5c3d9623e48f4c57ea4745d62dd Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 17 Oct 2023 23:15:47 +0200
Subject: added dwl configuration

---
 bin/guiscripts/startdwl                   | 49 +++++++++++++++++++
 bin/guiscripts/startw                     |  2 +
 config/essentials/zsh/.zshrc              |  8 ++--
 config/hyprland/waybar/config.jsonc       | 78 -------------------------------
 config/hyprland/waybar/dwl.jsonc          | 74 +++++++++++++++++++++++++++++
 config/hyprland/waybar/hyprland.jsonc     | 78 +++++++++++++++++++++++++++++++
 config/hyprland/waybar/schemes/base16.css | 24 +++++++---
 7 files changed, 225 insertions(+), 88 deletions(-)
 create mode 100755 bin/guiscripts/startdwl
 delete mode 100644 config/hyprland/waybar/config.jsonc
 create mode 100644 config/hyprland/waybar/dwl.jsonc
 create mode 100644 config/hyprland/waybar/hyprland.jsonc

(limited to 'config')

diff --git a/bin/guiscripts/startdwl b/bin/guiscripts/startdwl
new file mode 100755
index 0000000..64b2515
--- /dev/null
+++ b/bin/guiscripts/startdwl
@@ -0,0 +1,49 @@
+#!/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
+
+(cd ~/.config/waybar/ && ln -sf dwl.jsonc config.jsonc)
+
+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)"
+
+while true;
+do dwl -s $HOME/.config/hypr/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/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 993ae8a..e46cf8e 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -3,10 +3,10 @@
 if [ "$(id -u)" -ne 0 ]
 then
 	clear
-	case "${TTY#/dev/}" in
-		tty1) exec startw ;;
-		tty2) exec startx ;;
-		tty3) exec startdwl ;;
+	case "${TTY#/dev/tty}" in
+		1) exec startw > /dev/null 2>&1 ;;
+		2) exec startx > /dev/null 2>&1 ;;
+		3) exec startdwl > /dev/null 2>&1 ;;
 		*) false ;;
 	esac && exit
 fi
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
deleted file mode 100644
index cd24d14..0000000
--- a/config/hyprland/waybar/config.jsonc
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-	"layer": "top",
-	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
-	"modules-center": ["clock"],
-	"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,
-		"format-disconnected": "s",
-		"format-stopped": "",
-		"state-icons": {
-			"playing": "",
-			"paused": "",
-		},
-		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
-		"on-click": "mpc toggle",
-		"on-scroll-up": "mpc volume +5",
-		"on-scroll-down": "mpc volume -5",
-	},
-	"battery": {
-		"format-charging": " {capacity}%",
-		"on-click": "mpower",
-		"interval": 10,
-	},
-	"hyprland/window": {
-		"format": "{}",
-		"separate-outputs": true,
-	},
-	"pulseaudio": {
-		"scroll-step": 1,
-		"format": "{icon} {volume:3}%",
-		"format-icons": {
-			"default": ["", "", ""]
-		},
-		"on-click": "pavucontrol",
-	},
-	"temperature": {
-		"interval": 3,
-		"format": "{icon} {temperatureC}°C",
-		"format-icons": {
-			"default":["", "", "", "", ""]
-		},
-	},
-	"custom/wireguard": {
-		"exec": "ip addr show dev wg0",
-		"format": "wg0",
-		"restart-interval": 3,
-	},
-	"network": {
-		"format-wifi": " ",
-		"tooltip-format-wifi": "{ifname} {essid}",
-		"format-ethernet": "",
-		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "",
-	},
-	"cpu": {
-		"format": " {usage:2}%",
-		"interval": 3,
-	},
-	"custom/memory": {
-		"exec": "free -h | awk '(NR==2){ print $3 }'",
-		"format": "{}",
-		"restart-interval": 3,
-	},
-	"clock": {
-		"format": "{:%R}",
-		"format-alt": "{:(%T) %A %d %B}",
-		"interval": 1,
-	},
-	"custom/bluetooth": {
-		"exec": "bluetoothctl info",
-		"format": "",
-		"interval": 3,
-	},
-	"tray": {
-		"spacing": 5,
-	}
-}
diff --git a/config/hyprland/waybar/dwl.jsonc b/config/hyprland/waybar/dwl.jsonc
new file mode 100644
index 0000000..9d65564
--- /dev/null
+++ b/config/hyprland/waybar/dwl.jsonc
@@ -0,0 +1,74 @@
+{
+	"layer": "top",
+	"modules-left": ["battery", "dwl/tags", "mpd"],
+	"modules-center": ["clock"],
+	"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,
+		"format-disconnected": "s",
+		"format-stopped": "",
+		"state-icons": {
+			"playing": "",
+			"paused": "",
+		},
+		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
+		"on-click": "mpc toggle",
+		"on-scroll-up": "mpc volume +5",
+		"on-scroll-down": "mpc volume -5",
+	},
+	"battery": {
+		"format-charging": " {capacity}%",
+		"on-click": "mpower",
+		"interval": 10,
+	},
+	"pulseaudio": {
+		"scroll-step": 1,
+		"format": "{icon} {volume:3}%",
+		"format-icons": {
+			"default": ["", "", ""]
+		},
+		"on-click": "pavucontrol",
+	},
+	"temperature": {
+		"interval": 3,
+		"format": "{icon} {temperatureC}°C",
+		"format-icons": {
+			"default":["", "", "", "", ""]
+		},
+	},
+	"custom/wireguard": {
+		"exec": "ip addr show dev wg0",
+		"format": "wg0",
+		"restart-interval": 3,
+	},
+	"network": {
+		"format-wifi": " ",
+		"tooltip-format-wifi": "{ifname} {essid}",
+		"format-ethernet": "",
+		"tooltip-format-ethernet": "{ifname} {ipaddr}",
+		"format-disconnected": "",
+	},
+	"cpu": {
+		"format": " {usage:2}%",
+		"interval": 3,
+	},
+	"custom/memory": {
+		"exec": "free -h | awk '(NR==2){ print $3 }'",
+		"format": "{}",
+		"restart-interval": 3,
+	},
+	"clock": {
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
+		"interval": 1,
+	},
+	"custom/bluetooth": {
+		"exec": "bluetoothctl info",
+		"format": "",
+		"interval": 3,
+	},
+	"tray": {
+		"spacing": 5,
+	}
+}
diff --git a/config/hyprland/waybar/hyprland.jsonc b/config/hyprland/waybar/hyprland.jsonc
new file mode 100644
index 0000000..cd24d14
--- /dev/null
+++ b/config/hyprland/waybar/hyprland.jsonc
@@ -0,0 +1,78 @@
+{
+	"layer": "top",
+	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+	"modules-center": ["clock"],
+	"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,
+		"format-disconnected": "s",
+		"format-stopped": "",
+		"state-icons": {
+			"playing": "",
+			"paused": "",
+		},
+		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
+		"on-click": "mpc toggle",
+		"on-scroll-up": "mpc volume +5",
+		"on-scroll-down": "mpc volume -5",
+	},
+	"battery": {
+		"format-charging": " {capacity}%",
+		"on-click": "mpower",
+		"interval": 10,
+	},
+	"hyprland/window": {
+		"format": "{}",
+		"separate-outputs": true,
+	},
+	"pulseaudio": {
+		"scroll-step": 1,
+		"format": "{icon} {volume:3}%",
+		"format-icons": {
+			"default": ["", "", ""]
+		},
+		"on-click": "pavucontrol",
+	},
+	"temperature": {
+		"interval": 3,
+		"format": "{icon} {temperatureC}°C",
+		"format-icons": {
+			"default":["", "", "", "", ""]
+		},
+	},
+	"custom/wireguard": {
+		"exec": "ip addr show dev wg0",
+		"format": "wg0",
+		"restart-interval": 3,
+	},
+	"network": {
+		"format-wifi": " ",
+		"tooltip-format-wifi": "{ifname} {essid}",
+		"format-ethernet": "",
+		"tooltip-format-ethernet": "{ifname} {ipaddr}",
+		"format-disconnected": "",
+	},
+	"cpu": {
+		"format": " {usage:2}%",
+		"interval": 3,
+	},
+	"custom/memory": {
+		"exec": "free -h | awk '(NR==2){ print $3 }'",
+		"format": "{}",
+		"restart-interval": 3,
+	},
+	"clock": {
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
+		"interval": 1,
+	},
+	"custom/bluetooth": {
+		"exec": "bluetoothctl info",
+		"format": "",
+		"interval": 3,
+	},
+	"tray": {
+		"spacing": 5,
+	}
+}
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 61696d0..35737b4 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -54,7 +54,7 @@ window#waybar.PCSX2 #window {
 	margin-left: 3px;
 }
 
-#workspaces, #mpd, #battery, 
+#workspaces, #tags, #mpd, #battery, 
 #clock,
 #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
 	border: solid @background;
@@ -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;
-- 
cgit v1.2.3


From 6d4e211f9b45adf939c6e52fe4811e1385c7e8a2 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 17 Oct 2023 23:19:32 +0200
Subject: renamed mpassgen to mpwgen

---
 bin/menuscripts/mpassgen        | 23 -----------------------
 bin/menuscripts/mpwgen          | 23 +++++++++++++++++++++++
 config/hyprland/hypr/binds.conf |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100755 bin/menuscripts/mpassgen
 create mode 100755 bin/menuscripts/mpwgen

(limited to 'config')

diff --git a/bin/menuscripts/mpassgen b/bin/menuscripts/mpassgen
deleted file mode 100755
index 51b9bc4..0000000
--- a/bin/menuscripts/mpassgen
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env sh
-
-input () { commander -c -i -p "$1"; }
-
-choice="$(printf "multiline\nsingle\n" | commander -c -d)"
-[ "$choice" ] || exit 1
-
-password="$(input "name:")"
-[ "$password" ] || exit 1
-
-if [ "$choice" = "multiline" ]
-then
-	login="$(find "${PASSWORD_STORE_DIR:=$HOME/.password-store}"/e-mails -type f -maxdepth 1 -iname "*.gpg" -printf "%f\n" |
-		sed 's/\.gpg$//' | commander -c -d -p 'login:')"
-    [ "$login" ] || exit 1
-    url="$(input "url:")"
-    [ "$url" ] || exit 1
-    printf "%s\nlogin: %s\nurl: %s\n" "${password}" "${login}" "${url}" |
-		pass insert -mf "${password}"
-    pass generate -ci "${password}"
-else
-    pass generate -cf "${password}"
-fi
diff --git a/bin/menuscripts/mpwgen b/bin/menuscripts/mpwgen
new file mode 100755
index 0000000..51b9bc4
--- /dev/null
+++ b/bin/menuscripts/mpwgen
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+input () { commander -c -i -p "$1"; }
+
+choice="$(printf "multiline\nsingle\n" | commander -c -d)"
+[ "$choice" ] || exit 1
+
+password="$(input "name:")"
+[ "$password" ] || exit 1
+
+if [ "$choice" = "multiline" ]
+then
+	login="$(find "${PASSWORD_STORE_DIR:=$HOME/.password-store}"/e-mails -type f -maxdepth 1 -iname "*.gpg" -printf "%f\n" |
+		sed 's/\.gpg$//' | commander -c -d -p 'login:')"
+    [ "$login" ] || exit 1
+    url="$(input "url:")"
+    [ "$url" ] || exit 1
+    printf "%s\nlogin: %s\nurl: %s\n" "${password}" "${login}" "${url}" |
+		pass insert -mf "${password}"
+    pass generate -ci "${password}"
+else
+    pass generate -cf "${password}"
+fi
diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index 406c7ba..75b0d14 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -103,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
-- 
cgit v1.2.3


From 1543bf58aa4fd2719a1f788c0f2899099585adea Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 13:52:08 +0200
Subject: renamed softwaredesign2

---
 config/essentials/nvim/lua/user/zk.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'config')

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",
 		},
-- 
cgit v1.2.3


From eb683e1d4faaf5d573f067aee7c16f8b7b859eed Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 19:04:48 +0200
Subject: renamed hyprland to wayland

---
 config/hyprland/foot/foot.ini             | 174 -------------
 config/hyprland/gammastep/config.ini      |  11 -
 config/hyprland/hypr/binds.conf           | 144 -----------
 config/hyprland/hypr/env.conf             |  38 ---
 config/hyprland/hypr/hyprland.conf        |  95 -------
 config/hyprland/hypr/reset-submap.conf    | 398 ------------------------------
 config/hyprland/hypr/screenshot.sh        |  28 ---
 config/hyprland/hypr/startup.sh           |   8 -
 config/hyprland/tofi/themes/base16        |  25 --
 config/hyprland/tofi/themes/config        |   1 -
 config/hyprland/tofi/themes/dark-paper    |  18 --
 config/hyprland/tofi/themes/dmenu         |  16 --
 config/hyprland/tofi/themes/dos           |  14 --
 config/hyprland/tofi/themes/fullscreen    |  10 -
 config/hyprland/tofi/themes/nord          |  40 ---
 config/hyprland/waybar/colors/colors-nord |  29 ---
 config/hyprland/waybar/hyprland.jsonc     |  78 ------
 config/hyprland/waybar/schemes/base16.css | 183 --------------
 config/hyprland/waybar/schemes/nord.css   | 143 -----------
 config/hyprland/waybar/style.css          |   1 -
 config/wayland/foot/colors                |   1 +
 config/wayland/foot/foot.ini              | 174 +++++++++++++
 config/wayland/gammastep/config.ini       |  11 +
 config/wayland/hypr/binds.conf            | 144 +++++++++++
 config/wayland/hypr/env.conf              |  38 +++
 config/wayland/hypr/hyprland.conf         |  95 +++++++
 config/wayland/hypr/reset-submap.conf     | 398 ++++++++++++++++++++++++++++++
 config/wayland/hypr/screenshot.sh         |  28 +++
 config/wayland/hypr/startup.sh            |   9 +
 config/wayland/tofi/config                |   1 +
 config/wayland/tofi/themes/base16         |  25 ++
 config/wayland/tofi/themes/colors         |  14 ++
 config/wayland/tofi/themes/config         |   1 +
 config/wayland/tofi/themes/dark-paper     |  18 ++
 config/wayland/tofi/themes/dmenu          |  16 ++
 config/wayland/tofi/themes/dos            |  14 ++
 config/wayland/tofi/themes/fullscreen     |  10 +
 config/wayland/tofi/themes/nord           |  40 +++
 config/wayland/waybar/colors.css          |   1 +
 config/wayland/waybar/colors/colors-nord  |  29 +++
 config/wayland/waybar/config.jsonc        |   1 +
 config/wayland/waybar/hyprland.jsonc      |  78 ++++++
 config/wayland/waybar/schemes/base16.css  | 183 ++++++++++++++
 config/wayland/waybar/schemes/nord.css    | 143 +++++++++++
 config/wayland/waybar/style.css           |   1 +
 45 files changed, 1473 insertions(+), 1454 deletions(-)
 delete mode 100644 config/hyprland/foot/foot.ini
 delete mode 100644 config/hyprland/gammastep/config.ini
 delete mode 100644 config/hyprland/hypr/binds.conf
 delete mode 100644 config/hyprland/hypr/env.conf
 delete mode 100644 config/hyprland/hypr/hyprland.conf
 delete mode 100644 config/hyprland/hypr/reset-submap.conf
 delete mode 100755 config/hyprland/hypr/screenshot.sh
 delete mode 100755 config/hyprland/hypr/startup.sh
 delete mode 100644 config/hyprland/tofi/themes/base16
 delete mode 120000 config/hyprland/tofi/themes/config
 delete mode 100644 config/hyprland/tofi/themes/dark-paper
 delete mode 100644 config/hyprland/tofi/themes/dmenu
 delete mode 100644 config/hyprland/tofi/themes/dos
 delete mode 100644 config/hyprland/tofi/themes/fullscreen
 delete mode 100644 config/hyprland/tofi/themes/nord
 delete mode 100644 config/hyprland/waybar/colors/colors-nord
 delete mode 100644 config/hyprland/waybar/hyprland.jsonc
 delete mode 100644 config/hyprland/waybar/schemes/base16.css
 delete mode 100644 config/hyprland/waybar/schemes/nord.css
 delete mode 120000 config/hyprland/waybar/style.css
 create mode 120000 config/wayland/foot/colors
 create mode 100644 config/wayland/foot/foot.ini
 create mode 100644 config/wayland/gammastep/config.ini
 create mode 100644 config/wayland/hypr/binds.conf
 create mode 100644 config/wayland/hypr/env.conf
 create mode 100644 config/wayland/hypr/hyprland.conf
 create mode 100644 config/wayland/hypr/reset-submap.conf
 create mode 100755 config/wayland/hypr/screenshot.sh
 create mode 100755 config/wayland/hypr/startup.sh
 create mode 120000 config/wayland/tofi/config
 create mode 100644 config/wayland/tofi/themes/base16
 create mode 100644 config/wayland/tofi/themes/colors
 create mode 120000 config/wayland/tofi/themes/config
 create mode 100644 config/wayland/tofi/themes/dark-paper
 create mode 100644 config/wayland/tofi/themes/dmenu
 create mode 100644 config/wayland/tofi/themes/dos
 create mode 100644 config/wayland/tofi/themes/fullscreen
 create mode 100644 config/wayland/tofi/themes/nord
 create mode 120000 config/wayland/waybar/colors.css
 create mode 100644 config/wayland/waybar/colors/colors-nord
 create mode 120000 config/wayland/waybar/config.jsonc
 create mode 100644 config/wayland/waybar/hyprland.jsonc
 create mode 100644 config/wayland/waybar/schemes/base16.css
 create mode 100644 config/wayland/waybar/schemes/nord.css
 create mode 120000 config/wayland/waybar/style.css

(limited to 'config')

diff --git a/config/hyprland/foot/foot.ini b/config/hyprland/foot/foot.ini
deleted file mode 100644
index a1fc1e8..0000000
--- a/config/hyprland/foot/foot.ini
+++ /dev/null
@@ -1,174 +0,0 @@
-[main]
-include=~/.config/foot/colors
-
-# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
-term=xterm-256color
-# login-shell=no
-
-# app-id=foot
-title=""
-# locked-title=no
-
-font=monospace:size=10.5
-# font-bold=<bold variant of regular font>
-# font-italic=<italic variant of regular font>
-# font-bold-italic=<bold+italic variant of regular font>
-# line-height=<font metrics>
-# letter-spacing=0
-# horizontal-letter-offset=0
-# vertical-letter-offset=0
-# underline-offset=<font metrics>
-# box-drawings-uses-font-glyphs=no
-# dpi-aware=auto
-
-# initial-window-size-pixels=700x500  # Or,
-# initial-window-size-chars=<COLSxROWS>
-# initial-window-mode=windowed
-# pad=2x2                             # optionally append 'center'
-# resize-delay-ms=100
-
-# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body}
-
-# bold-text-in-bright=no
-# word-delimiters=,│`|:"'()[]{}<>
-# selection-target=primary
-# workers=<number of logical CPUs>
-
-[environment]
-# name=value
-
-[bell]
-# urgent=no
-# notify=no
-# command=
-# command-focused=no
-
-[scrollback]
-# lines=1000
-# multiplier=3.0
-# indicator-position=relative
-# indicator-format=
-
-[url]
-# launch=xdg-open ${url}
-# label-letters=sadfjklewcmpgh
-# osc8-underline=url-mode
-# protocols=http, https, ftp, ftps, file, gemini, gopher
-# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
-
-[cursor]
-# style=block
-# color=<inverse foreground/background>
-# blink=no
-# beam-thickness=1.5
-# underline-thickness=<font underline thickness>
-
-[mouse]
-# hide-when-typing=no
-# alternate-scroll-mode=yes
-
-[colors]
-alpha=0.90
-
-## dimmed colors (see foot.ini(5) man page)
-# dim0=<not set>
-# ...
-# dim7=<not-set>
-
-## The remaining 256-color palette
-# 16 = <256-color palette #16>
-# ...
-# 255 = <256-color palette #255>
-
-## Misc colors
-# selection-foreground=<inverse foreground/background>
-# selection-background=<inverse foreground/background>
-# jump-labels=<regular0> <regular3>          # black-on-yellow
-# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
-# search-box-no-match=<regular0> <regular1>  # black-on-red
-# search-box-match=<regular0> <regular3>     # black-on-yellow
-# urls=<regular3>
-
-[csd]
-# preferred=server
-# size=26
-# font=<primary font>
-# color=<foreground color>
-# hide-when-typing=no
-# border-width=0
-# border-color=<csd.color>
-# button-width=26
-# button-color=<background color>
-# button-minimize-color=<regular4>
-# button-maximize-color=<regular2>
-# button-close-color=<regular1>
-
-[key-bindings]
-# scrollback-up-page=Shift+Page_Up
-# scrollback-up-half-page=none
-# scrollback-up-line=none
-# scrollback-down-page=Shift+Page_Down
-# scrollback-down-half-page=none
-# scrollback-down-line=none
-# clipboard-copy=Control+Shift+c XF86Copy
-# clipboard-paste=Control+Shift+v XF86Paste
-# primary-paste=Shift+Insert
-search-start=Control+Shift+r
-# font-increase=Control+plus Control+equal Control+KP_Add
-# font-decrease=Control+minus Control+KP_Subtract
-# font-reset=Control+0 Control+KP_0
-# spawn-terminal=Control+Shift+n
-# minimize=none
-# maximize=none
-# fullscreen=none
-pipe-visible=[sh -c "cat > /tmp/footvisible"] Mod1+Shift+p
-# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
-# pipe-selected=[xargs -r firefox] none
-show-urls-launch=Control+Shift+u
-show-urls-copy=Mod1+Shift+l
-# show-urls-persistent=none
-# prompt-prev=Control+Shift+z
-# prompt-next=Control+Shift+x
-unicode-input=none
-# noop=none
-
-[search-bindings]
-# cancel=Control+g Control+c Escape
-# commit=Return
-# find-prev=Control+r
-# find-next=Control+s
-# cursor-left=Left Control+b
-# cursor-left-word=Control+Left Mod1+b
-# cursor-right=Right Control+f
-# cursor-right-word=Control+Right Mod1+f
-# cursor-home=Home Control+a
-# cursor-end=End Control+e
-# delete-prev=BackSpace
-# delete-prev-word=Mod1+BackSpace Control+BackSpace
-# delete-next=Delete
-# delete-next-word=Mod1+d Control+Delete
-# extend-to-word-boundary=Control+w
-# extend-to-next-whitespace=Control+Shift+w
-# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
-# primary-paste=Shift+Insert
-# unicode-input=none
-
-[url-bindings]
-# cancel=Control+g Control+c Control+d Escape
-# toggle-url-visible=t
-
-[text-bindings]
-# \x03=Mod4+c  # Map Super+c -> Ctrl+c
-
-[mouse-bindings]
-# selection-override-modifiers=Shift
-# primary-paste=BTN_MIDDLE
-# select-begin=BTN_LEFT
-# select-begin-block=Control+BTN_LEFT
-# select-extend=BTN_RIGHT
-# select-extend-character-wise=Control+BTN_RIGHT
-# select-word=BTN_LEFT-2
-# select-word-whitespace=Control+BTN_LEFT-2
-# select-row=BTN_LEFT-3
-
-# vim: ft=dosini
diff --git a/config/hyprland/gammastep/config.ini b/config/hyprland/gammastep/config.ini
deleted file mode 100644
index 3a80417..0000000
--- a/config/hyprland/gammastep/config.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-fade=0
-location-provider=manual
-adjustment-method=wayland
-gamma=0.8
-temp-day=5700
-temp-night=3600
-
-[manual]
-lat=50
-lon=4
diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
deleted file mode 100644
index 75b0d14..0000000
--- a/config/hyprland/hypr/binds.conf
+++ /dev/null
@@ -1,144 +0,0 @@
-$mainMod = SUPER
-
-$term = foot
-
-$menu = $(commander -r -h)
-
-bind = $mainMod, Return, exec, $term
-bind = $mainMod SHIFT, Return, exec, $menu
-bind = $mainMod, C, killactive, 
-bind = $mainMod SHIFT, C, exec, hyprctl kill
-bind = $mainMod SHIFT, Q, exit, 
-bind = $mainMod, F, togglefloating, 
-bind = $mainMod SHIFT, P, pseudo
-bind = $mainMod, S, togglesplit
-
-bind = $mainMod, E, focusmonitor, +1
-bind = $mainMod, W, focusmonitor, -1
-binde = $mainMod, H, movefocus, l
-binde = $mainMod, J, movefocus, d
-binde = $mainMod, K, movefocus, u
-binde = $mainMod, L, movefocus, r
-binde = $mainMod, SPACE, swapnext
-bind = $mainMod SHIFT, E, movewindow, mon:+1
-bind = $mainMod SHIFT, W, movewindow, mon:-1
-bind = $mainMod CTRL, E, movewindow, mon:+1
-bind = $mainMod CTRL, E, focusmonitor, -1
-bind = $mainMod CTRL, W, movewindow, mon:-1
-bind = $mainMod CTRL, W, focusmonitor, +1
-
-binde = $mainMod SHIFT, H, resizeactive, -60 0
-binde = $mainMod SHIFT, J, resizeactive, 0 60
-binde = $mainMod SHIFT, K, resizeactive, 0 -60
-binde = $mainMod SHIFT, L, resizeactive, 60 0
-
-bind = $mainMod SHIFT, F, fullscreen
-bind = $mainMod CTRL, F, fakefullscreen
-
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-
-bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
-bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
-bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
-bind = $mainMod CTRL, 4, movetoworkspacesilent, 4
-bind = $mainMod CTRL, 5, movetoworkspacesilent, 5
-bind = $mainMod CTRL, 6, movetoworkspacesilent, 6
-bind = $mainMod CTRL, 7, movetoworkspacesilent, 7
-bind = $mainMod CTRL, 8, movetoworkspacesilent, 8
-bind = $mainMod CTRL, 9, movetoworkspacesilent, 9
-
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-bind = $mainMod, A, submap, apps
-submap = apps
-bind = $mainMod, D, exec, discord
-bind = , D, exec, discord
-bind = $mainMod, B, exec, $BROWSER
-bind = , B, exec, $BROWSER
-bind = $mainMod, G, exec, gml
-bind = , G, exec, gml
-source = ./reset-submap.conf
-submap = reset
-
-bind = $mainMod, T, submap, termapps
-submap = termapps
-bind = $mainMod, T, exec, $term -e tmux a || tmux
-bind = , T, exec, $term -e tmux a || tmux
-bind = $mainMod, D, exec, foot -e ssh -t db tmux a
-bind = , D, exec, foot -e ssh -t db tmux a
-source = ./reset-submap.conf
-submap = reset
-
-bind = $mainMod, M, submap, menuscripts
-submap = menuscripts
-bind = $mainMod, A, exec, dmask
-bind =, A, exec, dmask
-bind = $mainMod, C, exec, copyhist
-bind =, C, exec, copyhist
-bind = $mainMod, D, exec, mdsktp
-bind =, D, exec, mdsktp
-bind = $mainMod, E, exec, memoji
-bind =, E, exec, memoji
-bind = $mainMod, F, exec, dmfm
-bind =, F, exec, dmfm
-bind = $mainMod, G, exec, mpwgen
-bind =, G, exec, mpwgen
-bind = $mainMod, H, exec, mhelp
-bind =, H, exec, mhelp
-bind = $mainMod, I, exec, mapimg
-bind =, I, exec, mapimg
-bind = $mainMod, L, exec, dmlang
-bind =, L, exec, dmlang
-bind = $mainMod, S, exec, mmedia schoolpdf
-bind =, S, exec, mmedia schoolpdf
-bind = $mainMod, V, exec, mmedia video
-bind =, V, exec, mmedia video
-bind = $mainMod, U, exec, mmedia cursus
-bind =, U, exec, mmedia cursus
-bind = $mainMod, M, exec, mmedia
-bind =, M, exec, mmedia
-bind = $mainMod, P, exec, mpass
-bind =, P, exec, mpass
-bind = $mainMod, O, exec, mpower
-bind =, O, exec, mpower
-source = ./reset-submap.conf
-submap = reset
-
-bind = $mainMod SHIFT, M, exec, mplay
-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 =, XF86MonBrightnessUp, exec, light -A 5
-bind =, XF86MonBrightnessDown, exec, light -U 5
-
-bind = $mainMod SHIFT, B, exec, killall waybar; waybar
-
-bind = $mainMod ALT, S, exec, $HOME/.config/hypr/screenshot.sh -m
-bind = $mainMod SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -sc
-bind = $mainMod ALT SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -s
-bind = $mainMod CTRL, S, exec, $HOME/.config/hypr/screenshot.sh -f
diff --git a/config/hyprland/hypr/env.conf b/config/hyprland/hypr/env.conf
deleted file mode 100644
index 5c4f56a..0000000
--- a/config/hyprland/hypr/env.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Environment variables
-env = HYPRLAND_LOG_WLR,1
-
-env = XCURSOR_THEME,Bibata-Modern-Classic
-env = XCURSOR_SIZE,24
-
-env = GTK_THEME,Arc-Dark
-
-env = GTK_IM_MODULE,fcitx
-env = XMODIFIERS,@im=fcitx
-env = GLFW_IM_MODULE,ibus
-
-env = MOZ_ENABLE_WAYLAND,1
-
-env = QT_IM_MODULE,fcitx
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt5ct
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-env = SDL_IM_MODULE,fcitx
-env = SDL_VIDEODRIVER,wayland
-env = CLUTTER_BACKEND,wayland
-
-env = TERMINAL,foot
-env = MENUCMD,tofi
-env = 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
diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf
deleted file mode 100644
index 9eb0549..0000000
--- a/config/hyprland/hypr/hyprland.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-monitor=HDMI-A-4, 1920x1080, 0x0, 1
-monitor=VGA-1, 1920x1080, 1920x0, 1
-monitor=,preferred,auto,1
-
-source = ./env.conf
-
-exec-once = $HOME/.config/hypr/startup.sh
-
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options = ctrl:nocaps
-    kb_rules =
-
-    follow_mouse = 2
-
-    touchpad {
-        natural_scroll = no
-    }
-
-    sensitivity = 0
-}
-
-general {
-    gaps_in = 1
-    gaps_out = 3
-    border_size = 2
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
-
-    layout = dwindle
-
-	cursor_inactive_timeout = 0
-}
-
-misc {
-	disable_hyprland_logo = true
-	enable_swallow = true
-	swallow_regex = foot
-}
-
-decoration {
-    rounding = 0
-	blur {
-		enabled = 1
-		size = 6
-	}
-	dim_inactive = true
-	dim_strength = 0.08
-
-	active_opacity = 0.98
-	inactive_opacity = 0.92
-
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-}
-
-animations {
-    enabled = yes
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
-
-dwindle {
-    pseudotile = yes
-    preserve_split = yes
-	force_split = 1
-}
-
-master {
-    new_is_master = false
-}
-
-gestures {
-    workspace_swipe = on
-}
-
-windowrulev2 = noanim, class:^(.*[Pp]inentry.*)$
-
-windowrulev2 = float, class:feh|imv|$(.*[pP]inentry.*)$
-
-windowrulev2 = noanim, class:dmenu
-
-layerrule = noanim, launcher
-
-source = ./binds.conf
diff --git a/config/hyprland/hypr/reset-submap.conf b/config/hyprland/hypr/reset-submap.conf
deleted file mode 100644
index d10ac3b..0000000
--- a/config/hyprland/hypr/reset-submap.conf
+++ /dev/null
@@ -1,398 +0,0 @@
-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/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/hypr/startup.sh b/config/hyprland/hypr/startup.sh
deleted file mode 100755
index 8887cf2..0000000
--- a/config/hyprland/hypr/startup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-swaybg -i ~/pics/wallpaper &
-waybar &
-gammastep &
-wl-paste --watch cliphist store &
-keyadd id_rsa &
-swayidle 300 locker &
-$TERMINAL -e tmux a || $TERMINAL tmux &
diff --git a/config/hyprland/tofi/themes/base16 b/config/hyprland/tofi/themes/base16
deleted file mode 100644
index b18efb4..0000000
--- a/config/hyprland/tofi/themes/base16
+++ /dev/null
@@ -1,25 +0,0 @@
-### Font
-include=themes/colors
-font = monospace bold
-font-size = 12
-
-prompt-text = ""
-prompt-padding = 0
-placeholder-text = "..."
-
-width = 20%
-height = 20%
-outline-width = 0
-border-width = 2
-corner-radius = 26
-
-padding-top = 0
-padding-bottom = 0
-padding-left = 0
-# padding-left = 7%
-padding-right = 0
-
-matching-algorithm = prefix
-require-match = false
-auto-accept-single = true
-hidden-character = ""
diff --git a/config/hyprland/tofi/themes/config b/config/hyprland/tofi/themes/config
deleted file mode 120000
index 953d912..0000000
--- a/config/hyprland/tofi/themes/config
+++ /dev/null
@@ -1 +0,0 @@
-/home/aluc/.config/tofi/themes//
\ No newline at end of file
diff --git a/config/hyprland/tofi/themes/dark-paper b/config/hyprland/tofi/themes/dark-paper
deleted file mode 100644
index c58b292..0000000
--- a/config/hyprland/tofi/themes/dark-paper
+++ /dev/null
@@ -1,18 +0,0 @@
-font = Fanwood Text
-font-size = 64
-
-outline-width = 0
-border-width = 0
-padding-left = 4%
-padding-top = 2%
-padding-right = 0
-padding-bottom = 0
-
-background-color = #111
-text-color = #f9fbff
-selection-color = #933
-
-width = 100%
-height = 100%
-
-hide-cursor = true
diff --git a/config/hyprland/tofi/themes/dmenu b/config/hyprland/tofi/themes/dmenu
deleted file mode 100644
index 55a23d9..0000000
--- a/config/hyprland/tofi/themes/dmenu
+++ /dev/null
@@ -1,16 +0,0 @@
-anchor = top
-width = 100%
-height = 30
-horizontal = true
-font-size = 14
-prompt-text = " run: "
-font = monospace
-outline-width = 0
-border-width = 0
-background-color = #000000
-min-input-width = 120
-result-spacing = 15
-padding-top = 0
-padding-bottom = 0
-padding-left = 0
-padding-right = 0
diff --git a/config/hyprland/tofi/themes/dos b/config/hyprland/tofi/themes/dos
deleted file mode 100644
index 7c2fff5..0000000
--- a/config/hyprland/tofi/themes/dos
+++ /dev/null
@@ -1,14 +0,0 @@
-font = VT323
-corner-radius = 60
-outline-color = #D3D1B9
-outline-width = 3
-border-color = #E3E1C9
-border-width = 60
-background-color = #000000
-text-color = #0A3
-selection-color = #0F6
-prompt-text = "C:\> "
-num-results = 9
-hide-cursor = true
-width = 640
-height = 480
diff --git a/config/hyprland/tofi/themes/fullscreen b/config/hyprland/tofi/themes/fullscreen
deleted file mode 100644
index aa3a2cd..0000000
--- a/config/hyprland/tofi/themes/fullscreen
+++ /dev/null
@@ -1,10 +0,0 @@
-width = 100%
-height = 100%
-border-width = 0
-outline-width = 0
-padding-left = 35%
-padding-top = 35%
-result-spacing = 25
-num-results = 5
-font = monospace
-background-color = #000A
diff --git a/config/hyprland/tofi/themes/nord b/config/hyprland/tofi/themes/nord
deleted file mode 100644
index c8a6192..0000000
--- a/config/hyprland/tofi/themes/nord
+++ /dev/null
@@ -1,40 +0,0 @@
-### Font
-font = monospace bold
-font-size = 12
-anchor=top
-
-# colors
-text-color = #d8dee9
-prompt-color = #81a1c1
-placeholder-color = #4c566a
-input-color = #d8dee9
-default-result-color = #88c0d0
-selection-color = #5e81ac
-selection-match-color = #ffffff
-background-color = #3b4252f2
-outline-color = #81a1c1
-border-color = #88c0d0
-
-# sizes
-width = 100%
-height = 20%
-
-border-width = 2
-outline-width = 0
-prompt-padding = 0
-
-padding-top = 5
-padding-bottom = 5
-padding-left = 5
-padding-right = 5
-
-corner-radius = 0
-
-# general
-prompt-text = ""
-placeholder-text = "..."
-
-matching-algorithm = prefix
-require-match = false
-auto-accept-single = true
-hidden-character = ""
diff --git a/config/hyprland/waybar/colors/colors-nord b/config/hyprland/waybar/colors/colors-nord
deleted file mode 100644
index 9622792..0000000
--- a/config/hyprland/waybar/colors/colors-nord
+++ /dev/null
@@ -1,29 +0,0 @@
-@define-color foreground #d8dee9;
-@define-color background #2e3440;
-
-@define-color color0 #3b4252;
-@define-color color1 #bf616a;
-@define-color color2 #a3be8c;
-@define-color color3 #ebcb8b;
-@define-color color4 #81a1c1;
-@define-color color5 #b48ead;
-@define-color color6 #88c0d0;
-@define-color color7 #e5e9f0;
-
-@define-color color8 #4c566a;
-@define-color color9 #bf616a;
-@define-color color10 #a3be8c;
-@define-color color11 #ebcb8b;
-@define-color color12 #81a1c1;
-@define-color color13 #b48ead;
-@define-color color14 #d08770;
-@define-color color15 #eceff4;
-
-@define-color color16 #373e4d;
-@define-color color17 #94545d;
-@define-color color18 #809575;
-@define-color color19 #b29e75;
-@define-color color20 #68809a;
-@define-color color21 #8c738c;
-@define-color color22 #6d96a5;
-@define-color color23 #aeb3bb;
diff --git a/config/hyprland/waybar/hyprland.jsonc b/config/hyprland/waybar/hyprland.jsonc
deleted file mode 100644
index cd24d14..0000000
--- a/config/hyprland/waybar/hyprland.jsonc
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-	"layer": "top",
-	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
-	"modules-center": ["clock"],
-	"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,
-		"format-disconnected": "s",
-		"format-stopped": "",
-		"state-icons": {
-			"playing": "",
-			"paused": "",
-		},
-		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
-		"on-click": "mpc toggle",
-		"on-scroll-up": "mpc volume +5",
-		"on-scroll-down": "mpc volume -5",
-	},
-	"battery": {
-		"format-charging": " {capacity}%",
-		"on-click": "mpower",
-		"interval": 10,
-	},
-	"hyprland/window": {
-		"format": "{}",
-		"separate-outputs": true,
-	},
-	"pulseaudio": {
-		"scroll-step": 1,
-		"format": "{icon} {volume:3}%",
-		"format-icons": {
-			"default": ["", "", ""]
-		},
-		"on-click": "pavucontrol",
-	},
-	"temperature": {
-		"interval": 3,
-		"format": "{icon} {temperatureC}°C",
-		"format-icons": {
-			"default":["", "", "", "", ""]
-		},
-	},
-	"custom/wireguard": {
-		"exec": "ip addr show dev wg0",
-		"format": "wg0",
-		"restart-interval": 3,
-	},
-	"network": {
-		"format-wifi": " ",
-		"tooltip-format-wifi": "{ifname} {essid}",
-		"format-ethernet": "",
-		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "",
-	},
-	"cpu": {
-		"format": " {usage:2}%",
-		"interval": 3,
-	},
-	"custom/memory": {
-		"exec": "free -h | awk '(NR==2){ print $3 }'",
-		"format": "{}",
-		"restart-interval": 3,
-	},
-	"clock": {
-		"format": "{:%R}",
-		"format-alt": "{:(%T) %A %d %B}",
-		"interval": 1,
-	},
-	"custom/bluetooth": {
-		"exec": "bluetoothctl info",
-		"format": "",
-		"interval": 3,
-	},
-	"tray": {
-		"spacing": 5,
-	}
-}
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
deleted file mode 100644
index 35737b4..0000000
--- a/config/hyprland/waybar/schemes/base16.css
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-@import "colors.css";
-
-* {
-	border: none;
-	border-radius: 0;
-	font-family: monospace;
-	font-weight: bold;
-	font-size: 14px;
-	min-height: 24px;
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.hidden {
-	opacity: 0.2;
-}
-
-tooltip {
-	background: @background;
-	color: @foreground;
-	border: 2px solid @color0;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: @background;
-	background: @color7;
-}
-
-.modules-right * {
-	padding: 0 16px;
-}
-
-.modules-right {
-	margin-right: 2px;
-}
-.modules-left {
-	margin-left: 3px;
-}
-
-#workspaces, #tags, #mpd, #battery, 
-#clock,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
-	border: solid @background;
-	border-width: 2px 2px 2px 0;
-	margin-top: 4px;
-	margin-bottom: 2px;
-	transition: none;
-}
-
-#battery {
-	color: @color6;
-	background: @background;
-	border-color: @color4;
-	border-width: 2px;
-	padding: 0 12px;
-	margin-right: 16px;
-}
-
-#workspaces, #tags {
-	border: solid @background 2px;
-	background: @color3;
-}
-
-#workspaces button, #tags button {
-	transition: none;
-	background: transparent;
-	color: @background;
-}
-
-#tags button.occupied {
-	background: @color2;
-}
-
-#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;
-	background: @color6;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
-	color: @foreground;
-	background: @background;
-	border-color: @color4;
-}
-
-#clock {
-	border: solid @color4 2px;
-	padding: 0 16px;
-	color: @color3;
-	background: @background;
-}
-
-#window {
-	margin-left: 16px;
-	padding: 0;
-	color: @color5;
-}
-
-#custom-wireguard {
-	color: @color5;
-	border: 2px solid @color8;
-	background: @background;
-}
-
-#network {
-	color: @background;
-	border-left: 2px solid @background;
-	background: @color5;
-}
-
-#pulseaudio {
-	color: @background;
-	background: @color4;
-}
-
-#temperature {
-	color: @background;
-	background: @color3;
-}
-
-#cpu {
-	color: @background;
-	background: @color4;
-}
-
-#custom-memory {
-	padding: 0 16px;
-	color: @background;
-	background: @color5;
-}
-
-#custom-bluetooth {
-	color: @color6;
-	background: @color8;
-}
-
-#tray * {
-	padding: unset;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: @color1;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
diff --git a/config/hyprland/waybar/schemes/nord.css b/config/hyprland/waybar/schemes/nord.css
deleted file mode 100644
index efd0e81..0000000
--- a/config/hyprland/waybar/schemes/nord.css
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-* {
-	border: none;
-	border-radius: 0;
-	font-family: JetBrains Mono;
-	font-weight: bold;
-	font-size: 14px;
-	min-height: 24px;
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.hidden {
-	opacity: 0.2;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: #2e3440;
-	background: #e6e6e6;
-}
-
-#mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory {
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
-}
-
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
-	margin-top: 4px;
-	margin-bottom: 2px;
-	transition: none;
-}
-
-#battery {
-	color: #b48ead;
-	background: #4c566a;
-}
-
-#workspaces {
-	margin-left: 12px;
-	border-radius: 26px;
-	background: #2e3440;
-}
-
-#workspaces button {
-	transition: none;
-	color: #d8dee9;
-	background: transparent;
-	font-size: 16px;
-}
-
-#workspaces button.active {
-	color: #5e81ac;
-}
-
-#workspaces button:hover {
-	transition: none;
-	color: #d08770;
-}
-
-#mpd {
-	color: #2e3440;
-	background: #88c0d0;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
-	color: #d8dee9;
-	background: #2e3440;
-}
-
-#window {
-	color: #88c0d0;
-}
-
-#network {
-	color: #2e3440;
-	background: #5e81ac;
-}
-
-#pulseaudio {
-	color: #2e3440;
-	background: #b48ead;
-}
-
-#temperature {
-	color: #2e3440;
-	background: #d08770;
-}
-
-#cpu {
-	color: #2e3440;
-	background: #ebcb8b;
-}
-
-#custom-memory {
-	color: #2e3440;
-	background: #a3be8c;
-}
-
-#clock {
-	margin-left: 8px;
-	margin-right: 12px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
-	color: #d8dee9;
-	background: #2e3440;
-}
-
-#tray {
-	margin-right: 12px;
-	color: #d8dee9;
-	background: transparent;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #bf616a;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
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/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/wayland/foot/foot.ini b/config/wayland/foot/foot.ini
new file mode 100644
index 0000000..00e7a37
--- /dev/null
+++ b/config/wayland/foot/foot.ini
@@ -0,0 +1,174 @@
+[main]
+include=~/.config/foot/colors
+
+# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
+term=xterm-256color
+# login-shell=no
+
+# app-id=foot
+title=""
+# locked-title=no
+
+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>
+# line-height=<font metrics>
+# letter-spacing=0
+# horizontal-letter-offset=0
+# vertical-letter-offset=0
+# underline-offset=<font metrics>
+# box-drawings-uses-font-glyphs=no
+# dpi-aware=auto
+
+# initial-window-size-pixels=700x500  # Or,
+# initial-window-size-chars=<COLSxROWS>
+# initial-window-mode=windowed
+# pad=2x2                             # optionally append 'center'
+# resize-delay-ms=100
+
+# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body}
+
+# bold-text-in-bright=no
+# word-delimiters=,│`|:"'()[]{}<>
+# selection-target=primary
+# workers=<number of logical CPUs>
+
+[environment]
+# name=value
+
+[bell]
+# urgent=no
+# notify=no
+# command=
+# command-focused=no
+
+[scrollback]
+# lines=1000
+# multiplier=3.0
+# indicator-position=relative
+# indicator-format=
+
+[url]
+# launch=xdg-open ${url}
+# label-letters=sadfjklewcmpgh
+# osc8-underline=url-mode
+# protocols=http, https, ftp, ftps, file, gemini, gopher
+# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
+
+[cursor]
+# style=block
+# color=<inverse foreground/background>
+# blink=no
+# beam-thickness=1.5
+# underline-thickness=<font underline thickness>
+
+[mouse]
+# hide-when-typing=no
+# alternate-scroll-mode=yes
+
+[colors]
+alpha=0.90
+
+## dimmed colors (see foot.ini(5) man page)
+# dim0=<not set>
+# ...
+# dim7=<not-set>
+
+## The remaining 256-color palette
+# 16 = <256-color palette #16>
+# ...
+# 255 = <256-color palette #255>
+
+## Misc colors
+# selection-foreground=<inverse foreground/background>
+# selection-background=<inverse foreground/background>
+# jump-labels=<regular0> <regular3>          # black-on-yellow
+# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
+# search-box-no-match=<regular0> <regular1>  # black-on-red
+# search-box-match=<regular0> <regular3>     # black-on-yellow
+# urls=<regular3>
+
+[csd]
+# preferred=server
+# size=26
+# font=<primary font>
+# color=<foreground color>
+# hide-when-typing=no
+# border-width=0
+# border-color=<csd.color>
+# button-width=26
+# button-color=<background color>
+# button-minimize-color=<regular4>
+# button-maximize-color=<regular2>
+# button-close-color=<regular1>
+
+[key-bindings]
+# scrollback-up-page=Shift+Page_Up
+# scrollback-up-half-page=none
+# scrollback-up-line=none
+# scrollback-down-page=Shift+Page_Down
+# scrollback-down-half-page=none
+# scrollback-down-line=none
+# clipboard-copy=Control+Shift+c XF86Copy
+# clipboard-paste=Control+Shift+v XF86Paste
+# primary-paste=Shift+Insert
+search-start=Control+Shift+r
+# font-increase=Control+plus Control+equal Control+KP_Add
+# font-decrease=Control+minus Control+KP_Subtract
+# font-reset=Control+0 Control+KP_0
+# spawn-terminal=Control+Shift+n
+# minimize=none
+# maximize=none
+# fullscreen=none
+pipe-visible=[sh -c "cat > /tmp/footvisible"] Mod1+Shift+p
+# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-selected=[xargs -r firefox] none
+show-urls-launch=Control+Shift+u
+show-urls-copy=Mod1+Shift+l
+# show-urls-persistent=none
+# prompt-prev=Control+Shift+z
+# prompt-next=Control+Shift+x
+unicode-input=none
+# noop=none
+
+[search-bindings]
+# cancel=Control+g Control+c Escape
+# commit=Return
+# find-prev=Control+r
+# find-next=Control+s
+# cursor-left=Left Control+b
+# cursor-left-word=Control+Left Mod1+b
+# cursor-right=Right Control+f
+# cursor-right-word=Control+Right Mod1+f
+# cursor-home=Home Control+a
+# cursor-end=End Control+e
+# delete-prev=BackSpace
+# delete-prev-word=Mod1+BackSpace Control+BackSpace
+# delete-next=Delete
+# delete-next-word=Mod1+d Control+Delete
+# extend-to-word-boundary=Control+w
+# extend-to-next-whitespace=Control+Shift+w
+# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
+# primary-paste=Shift+Insert
+# unicode-input=none
+
+[url-bindings]
+# cancel=Control+g Control+c Control+d Escape
+# toggle-url-visible=t
+
+[text-bindings]
+# \x03=Mod4+c  # Map Super+c -> Ctrl+c
+
+[mouse-bindings]
+# selection-override-modifiers=Shift
+# primary-paste=BTN_MIDDLE
+# select-begin=BTN_LEFT
+# select-begin-block=Control+BTN_LEFT
+# select-extend=BTN_RIGHT
+# select-extend-character-wise=Control+BTN_RIGHT
+# select-word=BTN_LEFT-2
+# select-word-whitespace=Control+BTN_LEFT-2
+# select-row=BTN_LEFT-3
+
+# vim: ft=dosini
diff --git a/config/wayland/gammastep/config.ini b/config/wayland/gammastep/config.ini
new file mode 100644
index 0000000..3a80417
--- /dev/null
+++ b/config/wayland/gammastep/config.ini
@@ -0,0 +1,11 @@
+[general]
+fade=0
+location-provider=manual
+adjustment-method=wayland
+gamma=0.8
+temp-day=5700
+temp-night=3600
+
+[manual]
+lat=50
+lon=4
diff --git a/config/wayland/hypr/binds.conf b/config/wayland/hypr/binds.conf
new file mode 100644
index 0000000..75b0d14
--- /dev/null
+++ b/config/wayland/hypr/binds.conf
@@ -0,0 +1,144 @@
+$mainMod = SUPER
+
+$term = foot
+
+$menu = $(commander -r -h)
+
+bind = $mainMod, Return, exec, $term
+bind = $mainMod SHIFT, Return, exec, $menu
+bind = $mainMod, C, killactive, 
+bind = $mainMod SHIFT, C, exec, hyprctl kill
+bind = $mainMod SHIFT, Q, exit, 
+bind = $mainMod, F, togglefloating, 
+bind = $mainMod SHIFT, P, pseudo
+bind = $mainMod, S, togglesplit
+
+bind = $mainMod, E, focusmonitor, +1
+bind = $mainMod, W, focusmonitor, -1
+binde = $mainMod, H, movefocus, l
+binde = $mainMod, J, movefocus, d
+binde = $mainMod, K, movefocus, u
+binde = $mainMod, L, movefocus, r
+binde = $mainMod, SPACE, swapnext
+bind = $mainMod SHIFT, E, movewindow, mon:+1
+bind = $mainMod SHIFT, W, movewindow, mon:-1
+bind = $mainMod CTRL, E, movewindow, mon:+1
+bind = $mainMod CTRL, E, focusmonitor, -1
+bind = $mainMod CTRL, W, movewindow, mon:-1
+bind = $mainMod CTRL, W, focusmonitor, +1
+
+binde = $mainMod SHIFT, H, resizeactive, -60 0
+binde = $mainMod SHIFT, J, resizeactive, 0 60
+binde = $mainMod SHIFT, K, resizeactive, 0 -60
+binde = $mainMod SHIFT, L, resizeactive, 60 0
+
+bind = $mainMod SHIFT, F, fullscreen
+bind = $mainMod CTRL, F, fakefullscreen
+
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+
+bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
+bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
+bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
+bind = $mainMod CTRL, 4, movetoworkspacesilent, 4
+bind = $mainMod CTRL, 5, movetoworkspacesilent, 5
+bind = $mainMod CTRL, 6, movetoworkspacesilent, 6
+bind = $mainMod CTRL, 7, movetoworkspacesilent, 7
+bind = $mainMod CTRL, 8, movetoworkspacesilent, 8
+bind = $mainMod CTRL, 9, movetoworkspacesilent, 9
+
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+bind = $mainMod, A, submap, apps
+submap = apps
+bind = $mainMod, D, exec, discord
+bind = , D, exec, discord
+bind = $mainMod, B, exec, $BROWSER
+bind = , B, exec, $BROWSER
+bind = $mainMod, G, exec, gml
+bind = , G, exec, gml
+source = ./reset-submap.conf
+submap = reset
+
+bind = $mainMod, T, submap, termapps
+submap = termapps
+bind = $mainMod, T, exec, $term -e tmux a || tmux
+bind = , T, exec, $term -e tmux a || tmux
+bind = $mainMod, D, exec, foot -e ssh -t db tmux a
+bind = , D, exec, foot -e ssh -t db tmux a
+source = ./reset-submap.conf
+submap = reset
+
+bind = $mainMod, M, submap, menuscripts
+submap = menuscripts
+bind = $mainMod, A, exec, dmask
+bind =, A, exec, dmask
+bind = $mainMod, C, exec, copyhist
+bind =, C, exec, copyhist
+bind = $mainMod, D, exec, mdsktp
+bind =, D, exec, mdsktp
+bind = $mainMod, E, exec, memoji
+bind =, E, exec, memoji
+bind = $mainMod, F, exec, dmfm
+bind =, F, exec, dmfm
+bind = $mainMod, G, exec, mpwgen
+bind =, G, exec, mpwgen
+bind = $mainMod, H, exec, mhelp
+bind =, H, exec, mhelp
+bind = $mainMod, I, exec, mapimg
+bind =, I, exec, mapimg
+bind = $mainMod, L, exec, dmlang
+bind =, L, exec, dmlang
+bind = $mainMod, S, exec, mmedia schoolpdf
+bind =, S, exec, mmedia schoolpdf
+bind = $mainMod, V, exec, mmedia video
+bind =, V, exec, mmedia video
+bind = $mainMod, U, exec, mmedia cursus
+bind =, U, exec, mmedia cursus
+bind = $mainMod, M, exec, mmedia
+bind =, M, exec, mmedia
+bind = $mainMod, P, exec, mpass
+bind =, P, exec, mpass
+bind = $mainMod, O, exec, mpower
+bind =, O, exec, mpower
+source = ./reset-submap.conf
+submap = reset
+
+bind = $mainMod SHIFT, M, exec, mplay
+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 =, XF86MonBrightnessUp, exec, light -A 5
+bind =, XF86MonBrightnessDown, exec, light -U 5
+
+bind = $mainMod SHIFT, B, exec, killall waybar; waybar
+
+bind = $mainMod ALT, S, exec, $HOME/.config/hypr/screenshot.sh -m
+bind = $mainMod SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -sc
+bind = $mainMod ALT SHIFT, S, exec, $HOME/.config/hypr/screenshot.sh -s
+bind = $mainMod CTRL, S, exec, $HOME/.config/hypr/screenshot.sh -f
diff --git a/config/wayland/hypr/env.conf b/config/wayland/hypr/env.conf
new file mode 100644
index 0000000..5c4f56a
--- /dev/null
+++ b/config/wayland/hypr/env.conf
@@ -0,0 +1,38 @@
+# Environment variables
+env = HYPRLAND_LOG_WLR,1
+
+env = XCURSOR_THEME,Bibata-Modern-Classic
+env = XCURSOR_SIZE,24
+
+env = GTK_THEME,Arc-Dark
+
+env = GTK_IM_MODULE,fcitx
+env = XMODIFIERS,@im=fcitx
+env = GLFW_IM_MODULE,ibus
+
+env = MOZ_ENABLE_WAYLAND,1
+
+env = QT_IM_MODULE,fcitx
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland;xcb
+env = QT_QPA_PLATFORMTHEME,qt5ct
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+
+env = SDL_IM_MODULE,fcitx
+env = SDL_VIDEODRIVER,wayland
+env = CLUTTER_BACKEND,wayland
+
+env = TERMINAL,foot
+env = MENUCMD,tofi
+env = 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
diff --git a/config/wayland/hypr/hyprland.conf b/config/wayland/hypr/hyprland.conf
new file mode 100644
index 0000000..9eb0549
--- /dev/null
+++ b/config/wayland/hypr/hyprland.conf
@@ -0,0 +1,95 @@
+monitor=HDMI-A-4, 1920x1080, 0x0, 1
+monitor=VGA-1, 1920x1080, 1920x0, 1
+monitor=,preferred,auto,1
+
+source = ./env.conf
+
+exec-once = $HOME/.config/hypr/startup.sh
+
+input {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options = ctrl:nocaps
+    kb_rules =
+
+    follow_mouse = 2
+
+    touchpad {
+        natural_scroll = no
+    }
+
+    sensitivity = 0
+}
+
+general {
+    gaps_in = 1
+    gaps_out = 3
+    border_size = 2
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    layout = dwindle
+
+	cursor_inactive_timeout = 0
+}
+
+misc {
+	disable_hyprland_logo = true
+	enable_swallow = true
+	swallow_regex = foot
+}
+
+decoration {
+    rounding = 0
+	blur {
+		enabled = 1
+		size = 6
+	}
+	dim_inactive = true
+	dim_strength = 0.08
+
+	active_opacity = 0.98
+	inactive_opacity = 0.92
+
+    drop_shadow = yes
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
+}
+
+animations {
+    enabled = yes
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+dwindle {
+    pseudotile = yes
+    preserve_split = yes
+	force_split = 1
+}
+
+master {
+    new_is_master = false
+}
+
+gestures {
+    workspace_swipe = on
+}
+
+windowrulev2 = noanim, class:^(.*[Pp]inentry.*)$
+
+windowrulev2 = float, class:feh|imv|$(.*[pP]inentry.*)$
+
+windowrulev2 = noanim, class:dmenu
+
+layerrule = noanim, launcher
+
+source = ./binds.conf
diff --git a/config/wayland/hypr/reset-submap.conf b/config/wayland/hypr/reset-submap.conf
new file mode 100644
index 0000000..d10ac3b
--- /dev/null
+++ b/config/wayland/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/wayland/hypr/screenshot.sh b/config/wayland/hypr/screenshot.sh
new file mode 100755
index 0000000..694e099
--- /dev/null
+++ b/config/wayland/hypr/screenshot.sh
@@ -0,0 +1,28 @@
+#!/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/wayland/hypr/startup.sh b/config/wayland/hypr/startup.sh
new file mode 100755
index 0000000..4b65908
--- /dev/null
+++ b/config/wayland/hypr/startup.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+swaybg -i ~/pics/wallpaper &
+waybar &
+gammastep &
+wl-paste --watch cliphist store &
+keyadd id_rsa &
+swayidle 300 locker &
+mako &
+$TERMINAL -e tmux a || $TERMINAL tmux &
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/wayland/tofi/themes/base16 b/config/wayland/tofi/themes/base16
new file mode 100644
index 0000000..b18efb4
--- /dev/null
+++ b/config/wayland/tofi/themes/base16
@@ -0,0 +1,25 @@
+### Font
+include=themes/colors
+font = monospace bold
+font-size = 12
+
+prompt-text = ""
+prompt-padding = 0
+placeholder-text = "..."
+
+width = 20%
+height = 20%
+outline-width = 0
+border-width = 2
+corner-radius = 26
+
+padding-top = 0
+padding-bottom = 0
+padding-left = 0
+# padding-left = 7%
+padding-right = 0
+
+matching-algorithm = prefix
+require-match = false
+auto-accept-single = true
+hidden-character = ""
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/wayland/tofi/themes/config b/config/wayland/tofi/themes/config
new file mode 120000
index 0000000..953d912
--- /dev/null
+++ b/config/wayland/tofi/themes/config
@@ -0,0 +1 @@
+/home/aluc/.config/tofi/themes//
\ No newline at end of file
diff --git a/config/wayland/tofi/themes/dark-paper b/config/wayland/tofi/themes/dark-paper
new file mode 100644
index 0000000..c58b292
--- /dev/null
+++ b/config/wayland/tofi/themes/dark-paper
@@ -0,0 +1,18 @@
+font = Fanwood Text
+font-size = 64
+
+outline-width = 0
+border-width = 0
+padding-left = 4%
+padding-top = 2%
+padding-right = 0
+padding-bottom = 0
+
+background-color = #111
+text-color = #f9fbff
+selection-color = #933
+
+width = 100%
+height = 100%
+
+hide-cursor = true
diff --git a/config/wayland/tofi/themes/dmenu b/config/wayland/tofi/themes/dmenu
new file mode 100644
index 0000000..55a23d9
--- /dev/null
+++ b/config/wayland/tofi/themes/dmenu
@@ -0,0 +1,16 @@
+anchor = top
+width = 100%
+height = 30
+horizontal = true
+font-size = 14
+prompt-text = " run: "
+font = monospace
+outline-width = 0
+border-width = 0
+background-color = #000000
+min-input-width = 120
+result-spacing = 15
+padding-top = 0
+padding-bottom = 0
+padding-left = 0
+padding-right = 0
diff --git a/config/wayland/tofi/themes/dos b/config/wayland/tofi/themes/dos
new file mode 100644
index 0000000..7c2fff5
--- /dev/null
+++ b/config/wayland/tofi/themes/dos
@@ -0,0 +1,14 @@
+font = VT323
+corner-radius = 60
+outline-color = #D3D1B9
+outline-width = 3
+border-color = #E3E1C9
+border-width = 60
+background-color = #000000
+text-color = #0A3
+selection-color = #0F6
+prompt-text = "C:\> "
+num-results = 9
+hide-cursor = true
+width = 640
+height = 480
diff --git a/config/wayland/tofi/themes/fullscreen b/config/wayland/tofi/themes/fullscreen
new file mode 100644
index 0000000..aa3a2cd
--- /dev/null
+++ b/config/wayland/tofi/themes/fullscreen
@@ -0,0 +1,10 @@
+width = 100%
+height = 100%
+border-width = 0
+outline-width = 0
+padding-left = 35%
+padding-top = 35%
+result-spacing = 25
+num-results = 5
+font = monospace
+background-color = #000A
diff --git a/config/wayland/tofi/themes/nord b/config/wayland/tofi/themes/nord
new file mode 100644
index 0000000..c8a6192
--- /dev/null
+++ b/config/wayland/tofi/themes/nord
@@ -0,0 +1,40 @@
+### Font
+font = monospace bold
+font-size = 12
+anchor=top
+
+# colors
+text-color = #d8dee9
+prompt-color = #81a1c1
+placeholder-color = #4c566a
+input-color = #d8dee9
+default-result-color = #88c0d0
+selection-color = #5e81ac
+selection-match-color = #ffffff
+background-color = #3b4252f2
+outline-color = #81a1c1
+border-color = #88c0d0
+
+# sizes
+width = 100%
+height = 20%
+
+border-width = 2
+outline-width = 0
+prompt-padding = 0
+
+padding-top = 5
+padding-bottom = 5
+padding-left = 5
+padding-right = 5
+
+corner-radius = 0
+
+# general
+prompt-text = ""
+placeholder-text = "..."
+
+matching-algorithm = prefix
+require-match = false
+auto-accept-single = true
+hidden-character = ""
diff --git a/config/wayland/waybar/colors.css b/config/wayland/waybar/colors.css
new file mode 120000
index 0000000..38b29a4
--- /dev/null
+++ b/config/wayland/waybar/colors.css
@@ -0,0 +1 @@
+/home/aluc/.config/waybar/colors/colors-nord
\ No newline at end of file
diff --git a/config/wayland/waybar/colors/colors-nord b/config/wayland/waybar/colors/colors-nord
new file mode 100644
index 0000000..9622792
--- /dev/null
+++ b/config/wayland/waybar/colors/colors-nord
@@ -0,0 +1,29 @@
+@define-color foreground #d8dee9;
+@define-color background #2e3440;
+
+@define-color color0 #3b4252;
+@define-color color1 #bf616a;
+@define-color color2 #a3be8c;
+@define-color color3 #ebcb8b;
+@define-color color4 #81a1c1;
+@define-color color5 #b48ead;
+@define-color color6 #88c0d0;
+@define-color color7 #e5e9f0;
+
+@define-color color8 #4c566a;
+@define-color color9 #bf616a;
+@define-color color10 #a3be8c;
+@define-color color11 #ebcb8b;
+@define-color color12 #81a1c1;
+@define-color color13 #b48ead;
+@define-color color14 #d08770;
+@define-color color15 #eceff4;
+
+@define-color color16 #373e4d;
+@define-color color17 #94545d;
+@define-color color18 #809575;
+@define-color color19 #b29e75;
+@define-color color20 #68809a;
+@define-color color21 #8c738c;
+@define-color color22 #6d96a5;
+@define-color color23 #aeb3bb;
diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
new file mode 120000
index 0000000..7f81c96
--- /dev/null
+++ b/config/wayland/waybar/config.jsonc
@@ -0,0 +1 @@
+dwl.jsonc
\ No newline at end of file
diff --git a/config/wayland/waybar/hyprland.jsonc b/config/wayland/waybar/hyprland.jsonc
new file mode 100644
index 0000000..cd24d14
--- /dev/null
+++ b/config/wayland/waybar/hyprland.jsonc
@@ -0,0 +1,78 @@
+{
+	"layer": "top",
+	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+	"modules-center": ["clock"],
+	"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,
+		"format-disconnected": "s",
+		"format-stopped": "",
+		"state-icons": {
+			"playing": "",
+			"paused": "",
+		},
+		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
+		"on-click": "mpc toggle",
+		"on-scroll-up": "mpc volume +5",
+		"on-scroll-down": "mpc volume -5",
+	},
+	"battery": {
+		"format-charging": " {capacity}%",
+		"on-click": "mpower",
+		"interval": 10,
+	},
+	"hyprland/window": {
+		"format": "{}",
+		"separate-outputs": true,
+	},
+	"pulseaudio": {
+		"scroll-step": 1,
+		"format": "{icon} {volume:3}%",
+		"format-icons": {
+			"default": ["", "", ""]
+		},
+		"on-click": "pavucontrol",
+	},
+	"temperature": {
+		"interval": 3,
+		"format": "{icon} {temperatureC}°C",
+		"format-icons": {
+			"default":["", "", "", "", ""]
+		},
+	},
+	"custom/wireguard": {
+		"exec": "ip addr show dev wg0",
+		"format": "wg0",
+		"restart-interval": 3,
+	},
+	"network": {
+		"format-wifi": " ",
+		"tooltip-format-wifi": "{ifname} {essid}",
+		"format-ethernet": "",
+		"tooltip-format-ethernet": "{ifname} {ipaddr}",
+		"format-disconnected": "",
+	},
+	"cpu": {
+		"format": " {usage:2}%",
+		"interval": 3,
+	},
+	"custom/memory": {
+		"exec": "free -h | awk '(NR==2){ print $3 }'",
+		"format": "{}",
+		"restart-interval": 3,
+	},
+	"clock": {
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
+		"interval": 1,
+	},
+	"custom/bluetooth": {
+		"exec": "bluetoothctl info",
+		"format": "",
+		"interval": 3,
+	},
+	"tray": {
+		"spacing": 5,
+	}
+}
diff --git a/config/wayland/waybar/schemes/base16.css b/config/wayland/waybar/schemes/base16.css
new file mode 100644
index 0000000..35737b4
--- /dev/null
+++ b/config/wayland/waybar/schemes/base16.css
@@ -0,0 +1,183 @@
+/*
+ ********************************************
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
+ *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
+ *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ ********************************************
+ */
+/* https://github.com/jakehamilton/dotfiles */
+/* Amazing I love it :))) */
+
+@import "colors.css";
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: monospace;
+	font-weight: bold;
+	font-size: 14px;
+	min-height: 24px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.2;
+}
+
+tooltip {
+	background: @background;
+	color: @foreground;
+	border: 2px solid @color0;
+}
+
+window#waybar.termite #window,
+window#waybar.Firefox #window,
+window#waybar.Navigator #window,
+window#waybar.PCSX2 #window {
+    color: @background;
+	background: @color7;
+}
+
+.modules-right * {
+	padding: 0 16px;
+}
+
+.modules-right {
+	margin-right: 2px;
+}
+.modules-left {
+	margin-left: 3px;
+}
+
+#workspaces, #tags, #mpd, #battery, 
+#clock,
+#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
+	border: solid @background;
+	border-width: 2px 2px 2px 0;
+	margin-top: 4px;
+	margin-bottom: 2px;
+	transition: none;
+}
+
+#battery {
+	color: @color6;
+	background: @background;
+	border-color: @color4;
+	border-width: 2px;
+	padding: 0 12px;
+	margin-right: 16px;
+}
+
+#workspaces, #tags {
+	border: solid @background 2px;
+	background: @color3;
+}
+
+#workspaces button, #tags button {
+	transition: none;
+	background: transparent;
+	color: @background;
+}
+
+#tags button.occupied {
+	background: @color2;
+}
+
+#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;
+	background: @color6;
+}
+
+#mpd.disconnected,
+#mpd.stopped {
+	color: @foreground;
+	background: @background;
+	border-color: @color4;
+}
+
+#clock {
+	border: solid @color4 2px;
+	padding: 0 16px;
+	color: @color3;
+	background: @background;
+}
+
+#window {
+	margin-left: 16px;
+	padding: 0;
+	color: @color5;
+}
+
+#custom-wireguard {
+	color: @color5;
+	border: 2px solid @color8;
+	background: @background;
+}
+
+#network {
+	color: @background;
+	border-left: 2px solid @background;
+	background: @color5;
+}
+
+#pulseaudio {
+	color: @background;
+	background: @color4;
+}
+
+#temperature {
+	color: @background;
+	background: @color3;
+}
+
+#cpu {
+	color: @background;
+	background: @color4;
+}
+
+#custom-memory {
+	padding: 0 16px;
+	color: @background;
+	background: @color5;
+}
+
+#custom-bluetooth {
+	color: @color6;
+	background: @color8;
+}
+
+#tray * {
+	padding: unset;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: @color1;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
diff --git a/config/wayland/waybar/schemes/nord.css b/config/wayland/waybar/schemes/nord.css
new file mode 100644
index 0000000..efd0e81
--- /dev/null
+++ b/config/wayland/waybar/schemes/nord.css
@@ -0,0 +1,143 @@
+/*
+ ********************************************
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
+ *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
+ *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ ********************************************
+ */
+/* https://github.com/jakehamilton/dotfiles */
+/* Amazing I love it :))) */
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: JetBrains Mono;
+	font-weight: bold;
+	font-size: 14px;
+	min-height: 24px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.2;
+}
+
+window#waybar.termite #window,
+window#waybar.Firefox #window,
+window#waybar.Navigator #window,
+window#waybar.PCSX2 #window {
+    color: #2e3440;
+	background: #e6e6e6;
+}
+
+#mpd, #battery,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory {
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	border-radius: 26px;
+}
+
+#workspaces, #mpd, #battery,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
+	margin-top: 4px;
+	margin-bottom: 2px;
+	transition: none;
+}
+
+#battery {
+	color: #b48ead;
+	background: #4c566a;
+}
+
+#workspaces {
+	margin-left: 12px;
+	border-radius: 26px;
+	background: #2e3440;
+}
+
+#workspaces button {
+	transition: none;
+	color: #d8dee9;
+	background: transparent;
+	font-size: 16px;
+}
+
+#workspaces button.active {
+	color: #5e81ac;
+}
+
+#workspaces button:hover {
+	transition: none;
+	color: #d08770;
+}
+
+#mpd {
+	color: #2e3440;
+	background: #88c0d0;
+}
+
+#mpd.disconnected,
+#mpd.stopped {
+	color: #d8dee9;
+	background: #2e3440;
+}
+
+#window {
+	color: #88c0d0;
+}
+
+#network {
+	color: #2e3440;
+	background: #5e81ac;
+}
+
+#pulseaudio {
+	color: #2e3440;
+	background: #b48ead;
+}
+
+#temperature {
+	color: #2e3440;
+	background: #d08770;
+}
+
+#cpu {
+	color: #2e3440;
+	background: #ebcb8b;
+}
+
+#custom-memory {
+	color: #2e3440;
+	background: #a3be8c;
+}
+
+#clock {
+	margin-left: 8px;
+	margin-right: 12px;
+	padding-left: 16px;
+	padding-right: 16px;
+	border-radius: 26px;
+	color: #d8dee9;
+	background: #2e3440;
+}
+
+#tray {
+	margin-right: 12px;
+	color: #d8dee9;
+	background: transparent;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #bf616a;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
diff --git a/config/wayland/waybar/style.css b/config/wayland/waybar/style.css
new file mode 120000
index 0000000..ba2f50f
--- /dev/null
+++ b/config/wayland/waybar/style.css
@@ -0,0 +1 @@
+schemes/base16.css
\ No newline at end of file
-- 
cgit v1.2.3


From e36d5d900d21c2a076347eb56728de418190f615 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 19:04:59 +0200
Subject: added dwl config

---
 config/wayland/dwl/startup.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 config/wayland/dwl/startup.sh

(limited to 'config')

diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh
new file mode 100755
index 0000000..e09ee59
--- /dev/null
+++ b/config/wayland/dwl/startup.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+swaybg -i ~/pics/wallpaper &
+dwl-bar &
+gammastep &
+wl-paste --watch cliphist store &
+keyadd id_rsa &
+swayidle 300 locker &
+mako &
+$TERMINAL -e tmux a || $TERMINAL tmux &
-- 
cgit v1.2.3


From ebdffb6d4cf15b87a13444dfaf90d3fdfc3299a4 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 19:05:31 +0200
Subject: removed dwl waybar config

---
 config/hyprland/waybar/dwl.jsonc | 74 ----------------------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 config/hyprland/waybar/dwl.jsonc

(limited to 'config')

diff --git a/config/hyprland/waybar/dwl.jsonc b/config/hyprland/waybar/dwl.jsonc
deleted file mode 100644
index 9d65564..0000000
--- a/config/hyprland/waybar/dwl.jsonc
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-	"layer": "top",
-	"modules-left": ["battery", "dwl/tags", "mpd"],
-	"modules-center": ["clock"],
-	"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,
-		"format-disconnected": "s",
-		"format-stopped": "",
-		"state-icons": {
-			"playing": "",
-			"paused": "",
-		},
-		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
-		"on-click": "mpc toggle",
-		"on-scroll-up": "mpc volume +5",
-		"on-scroll-down": "mpc volume -5",
-	},
-	"battery": {
-		"format-charging": " {capacity}%",
-		"on-click": "mpower",
-		"interval": 10,
-	},
-	"pulseaudio": {
-		"scroll-step": 1,
-		"format": "{icon} {volume:3}%",
-		"format-icons": {
-			"default": ["", "", ""]
-		},
-		"on-click": "pavucontrol",
-	},
-	"temperature": {
-		"interval": 3,
-		"format": "{icon} {temperatureC}°C",
-		"format-icons": {
-			"default":["", "", "", "", ""]
-		},
-	},
-	"custom/wireguard": {
-		"exec": "ip addr show dev wg0",
-		"format": "wg0",
-		"restart-interval": 3,
-	},
-	"network": {
-		"format-wifi": " ",
-		"tooltip-format-wifi": "{ifname} {essid}",
-		"format-ethernet": "",
-		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "",
-	},
-	"cpu": {
-		"format": " {usage:2}%",
-		"interval": 3,
-	},
-	"custom/memory": {
-		"exec": "free -h | awk '(NR==2){ print $3 }'",
-		"format": "{}",
-		"restart-interval": 3,
-	},
-	"clock": {
-		"format": "{:%R}",
-		"format-alt": "{:(%T) %A %d %B}",
-		"interval": 1,
-	},
-	"custom/bluetooth": {
-		"exec": "bluetoothctl info",
-		"format": "",
-		"interval": 3,
-	},
-	"tray": {
-		"spacing": 5,
-	}
-}
-- 
cgit v1.2.3


From 72340276d77c0f2126bdd0f2971ed5858edb6ad0 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 19:13:10 +0200
Subject: changed keybind to toggle waybar

---
 config/wayland/hypr/binds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/wayland/hypr/binds.conf b/config/wayland/hypr/binds.conf
index 75b0d14..132ce3d 100644
--- a/config/wayland/hypr/binds.conf
+++ b/config/wayland/hypr/binds.conf
@@ -136,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
-- 
cgit v1.2.3


From 1d4479a1e638513e04b850ac935c94868ed8418d Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 19:59:00 +0200
Subject: new dwm like status for waybar

---
 config/wayland/waybar/config.jsonc |  2 +-
 config/wayland/waybar/dwm.css      | 20 ++++++++++++++++++++
 config/wayland/waybar/dwm.jsonc    | 16 ++++++++++++++++
 config/wayland/waybar/status.sh    |  2 ++
 config/wayland/waybar/style.css    |  2 +-
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 config/wayland/waybar/dwm.css
 create mode 100644 config/wayland/waybar/dwm.jsonc
 create mode 100755 config/wayland/waybar/status.sh

(limited to 'config')

diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
index 7f81c96..2ee4a48 120000
--- a/config/wayland/waybar/config.jsonc
+++ b/config/wayland/waybar/config.jsonc
@@ -1 +1 @@
-dwl.jsonc
\ No newline at end of file
+dwm.jsonc
\ No newline at end of file
diff --git a/config/wayland/waybar/dwm.css b/config/wayland/waybar/dwm.css
new file mode 100644
index 0000000..31eacf0
--- /dev/null
+++ b/config/wayland/waybar/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/wayland/waybar/dwm.jsonc b/config/wayland/waybar/dwm.jsonc
new file mode 100644
index 0000000..3e68245
--- /dev/null
+++ b/config/wayland/waybar/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": "/home/aluc/.config/waybar/status.sh",
+		"format": " {} ",
+		"interval": 1
+	}
+}
diff --git a/config/wayland/waybar/status.sh b/config/wayland/waybar/status.sh
new file mode 100755
index 0000000..3b658e5
--- /dev/null
+++ b/config/wayland/waybar/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
index ba2f50f..7442e44 120000
--- a/config/wayland/waybar/style.css
+++ b/config/wayland/waybar/style.css
@@ -1 +1 @@
-schemes/base16.css
\ No newline at end of file
+dwm.css
\ No newline at end of file
-- 
cgit v1.2.3


From 9928d64cd712a25634481e81d67d2537ccdaf4df Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 18 Oct 2023 20:09:35 +0200
Subject: refactored waybar folder layout

---
 config/wayland/waybar/colors.css                |   1 -
 config/wayland/waybar/colors/colors-nord        |  29 ----
 config/wayland/waybar/config.jsonc              |   2 +-
 config/wayland/waybar/configs/dwm.jsonc         |  16 +++
 config/wayland/waybar/configs/hyprland.jsonc    |  78 ++++++++++
 config/wayland/waybar/dwm.css                   |  20 ---
 config/wayland/waybar/dwm.jsonc                 |  16 ---
 config/wayland/waybar/hyprland.jsonc            |  78 ----------
 config/wayland/waybar/schemes/base16.css        | 183 ------------------------
 config/wayland/waybar/schemes/nord.css          | 143 ------------------
 config/wayland/waybar/scripts/status.sh         |   2 +
 config/wayland/waybar/status.sh                 |   2 -
 config/wayland/waybar/style.css                 |   2 +-
 config/wayland/waybar/styles/base16.css         | 183 ++++++++++++++++++++++++
 config/wayland/waybar/styles/colors/colors-nord |  29 ++++
 config/wayland/waybar/styles/colors/colors.css  |   1 +
 config/wayland/waybar/styles/dwm.css            |  20 +++
 config/wayland/waybar/styles/nord.css           | 143 ++++++++++++++++++
 18 files changed, 474 insertions(+), 474 deletions(-)
 delete mode 120000 config/wayland/waybar/colors.css
 delete mode 100644 config/wayland/waybar/colors/colors-nord
 create mode 100644 config/wayland/waybar/configs/dwm.jsonc
 create mode 100644 config/wayland/waybar/configs/hyprland.jsonc
 delete mode 100644 config/wayland/waybar/dwm.css
 delete mode 100644 config/wayland/waybar/dwm.jsonc
 delete mode 100644 config/wayland/waybar/hyprland.jsonc
 delete mode 100644 config/wayland/waybar/schemes/base16.css
 delete mode 100644 config/wayland/waybar/schemes/nord.css
 create mode 100755 config/wayland/waybar/scripts/status.sh
 delete mode 100755 config/wayland/waybar/status.sh
 create mode 100644 config/wayland/waybar/styles/base16.css
 create mode 100644 config/wayland/waybar/styles/colors/colors-nord
 create mode 120000 config/wayland/waybar/styles/colors/colors.css
 create mode 100644 config/wayland/waybar/styles/dwm.css
 create mode 100644 config/wayland/waybar/styles/nord.css

(limited to 'config')

diff --git a/config/wayland/waybar/colors.css b/config/wayland/waybar/colors.css
deleted file mode 120000
index 38b29a4..0000000
--- a/config/wayland/waybar/colors.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/aluc/.config/waybar/colors/colors-nord
\ No newline at end of file
diff --git a/config/wayland/waybar/colors/colors-nord b/config/wayland/waybar/colors/colors-nord
deleted file mode 100644
index 9622792..0000000
--- a/config/wayland/waybar/colors/colors-nord
+++ /dev/null
@@ -1,29 +0,0 @@
-@define-color foreground #d8dee9;
-@define-color background #2e3440;
-
-@define-color color0 #3b4252;
-@define-color color1 #bf616a;
-@define-color color2 #a3be8c;
-@define-color color3 #ebcb8b;
-@define-color color4 #81a1c1;
-@define-color color5 #b48ead;
-@define-color color6 #88c0d0;
-@define-color color7 #e5e9f0;
-
-@define-color color8 #4c566a;
-@define-color color9 #bf616a;
-@define-color color10 #a3be8c;
-@define-color color11 #ebcb8b;
-@define-color color12 #81a1c1;
-@define-color color13 #b48ead;
-@define-color color14 #d08770;
-@define-color color15 #eceff4;
-
-@define-color color16 #373e4d;
-@define-color color17 #94545d;
-@define-color color18 #809575;
-@define-color color19 #b29e75;
-@define-color color20 #68809a;
-@define-color color21 #8c738c;
-@define-color color22 #6d96a5;
-@define-color color23 #aeb3bb;
diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
index 2ee4a48..95d200a 120000
--- a/config/wayland/waybar/config.jsonc
+++ b/config/wayland/waybar/config.jsonc
@@ -1 +1 @@
-dwm.jsonc
\ No newline at end of file
+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/wayland/waybar/configs/hyprland.jsonc b/config/wayland/waybar/configs/hyprland.jsonc
new file mode 100644
index 0000000..cd24d14
--- /dev/null
+++ b/config/wayland/waybar/configs/hyprland.jsonc
@@ -0,0 +1,78 @@
+{
+	"layer": "top",
+	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+	"modules-center": ["clock"],
+	"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,
+		"format-disconnected": "s",
+		"format-stopped": "",
+		"state-icons": {
+			"playing": "",
+			"paused": "",
+		},
+		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
+		"on-click": "mpc toggle",
+		"on-scroll-up": "mpc volume +5",
+		"on-scroll-down": "mpc volume -5",
+	},
+	"battery": {
+		"format-charging": " {capacity}%",
+		"on-click": "mpower",
+		"interval": 10,
+	},
+	"hyprland/window": {
+		"format": "{}",
+		"separate-outputs": true,
+	},
+	"pulseaudio": {
+		"scroll-step": 1,
+		"format": "{icon} {volume:3}%",
+		"format-icons": {
+			"default": ["", "", ""]
+		},
+		"on-click": "pavucontrol",
+	},
+	"temperature": {
+		"interval": 3,
+		"format": "{icon} {temperatureC}°C",
+		"format-icons": {
+			"default":["", "", "", "", ""]
+		},
+	},
+	"custom/wireguard": {
+		"exec": "ip addr show dev wg0",
+		"format": "wg0",
+		"restart-interval": 3,
+	},
+	"network": {
+		"format-wifi": " ",
+		"tooltip-format-wifi": "{ifname} {essid}",
+		"format-ethernet": "",
+		"tooltip-format-ethernet": "{ifname} {ipaddr}",
+		"format-disconnected": "",
+	},
+	"cpu": {
+		"format": " {usage:2}%",
+		"interval": 3,
+	},
+	"custom/memory": {
+		"exec": "free -h | awk '(NR==2){ print $3 }'",
+		"format": "{}",
+		"restart-interval": 3,
+	},
+	"clock": {
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
+		"interval": 1,
+	},
+	"custom/bluetooth": {
+		"exec": "bluetoothctl info",
+		"format": "",
+		"interval": 3,
+	},
+	"tray": {
+		"spacing": 5,
+	}
+}
diff --git a/config/wayland/waybar/dwm.css b/config/wayland/waybar/dwm.css
deleted file mode 100644
index 31eacf0..0000000
--- a/config/wayland/waybar/dwm.css
+++ /dev/null
@@ -1,20 +0,0 @@
-* {
-	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/wayland/waybar/dwm.jsonc b/config/wayland/waybar/dwm.jsonc
deleted file mode 100644
index 3e68245..0000000
--- a/config/wayland/waybar/dwm.jsonc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"modules-left": ["hyprland/workspaces", "custom/layout", "hyprland/window"],
-	"modules-right": ["custom/status"],
-	"hyprland/window": {
-		"format": " {} "
-	},
-	"custom/layout": { 
-		"format": " []= ",
-		"interval": "once",
-	},
-	"custom/status": { 
-		"exec": "/home/aluc/.config/waybar/status.sh",
-		"format": " {} ",
-		"interval": 1
-	}
-}
diff --git a/config/wayland/waybar/hyprland.jsonc b/config/wayland/waybar/hyprland.jsonc
deleted file mode 100644
index cd24d14..0000000
--- a/config/wayland/waybar/hyprland.jsonc
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-	"layer": "top",
-	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
-	"modules-center": ["clock"],
-	"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,
-		"format-disconnected": "s",
-		"format-stopped": "",
-		"state-icons": {
-			"playing": "",
-			"paused": "",
-		},
-		"tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
-		"on-click": "mpc toggle",
-		"on-scroll-up": "mpc volume +5",
-		"on-scroll-down": "mpc volume -5",
-	},
-	"battery": {
-		"format-charging": " {capacity}%",
-		"on-click": "mpower",
-		"interval": 10,
-	},
-	"hyprland/window": {
-		"format": "{}",
-		"separate-outputs": true,
-	},
-	"pulseaudio": {
-		"scroll-step": 1,
-		"format": "{icon} {volume:3}%",
-		"format-icons": {
-			"default": ["", "", ""]
-		},
-		"on-click": "pavucontrol",
-	},
-	"temperature": {
-		"interval": 3,
-		"format": "{icon} {temperatureC}°C",
-		"format-icons": {
-			"default":["", "", "", "", ""]
-		},
-	},
-	"custom/wireguard": {
-		"exec": "ip addr show dev wg0",
-		"format": "wg0",
-		"restart-interval": 3,
-	},
-	"network": {
-		"format-wifi": " ",
-		"tooltip-format-wifi": "{ifname} {essid}",
-		"format-ethernet": "",
-		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "",
-	},
-	"cpu": {
-		"format": " {usage:2}%",
-		"interval": 3,
-	},
-	"custom/memory": {
-		"exec": "free -h | awk '(NR==2){ print $3 }'",
-		"format": "{}",
-		"restart-interval": 3,
-	},
-	"clock": {
-		"format": "{:%R}",
-		"format-alt": "{:(%T) %A %d %B}",
-		"interval": 1,
-	},
-	"custom/bluetooth": {
-		"exec": "bluetoothctl info",
-		"format": "",
-		"interval": 3,
-	},
-	"tray": {
-		"spacing": 5,
-	}
-}
diff --git a/config/wayland/waybar/schemes/base16.css b/config/wayland/waybar/schemes/base16.css
deleted file mode 100644
index 35737b4..0000000
--- a/config/wayland/waybar/schemes/base16.css
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-@import "colors.css";
-
-* {
-	border: none;
-	border-radius: 0;
-	font-family: monospace;
-	font-weight: bold;
-	font-size: 14px;
-	min-height: 24px;
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.hidden {
-	opacity: 0.2;
-}
-
-tooltip {
-	background: @background;
-	color: @foreground;
-	border: 2px solid @color0;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: @background;
-	background: @color7;
-}
-
-.modules-right * {
-	padding: 0 16px;
-}
-
-.modules-right {
-	margin-right: 2px;
-}
-.modules-left {
-	margin-left: 3px;
-}
-
-#workspaces, #tags, #mpd, #battery, 
-#clock,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
-	border: solid @background;
-	border-width: 2px 2px 2px 0;
-	margin-top: 4px;
-	margin-bottom: 2px;
-	transition: none;
-}
-
-#battery {
-	color: @color6;
-	background: @background;
-	border-color: @color4;
-	border-width: 2px;
-	padding: 0 12px;
-	margin-right: 16px;
-}
-
-#workspaces, #tags {
-	border: solid @background 2px;
-	background: @color3;
-}
-
-#workspaces button, #tags button {
-	transition: none;
-	background: transparent;
-	color: @background;
-}
-
-#tags button.occupied {
-	background: @color2;
-}
-
-#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;
-	background: @color6;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
-	color: @foreground;
-	background: @background;
-	border-color: @color4;
-}
-
-#clock {
-	border: solid @color4 2px;
-	padding: 0 16px;
-	color: @color3;
-	background: @background;
-}
-
-#window {
-	margin-left: 16px;
-	padding: 0;
-	color: @color5;
-}
-
-#custom-wireguard {
-	color: @color5;
-	border: 2px solid @color8;
-	background: @background;
-}
-
-#network {
-	color: @background;
-	border-left: 2px solid @background;
-	background: @color5;
-}
-
-#pulseaudio {
-	color: @background;
-	background: @color4;
-}
-
-#temperature {
-	color: @background;
-	background: @color3;
-}
-
-#cpu {
-	color: @background;
-	background: @color4;
-}
-
-#custom-memory {
-	padding: 0 16px;
-	color: @background;
-	background: @color5;
-}
-
-#custom-bluetooth {
-	color: @color6;
-	background: @color8;
-}
-
-#tray * {
-	padding: unset;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: @color1;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
diff --git a/config/wayland/waybar/schemes/nord.css b/config/wayland/waybar/schemes/nord.css
deleted file mode 100644
index efd0e81..0000000
--- a/config/wayland/waybar/schemes/nord.css
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-* {
-	border: none;
-	border-radius: 0;
-	font-family: JetBrains Mono;
-	font-weight: bold;
-	font-size: 14px;
-	min-height: 24px;
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.hidden {
-	opacity: 0.2;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: #2e3440;
-	background: #e6e6e6;
-}
-
-#mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory {
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
-}
-
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
-	margin-top: 4px;
-	margin-bottom: 2px;
-	transition: none;
-}
-
-#battery {
-	color: #b48ead;
-	background: #4c566a;
-}
-
-#workspaces {
-	margin-left: 12px;
-	border-radius: 26px;
-	background: #2e3440;
-}
-
-#workspaces button {
-	transition: none;
-	color: #d8dee9;
-	background: transparent;
-	font-size: 16px;
-}
-
-#workspaces button.active {
-	color: #5e81ac;
-}
-
-#workspaces button:hover {
-	transition: none;
-	color: #d08770;
-}
-
-#mpd {
-	color: #2e3440;
-	background: #88c0d0;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
-	color: #d8dee9;
-	background: #2e3440;
-}
-
-#window {
-	color: #88c0d0;
-}
-
-#network {
-	color: #2e3440;
-	background: #5e81ac;
-}
-
-#pulseaudio {
-	color: #2e3440;
-	background: #b48ead;
-}
-
-#temperature {
-	color: #2e3440;
-	background: #d08770;
-}
-
-#cpu {
-	color: #2e3440;
-	background: #ebcb8b;
-}
-
-#custom-memory {
-	color: #2e3440;
-	background: #a3be8c;
-}
-
-#clock {
-	margin-left: 8px;
-	margin-right: 12px;
-	padding-left: 16px;
-	padding-right: 16px;
-	border-radius: 26px;
-	color: #d8dee9;
-	background: #2e3440;
-}
-
-#tray {
-	margin-right: 12px;
-	color: #d8dee9;
-	background: transparent;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #bf616a;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
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/status.sh b/config/wayland/waybar/status.sh
deleted file mode 100755
index 3b658e5..0000000
--- a/config/wayland/waybar/status.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-printf 'Hyprland %s' "$(expac %v hyprland)"
diff --git a/config/wayland/waybar/style.css b/config/wayland/waybar/style.css
index 7442e44..4d2790d 120000
--- a/config/wayland/waybar/style.css
+++ b/config/wayland/waybar/style.css
@@ -1 +1 @@
-dwm.css
\ No newline at end of file
+styles/dwm.css
\ No newline at end of file
diff --git a/config/wayland/waybar/styles/base16.css b/config/wayland/waybar/styles/base16.css
new file mode 100644
index 0000000..c9e3170
--- /dev/null
+++ b/config/wayland/waybar/styles/base16.css
@@ -0,0 +1,183 @@
+/*
+ ********************************************
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
+ *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
+ *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ ********************************************
+ */
+/* https://github.com/jakehamilton/dotfiles */
+/* Amazing I love it :))) */
+
+@import "styles/colors/colors.css";
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: monospace;
+	font-weight: bold;
+	font-size: 14px;
+	min-height: 24px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.2;
+}
+
+tooltip {
+	background: @background;
+	color: @foreground;
+	border: 2px solid @color0;
+}
+
+window#waybar.termite #window,
+window#waybar.Firefox #window,
+window#waybar.Navigator #window,
+window#waybar.PCSX2 #window {
+    color: @background;
+	background: @color7;
+}
+
+.modules-right * {
+	padding: 0 16px;
+}
+
+.modules-right {
+	margin-right: 2px;
+}
+.modules-left {
+	margin-left: 3px;
+}
+
+#workspaces, #tags, #mpd, #battery, 
+#clock,
+#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
+	border: solid @background;
+	border-width: 2px 2px 2px 0;
+	margin-top: 4px;
+	margin-bottom: 2px;
+	transition: none;
+}
+
+#battery {
+	color: @color6;
+	background: @background;
+	border-color: @color4;
+	border-width: 2px;
+	padding: 0 12px;
+	margin-right: 16px;
+}
+
+#workspaces, #tags {
+	border: solid @background 2px;
+	background: @color3;
+}
+
+#workspaces button, #tags button {
+	transition: none;
+	background: transparent;
+	color: @background;
+}
+
+#tags button.occupied {
+	background: @color2;
+}
+
+#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;
+	background: @color6;
+}
+
+#mpd.disconnected,
+#mpd.stopped {
+	color: @foreground;
+	background: @background;
+	border-color: @color4;
+}
+
+#clock {
+	border: solid @color4 2px;
+	padding: 0 16px;
+	color: @color3;
+	background: @background;
+}
+
+#window {
+	margin-left: 16px;
+	padding: 0;
+	color: @color5;
+}
+
+#custom-wireguard {
+	color: @color5;
+	border: 2px solid @color8;
+	background: @background;
+}
+
+#network {
+	color: @background;
+	border-left: 2px solid @background;
+	background: @color5;
+}
+
+#pulseaudio {
+	color: @background;
+	background: @color4;
+}
+
+#temperature {
+	color: @background;
+	background: @color3;
+}
+
+#cpu {
+	color: @background;
+	background: @color4;
+}
+
+#custom-memory {
+	padding: 0 16px;
+	color: @background;
+	background: @color5;
+}
+
+#custom-bluetooth {
+	color: @color6;
+	background: @color8;
+}
+
+#tray * {
+	padding: unset;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: @color1;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
diff --git a/config/wayland/waybar/styles/colors/colors-nord b/config/wayland/waybar/styles/colors/colors-nord
new file mode 100644
index 0000000..9622792
--- /dev/null
+++ b/config/wayland/waybar/styles/colors/colors-nord
@@ -0,0 +1,29 @@
+@define-color foreground #d8dee9;
+@define-color background #2e3440;
+
+@define-color color0 #3b4252;
+@define-color color1 #bf616a;
+@define-color color2 #a3be8c;
+@define-color color3 #ebcb8b;
+@define-color color4 #81a1c1;
+@define-color color5 #b48ead;
+@define-color color6 #88c0d0;
+@define-color color7 #e5e9f0;
+
+@define-color color8 #4c566a;
+@define-color color9 #bf616a;
+@define-color color10 #a3be8c;
+@define-color color11 #ebcb8b;
+@define-color color12 #81a1c1;
+@define-color color13 #b48ead;
+@define-color color14 #d08770;
+@define-color color15 #eceff4;
+
+@define-color color16 #373e4d;
+@define-color color17 #94545d;
+@define-color color18 #809575;
+@define-color color19 #b29e75;
+@define-color color20 #68809a;
+@define-color color21 #8c738c;
+@define-color color22 #6d96a5;
+@define-color color23 #aeb3bb;
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/wayland/waybar/styles/nord.css b/config/wayland/waybar/styles/nord.css
new file mode 100644
index 0000000..efd0e81
--- /dev/null
+++ b/config/wayland/waybar/styles/nord.css
@@ -0,0 +1,143 @@
+/*
+ ********************************************
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
+ *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
+ *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ ********************************************
+ */
+/* https://github.com/jakehamilton/dotfiles */
+/* Amazing I love it :))) */
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: JetBrains Mono;
+	font-weight: bold;
+	font-size: 14px;
+	min-height: 24px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.2;
+}
+
+window#waybar.termite #window,
+window#waybar.Firefox #window,
+window#waybar.Navigator #window,
+window#waybar.PCSX2 #window {
+    color: #2e3440;
+	background: #e6e6e6;
+}
+
+#mpd, #battery,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory {
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	border-radius: 26px;
+}
+
+#workspaces, #mpd, #battery,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
+	margin-top: 4px;
+	margin-bottom: 2px;
+	transition: none;
+}
+
+#battery {
+	color: #b48ead;
+	background: #4c566a;
+}
+
+#workspaces {
+	margin-left: 12px;
+	border-radius: 26px;
+	background: #2e3440;
+}
+
+#workspaces button {
+	transition: none;
+	color: #d8dee9;
+	background: transparent;
+	font-size: 16px;
+}
+
+#workspaces button.active {
+	color: #5e81ac;
+}
+
+#workspaces button:hover {
+	transition: none;
+	color: #d08770;
+}
+
+#mpd {
+	color: #2e3440;
+	background: #88c0d0;
+}
+
+#mpd.disconnected,
+#mpd.stopped {
+	color: #d8dee9;
+	background: #2e3440;
+}
+
+#window {
+	color: #88c0d0;
+}
+
+#network {
+	color: #2e3440;
+	background: #5e81ac;
+}
+
+#pulseaudio {
+	color: #2e3440;
+	background: #b48ead;
+}
+
+#temperature {
+	color: #2e3440;
+	background: #d08770;
+}
+
+#cpu {
+	color: #2e3440;
+	background: #ebcb8b;
+}
+
+#custom-memory {
+	color: #2e3440;
+	background: #a3be8c;
+}
+
+#clock {
+	margin-left: 8px;
+	margin-right: 12px;
+	padding-left: 16px;
+	padding-right: 16px;
+	border-radius: 26px;
+	color: #d8dee9;
+	background: #2e3440;
+}
+
+#tray {
+	margin-right: 12px;
+	color: #d8dee9;
+	background: transparent;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #bf616a;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
-- 
cgit v1.2.3


From 3811c7c3c611a03b36b0589033c31bb738313135 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 19 Oct 2023 11:23:24 +0200
Subject: fix: path not working

---
 config/essentials/zsh/aliases.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

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'
-- 
cgit v1.2.3


From bd0e2020cea05c171c2fce7f44ed4946e3ce5aec Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 19 Oct 2023 11:24:49 +0200
Subject: refactor

---
 config/wayland/hypr/screenshot.sh | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'config')

diff --git a/config/wayland/hypr/screenshot.sh b/config/wayland/hypr/screenshot.sh
index 694e099..716ccdd 100755
--- a/config/wayland/hypr/screenshot.sh
+++ b/config/wayland/hypr/screenshot.sh
@@ -6,23 +6,11 @@ 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
-		;;
+	"-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
-- 
cgit v1.2.3


From e658b9abed15fcf0f6947f4c92d5c1809aa7da0e Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 20 Oct 2023 20:24:04 +0200
Subject: set 'dwl' as default (tty1)

---
 config/essentials/zsh/.zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index e46cf8e..7a2f945 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -4,9 +4,9 @@ if [ "$(id -u)" -ne 0 ]
 then
 	clear
 	case "${TTY#/dev/tty}" in
-		1) exec startw > /dev/null 2>&1 ;;
+		1) exec startdwl > /dev/null 2>&1 ;;
 		2) exec startx > /dev/null 2>&1 ;;
-		3) exec startdwl > /dev/null 2>&1 ;;
+		3) exec startw > /dev/null 2>&1 ;;
 		*) false ;;
 	esac && exit
 fi
-- 
cgit v1.2.3


From 4965e48270f0e95e5ff9e7147c03972cb99159f4 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 20 Oct 2023 20:49:14 +0200
Subject: added mako config

---
 config/wayland/mako/config | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 config/wayland/mako/config

(limited to 'config')

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
-- 
cgit v1.2.3


From c997f2a94462e694c2fdcf9c01fba17c889cf03d Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 20 Oct 2023 21:42:38 +0200
Subject: don't clear in normal shell and don't print PLUGPATH on reload

---
 config/essentials/zsh/.zshrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 7a2f945..0efee9b 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -2,7 +2,7 @@
 
 if [ "$(id -u)" -ne 0 ]
 then
-	clear
+	[ "${TTY%%tty*}" = '/dev/' ] && clear
 	case "${TTY#/dev/tty}" in
 		1) exec startdwl > /dev/null 2>&1 ;;
 		2) exec startx > /dev/null 2>&1 ;;
@@ -27,7 +27,6 @@ compinit
 . $ZDOTDIR/functions.zsh
 . $ZDOTDIR/aliases.sh
 
-local PLUGPATH
 for file in /etc/os-release /usr/lib/os-release
 do [ -f "$file" ] && . "$file" && break
 done
-- 
cgit v1.2.3


From 3d253cd428e2769e0449fbf0c3ece5c0ab41545c Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 20 Oct 2023 22:00:42 +0200
Subject: added dwlblocks

---
 config/wayland/dwl/startup.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh
index e09ee59..f38f1ab 100755
--- a/config/wayland/dwl/startup.sh
+++ b/config/wayland/dwl/startup.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 swaybg -i ~/pics/wallpaper &
 dwl-bar &
+dwlblocks &
 gammastep &
 wl-paste --watch cliphist store &
 keyadd id_rsa &
-- 
cgit v1.2.3