00: cleanup config

hypr/colorscheme.conf

@@ -1,61 +1,37 @@
-$rosewaterAlpha = fff5e0dc
+# foreground
-$flamingoAlpha  = fff2cdcd
+$fg         = ebdbb2
-$pinkAlpha      = fff5c2e7
+$fg0        = fbf1c7
-$mauveAlpha     = ffcba6f7
+$fg1        = ebdbb2
-$redAlpha       = fff38ba8
+$fg2        = d5c4a1
-$maroonAlpha    = ffeba0ac
+$fg3        = bdae93
-$peachAlpha     = fffab387
+$fg4        = a89984
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
 
-$textAlpha      = ffcdd6f4
+# background
-$subtext1Alpha  = ffbac2de
+$bg         = 282828
-$subtext0Alpha  = ffa6adc8
+$bg0_h      = 1d2021
+$bg0_s      = 32302f
+$bg1        = 3c3836
+$bg2        = 504945
+$bg3        = 665c54
+$bg4        = 7c6f64
 
-$overlay2Alpha  = ff9399b2
+# colors
-$overlay1Alpha  = ff7f849c
+$gray       = a89984
-$overlay0Alpha  = ff6c7086
+$red        = cc241d
+$green      = 98971a
+$yellow     = d79921
+$blue       = 458588
+$purple     = b16286
+$aqua       = 689d6a
+$orange     = d65d0e
+$peach      = fe640b
 
-$surface2Alpha  = ff585b70
+# alternates
-$surface1Alpha  = ff45475a
+$alt_gray   = 928374
-$surface0Alpha  = ff313244
+$alt_red    = fb4934
-
+$alt_green  = b8bb26
-$baseAlpha      = ff1e1e2e
+$alt_yellow = fabd2f
-$mantleAlpha    = ff181825
+$alt_blue   = 83a598
-$crustAlpha     = ff11111b
+$alt_purple = d3869b
-
+$alt_aqua   = 8ec07c
-$rosewater = 0xfff5e0dc
+$alt_orange = fe8019
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b

hypr/hyprland.conf

@@ -4,42 +4,36 @@ source = ~/.config/hypr/colorscheme.conf
 # monitors
 # Main
 monitorv2 {
-	output = DP-1
+	output = DP-3
     disabled = no
-	# 3440x1440@160
+	mode = 3440x1440@144
-	# mode = 3440x1440@160
-	# 3440x1440@155
-	# mode = modeline 1177.50 3440 3744 4128 4816 1440 1443 1453 1578 -hsync +vsync
-    # 3440x1440@120
-	mode = modeline 889.75 3440 3736 4120 4800 1440 1443 1453 1545 -hsync +vsync
-	# position = 0x0 # single
 	position = 1920x0 # dual
 	vrr = true
-	bitdepth = 10
+	bitdepth = 8
-	cm = auto
+	cm = srgb
-	#sdr_min_luminance = 0.005
+	sdr_min_luminance = 0.005
-	#sdr_max_luminance = 250 #
+	sdr_max_luminance = 400 #
-	#supports_wide_color = true
+	supports_wide_color = true
-	#supports_hdr = true
+	supports_hdr = true
-	#sdrbrightness = 1.1
+	sdrbrightness = 1.1
-	#sdrsaturation = 1.1
+	sdrsaturation = 1.1
 }
 
 # Side
 monitorv2 {
-	output = HDMI-A-4
+	output = HDMI-A-1
     disabled = no
 	mode = 3840x2160@60 # alt: disabled
 	transform = 0
 	scale = 2
 	position = 0x0
-	vrr = true
+	vrr = false
 	bitdepth = 10
-	cm = auto
+	cm = srgb
-	#sdr_min_luminance = 0.005
+	sdr_min_luminance = 0.005
-	#sdr_max_luminance = 150 #
+	sdr_max_luminance = 150 #
-	#sdrbrightness = 1.0
+	sdrbrightness = 1.0
-	#sdrsaturation = 1.0
+	sdrsaturation = 1.0
 }
 
 # < End Section >
@@ -53,8 +47,8 @@ env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = MOZ_ENABLE_WAYLAND,1
-env = HYPRCURSOR_THEME, rose-pine-hyprcursor
+env = HYPRCURSOR_THEME, volantes
-env = HYPRCURSOR_SIZE, 24
+env = HYPRCURSOR_SIZE, 30
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = QT_QPA_PLATFORM,wayland;xcb
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
@@ -79,7 +73,7 @@ exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue
 exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha'
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = sleep 1 && hyprpm reload
-#exec-once = wayvnc --output=DP-1 0.0.0.0
+#exec-once = wayvnc --output=DP-3 0.0.0.0
 
 # xrandr settings
 exec-once = ~/.config/hypr/scripts/xrandr.sh
@@ -118,17 +112,17 @@ exec-once = hyprlock
 # workspace rules
 
 # smart gaps
-workspace = w[tv1], gapsout:0 650 0 650, gapsin:0
+workspace = w[tv1], gapsout:25 725 25 725, gapsin:0
-workspace = w[tv1]5, gapsout:0 0 0 0, gapsin:0
+workspace = w[tv1] r[4-5], gapsout:0 0 0 0, gapsin:0
 
 # gaps numbers (top, right, bottom, left)
 # Workspaces swapped for ease of use
-workspace = 1, monitor:DP-1, persistent:true, default:true
+workspace = 1, monitor:DP-3, persistent:true, default:true
-workspace = 2, monitor:DP-1, persistent:true
+workspace = 2, monitor:DP-3, persistent:true
-workspace = 3, monitor:DP-1, persistent:true
+workspace = 3, monitor:DP-3, persistent:true
-workspace = 4, monitor:DP-1, persistent:true
+workspace = 4, monitor:DP-3, persistent:true
-workspace = 5, monitor:HDMI-A-4, persistent:true, gapsout:0
+workspace = 5, monitor:HDMI-A-1, persistent:true, gapsout:0
-workspace = 6, monitor:DP-1, persistent:true
+workspace = 6, monitor:DP-3, persistent:true
 
 
 # < End Section >
@@ -142,34 +136,35 @@ general {
 	gaps_in = 5
 	gaps_out = 20
 	border_size = 3
-	col.active_border = rgb(CCB8C8)
+	#col.active_border = rgb($yellow)
-	col.inactive_border = rgb(CCB8C8)
+	col.active_border = rgb($fg)
+	col.inactive_border = rgb($bg)
 	layout = dwindle
 	resize_on_border = false
 	allow_tearing = false
 }
 
 decoration {
-	rounding = 0
+    rounding = 10
 	rounding_power = 2
 	
 	shadow {
-		enabled = false
+		enabled = true
-		range = 4
+		range = 32
-		render_power = 3
+		render_power = 2
-		color = rgba(1a1a1aee)
+		color = rgba(00000050)
 	}
 	dim_special = 0.3
 	fullscreen_opacity = 1.0
 	
 	blur {
-		enabled = false
+		enabled = true
 		special = true
 		size = 3
-		passes = 1
+		passes = 4
 		new_optimizations = true
 		ignore_opacity = true
-		xray = false
+		xray = true
 		vibrancy = 0.1696
 	}
 }
@@ -237,7 +232,7 @@ cursor {
 	inactive_timeout = 5
 	no_warps = false
 	persistent_warps = true
-	default_monitor = DP-1
+	default_monitor = DP-3
 	warp_on_change_workspace = false
 }
 
@@ -248,10 +243,14 @@ debug {
 }
 
 render {
-	new_render_scheduling = false
+	new_render_scheduling = true
 	direct_scanout = true
 	cm_fs_passthrough = 2
 	cm_enabled = true
+    cm_sdr_eotf = 2
+    cm_auto_hdr = 2
+    send_content_type = true
+    non_shader_cm = 3
 }
 
 # < End Section >
@@ -284,20 +283,7 @@ dwindle {
 
 # < Start Section >
 # plugins
-plugin {
+
-    hyprbars { 
-        enable = true
-        bar_height = 25
-        bar_color = rgb(05027D)
-        bar_text_align = left
-        bar_part_of_window = true
-        bar_precedence_over_border = true
-        hyprbars-button = rgb(CCB8C8), 18, X, hyprctl dispatch killactive
-        hyprbars-button = rgb(CCB8C8), 18, , hyprctl dispatch fullscreen 1
-        hyprbars-button = rgb(CCB8C8), 18, , 
-        bar_padding = 15
-    }
-}
 # < End Section >
 
 
@@ -309,9 +295,9 @@ plugin {
 windowrule {
 	name = globals
 	match:class = ^(.*)$
-	suppress_event = maximize
+	suppress_event = maximize fullscreen
 	render_unfocused = true
-	opacity = 1.00 1.00
+	opacity = 0.75 0.75
     pseudo = false
 }
 
@@ -319,7 +305,7 @@ windowrule = match:class ^(qt5ct)$, float true
 windowrule = match:class ^(nwg-look)$, float true
 windowrule = match:class ^(pavucontrol)$, float true
 windowrule = match:class ^(org.kde.polkit-kde-authentication-agent-1)$, float true
-windowrule = match:workspace 4, float true
+windowrule = match:class ^(org.speedcrunch.speedcrunch)$, float true
 
 # main
 windowrule = match:class ^(discord)$, workspace 1 silent
@@ -329,68 +315,38 @@ windowrule = match:class ^(Dopamine)$, workspace 1 silent
 windowrule = match:class ^(spotify)$, workspace 1 silent
 windowrule = match:class ^(Alacritty)$, workspace 2 silent
 windowrule = match:class ^(Alacritty)$, tile true
-windowrule = match:class ^(floorp)$, workspace 2 silent
+windowrule = match:class ^(floorp)$, workspace 3 silent
 windowrule = match:class ^(floorp)$, tile true
-windowrule = match:class ^(steam)$, workspace 4 silent
-windowrule = match:class ^(org.prismlauncher.PrismLauncher)$, workspace 4 silent
-windowrule = match:class ^(Minecraft.*)$, workspace 4 silent
-windowrule = match:class ^(steam_app_.*)$, workspace 4 silent
-windowrule = match:class ^(steam_proton)$, workspace 4 silent
-windowrule = match:class ^(cstrike_linux64)$, workspace 4 silent
-windowrule = match:class ^(dota2)$, workspace 4 silent
-windowrule = match:class ^(gamescope)$, workspace 4 silent
 windowrule = match:class ^(steam)$, workspace 6 silent
 
-# development
+# tag games
-windowrule = match:class ^(VirtualBox.*)$, float true
+windowrule = match:xdg_tag proton-game, tag +game
-windowrule = match:title ^(SnakePlusPlus)$, float true
+windowrule = match:title ^(Warframe)$, tag +game
-windowrule = match:title ^(SnakePlusPlus)$, center true
+windowrule = match:class ^(org.prismlauncher.PrismLauncher)$, tag +game
-windowrule = match:title ^(SnakePlusPlus)$, opacity 0.4
+windowrule = match:class ^(Minecraft.*)$, tag +game
-windowrule = match:title ^(TetrisPlusPlus)$, center true
+windowrule = match:class ^(steam_app_.*)$, tag +game
-windowrule = match:class ^(aquamarine)$, workspace 2 silent
+windowrule = match:class ^(steam_proton)$, tag +game
-windowrule = match:class ^(aquamarine)$, fullscreen true
+windowrule = match:class ^(cstrike_linux64)$, tag +game
-
+windowrule = match:class ^(dota2)$, tag +game
-# games
+windowrule = match:class ^(gamescope)$, tag +game
-# 16:9 windowed - 1920 1080
+windowrule = match:class ^(wowclassic.exe)$, tag +game
-# 21:9 windowed - 2580 1080
+windowrule = match:title ^(World of Warcraft)$, tag +game
-# 32:9 windowed - 3200 900
+windowrule = match:class ^(RuneScape)$, tag +game
-# theoretical mix - 3200 1100
+windowrule = match:class ^(bolt.*)$, tag +game
-# alternative - 2660 1140
+windowrule = match:class ^(Minecraft.*)$, tag +game
-# world of warcraft classic
+windowrule = match:class ^(net-runelite-client-RuneLite)$, tag +game
-windowrule = match:class ^(wowclassic.exe)$, opacity 1.00 override 1.00 override
+# Runelite opacity likes to skip after login
-windowrule = match:class ^(wowclassic.exe)$, workspace 4 silent
-# world of warcraft
-windowrule = match:title ^(World of Warcraft)$, opacity 1.00 override 1.00 override
-windowrule = match:title ^(World of Warcraft)$, workspace 4 silent
-# Runescape
 windowrule = match:class ^(net-runelite-client-RuneLite)$, opacity 1.00 override 1.00 override
-#windowrule = match:class ^(net-runelite-client-RuneLite)$, fullscreen true
+
-#windowrule = match:class ^(net-runelite-client-RuneLite)$, workspace 5 silent
+windowrule {
-windowrule = match:class ^(RuneScape)$, opacity 1.00 override 1.00 override
+    name = games
-#windowrule = match:class ^(bolt.*)$, workspace 5 silent
+    match:tag = game
-windowrule = match:class ^(bolt.*)$, tile true
+    workspace = 4 silent
-# minecraft
+    opacity = 1.00 override 1.00 override
-windowrule = match:class ^(Minecraft.*)$, opacity 1.00 override 1.00 override
+    float = true
-windowrule = match:class ^(Minecraft.*)$, workspace 4 silent
+    no_initial_focus = true
-windowrule = match:class ^(Minecraft.*)$, float true
+    suppress_event = maximize
-#windowrule = match:class ^(Minecraft.*)$, size 3200 1100
+}
-# native
-windowrule = match:class ^(steam_app_.*)$, opacity 1.00 override 1.00 override
-windowrule = match:class ^(steam_app_.*)$, float true
-# proton
-windowrule = match:class ^(steam_proton)$, opacity 1.00 override 1.00 override
-windowrule = match:class ^(steam_proton)$, float true
-# hl2 (css, etc)
-windowrule = match:class ^(cstrike_linux64)$, opacity 1.00 override 1.00 override
-# dota 2
-windowrule = match:class ^(dota2)$, opacity 1.00 override 1.00 override
-# gamescope
-windowrule = match:class ^(gamescope)$, opacity 1.00 override 1.00 override
-windowrule = match:class ^(gamescope)$, float true
-#windowrule = match:class ^(gamescope)$, size 3200 1100
-# steamtinkerlaunch
-windowrule = match:class ^(yad)$, float true
-windowrule = match:class ^(yad)$, size 1920 1080
 
 # layer rules
 layerrule = match:namespace waybar, blur true

hypr/hyprlock.conf

@@ -1,7 +1,5 @@
-source = $HOME/.config/hypr/mocha.conf
+source = $HOME/.config/hypr/colorscheme.conf
 
-$accent = $mauve
-$accentAlpha = $mauveAlpha
 $font = JetBrainsMono Nerd Font
 
 # GENERAL
@@ -14,21 +12,21 @@ general {
 background {
     monitor = 
     blur_passes = 0
-    color = $base
+    color = $bg
 }
 
 background {
-    monitor = DP-1
+    monitor = DP-3
     path = ~/.profile/wallpaper-locked.png
     blur_passes = 0
-    color = $base
+    color = $bg
 }
 
 # TIME
 label {
-    monitor = DP-1
+    monitor = DP-3
     text = cmd[update:30000] echo "$(date +"%R")"
-    color = $text
+    color = $gray
     font_size = 90
     font_family = $font
     position = -30, 0
@@ -38,9 +36,9 @@ label {
 
 # DATE 
 label {
-    monitor = DP-1
+    monitor = DP-3
     text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
-    color = $text
+    color = $gray
     font_size = 25
     font_family = $font
     position = -30, -150
@@ -51,10 +49,10 @@ label {
 # USER AVATAR
 
 image {
-    monitor = DP-1
+    monitor = DP-3
     path = ~/.profile/pfp.png
     size = 100
-    border_color = $accent
+    border_color = $orange
 
     position = 0, 75
     halign = center
@@ -63,22 +61,22 @@ image {
 
 # INPUT FIELD
 input-field {
-    monitor = DP-1
+    monitor = DP-3
     size = 300, 60
     outline_thickness = 4
     dots_size = 0.2
     dots_spacing = 0.2
     dots_center = true
-    outer_color = $accent
+    outer_color = $orange
-    inner_color = $surface0
+    inner_color = rgb($bg)
-    font_color = $text
+    font_color = rgb($gray)
     fade_on_empty = false
-    placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+    placeholder_text = <span foreground="##$fg3"><i>󰌾 Logged in as </i><span foreground="##$fg3">$USER</span></span>
     hide_input = false
-    check_color = $accent
+    check_color = rgb($orange)
-    fail_color = $red
+    fail_color = rgb($red)
     fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-    capslock_color = $yellow
+    capslock_color = rgb($red)
     position = 0, -35
     halign = center
     valign = center

hypr/scripts/xrandr.sh

@@ -3,27 +3,27 @@
 # Custom resolution through xrandr (21:9)
 xrandr --newmode "2560x1080"  677.75  2560 2784 3064 3568  1080 1083 1093 1188 -hsync +vsync
 xrandr --newmode "2560x1080R"  373.00  2560 2608 2640 2720  1080 1083 1093 1144 +hsync -vsync
-xrandr --addmode DP-1 2560x1080
+xrandr --addmode DP-3 2560x1080
-xrandr --addmode DP-1 2560x1080R
+xrandr --addmode DP-3 2560x1080R
 
 # 3200x900 suggestion (32:9)
 xrandr --newmode "3200x900" 704.50  3200 3472 3824 4448  900 903 913 991 -hsync +vsync
-xrandr --addmode DP-1 3200x900
+xrandr --addmode DP-3 3200x900
 
 # 3200x1100 suggestion
 xrandr --newmode "3200x1100" 863.75  3200 3480 3832 4464  1100 1103 1113 1210 -hsync +vsync
-xrandr --addmode DP-1 3200x1100
+xrandr --addmode DP-3 3200x1100
 
 # 3200x1100 suggestion (21:9)
 xrandr --newmode "2100x900"  462.50  2100 2280 2512 2920  900 903 913 991 -hsync +vsync
-xrandr --addmode DP-1 2100x900 
+xrandr --addmode DP-3 2100x900 
 
 # 1.7
 xrandr --newmode "2040x1200"  578.75  2040 2216 2440 2840  1200 1203 1213 1316 -hsync +vsync
-xrandr --addmode DP-1 2040x1200 
+xrandr --addmode DP-3 2040x1200 
 
 # 2.4
 xrandr --newmode "2880x1200"  818.50  2880 3128 3448 4016  1200 1203 1213 1316 -hsync +vsync
-xrandr --addmode DP-1 2880x1200 
+xrandr --addmode DP-3 2880x1200 
 
-sleep 2 && xrandr --output DP-1 --primary --set "scaling mode" "Full aspect" # Set primary monitor for xwayland
+sleep 2 && xrandr --output DP-3 --primary --set "scaling mode" "Full aspect" # Set primary monitor for xwayland

waybar/armory

@@ -1,120 +0,0 @@
-[
-    {
-        "name": "main",
-        "layer": "bottom",
-        "position": "top",
-        "height": 40,
-        "spacing": 0,
-        "output": "DP-1",
-        "reload_style_on_change": true,
-        "modules-left": [
-            "custom/appmenu",
-            "disk", 
-            "memory", 
-            "cpu", 
-            "custom/gpu",
-            "temperature"
-        ],
-        "modules-center": [
-            "hyprland/workspaces"
-        ],
-        "modules-right": [
-            "tray", 
-            "wireplumber", 
-            "network#ethernet", 
-            "clock",
-            "custom/poweroff"
-        ],
-        "clock": {
-            "interval": 1,
-            "format": "<b>{:%I:%M:%S %p}</b>",
-            "format-alt": "{:%Y-%m-%d}",
-            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-        },
-        "cpu": {
-            "format": " {usage}%",
-            "interval": 5,
-            "tooltip": false
-        },
-        "disk": {
-            "format": " {percentage_used}%",
-            "tooltip-format": "{used} / {total} used"
-        },
-        "idle_inhibitor": {
-            "format": "{icon}",
-            "format-icons": {
-                "activated": "",
-                "deactivated": ""
-            }
-        },
-        "memory": {
-            "format": " {}%",
-            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
-        },
-        "temperature": {
-            "format": "{icon} {temperatureC}°C ",
-            "format-icons": ["", "", "", "", ""],
-            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp",
-            "critical-threshold": 80,
-            "interval": 5
-        },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
-        },
-        "sway/mode": {
-            "format": "<span style=\"italic\">{}</span>"
-        },
-        "hyprland/workspaces": {
-            "format": "{icon}",
-            "sort-by-number": true,
-            "all-outputs": true,
-            "disable-scroll": true,
-            "active-only": false,
-            "format-icons": {
-                "default": "",
-                "persistent": "",
-            },
-            "persistent-workspaces": {
-                "1": [ ],
-                "2": [ ],
-                "3": [ ],
-                "4": [ ],
-                "5": [ ]
-            }
-
-        },
-        "wireplumber": {
-            "format": " {volume}%",
-            "format-muted": " 0%",
-            "on-click": "pavucontrol",
-            "on-click-right": "helvum",
-            "max-volume": 100,
-            "scroll-step": 5
-        },
-        "tray": {
-            "icon-size": 21,
-            "spacing": 10
-        },
-        "custom/appmenu": {
-            "format": "",
-            "on-click": "pkill -x rofi || rofi -show drun"
-        },
-        "custom/gpu": {
-            "format": "󰔂 {}%",
-            "interval": 5,
-            "tooltip": false,
-            "exec": "nvidia-smi --query | grep Gpu | tail -1 | awk '{print $3}'"
-        },
-        "custom/poweroff": {
-            "tooltip": false,
-            "format": " ",
-            "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh"
-        },
-    }
-]

waybar/armory.css

@@ -1,82 +0,0 @@
-@import "mocha.css";
-
-* {
-    border: none;
-    border-radius: 0px;
-    min-height: 0;
-    font-weight: bold;
-	font-size: 14px;
-	font-family: "Hack Nerd Font";
-}
-
-window#waybar {
-    background-color: alpha(@crust, 0.3);
-    border-radius: 0px;
-    border-bottom: 0px solid @overlay0;
-}
-
-#workspaces button {
-    color: @peach;
-    border-radius: 8px;
-    margin: 4px 2px;
-    padding: 0px 8px;
-    transition: all 0.4s ease;
-}
-
-#workspaces button.active {
-    background-color: alpha(@peach, 0.2);
-    transition: all 0.4s ease;
-}
-
-.modules-left,
-.modules-center,
-.modules-right {
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
-.modules-left {
-    padding-left: 0px;
-}
-
-.modules-right {
-    padding-right: 0px;
-}
-
-#clock,
-#cpu,
-#disk,
-#memory,
-#temperature,
-#tray,
-#wireplumber,
-#workspaces,
-#network,
-#custom-appmenu,
-#custom-gpu,
-#custom-poweroff,
-#custom-weather {
-    background-color: transparent;
-    border-radius: 10px;
-    border: 0px;
-    margin-left: 6px;
-    margin-right: 6px;
-    color: @peach;
-    min-width: 45px;
-}
-
-#network {
-    margin: 0px;
-    padding: 0px;
-}
-
-#custom-appmenu,
-#workspaces label,
-#network {
-    font-size: 18px;
-}
-
-
-#clock {
-    min-width: 80px;
-}

waybar/colorscheme.css

@@ -0,0 +1,38 @@
+/* foreground */
+@define-color fg            #3c3836;
+@define-color fg0           #282828;
+@define-color fg1           #3c3836;
+@define-color fg2           #504945;
+@define-color fg3           #665c54;
+@define-color fg4           #7c6f64;
+
+/* background */
+@define-color bg            #fbf1c7;
+@define-color bg0           #fbf1c7;
+@define-color bg0_h         #f9f5d7;
+@define-color bg0_s         #f2e5bc;
+@define-color bg1           #ebdbb2;
+@define-color bg2           #d5c4a1;
+@define-color bg3           #bdae93;
+@define-color bg4           #a89984;
+
+/* colors */
+@define-color gray          #7c6f64;
+@define-color red           #cc241d;
+@define-color green         #98971a;
+@define-color yellow        #d79921;
+@define-color blue          #458588;
+@define-color purple        #b16286;
+@define-color aqua          #689d6a;
+@define-color orange        #d65d0e;
+@define-color peach         #fe640b;
+
+/* alternates */
+@define-color alt_gray      #928374;
+@define-color alt_red       #9d0006;
+@define-color alt_green     #79740e;
+@define-color alt_yellow    #b57614;
+@define-color alt_blue      #076678;
+@define-color alt_purple    #8f3f71;
+@define-color alt_aqua      #427b58;
+@define-color alt_orange    #af3a03;

waybar/config

@@ -2,26 +2,24 @@
     {
         "name": "main",
         "layer": "bottom",
-        "position": "bottom",
+        "position": "top",
         "height": 40,
         "spacing": 0,
-        "output": "DP-1",
         "reload_style_on_change": true,
         "modules-left": [
             "custom/appmenu",
-            "hyprland/workspaces",
+            "disk", 
-            "wlr/taskbar"
+            "memory", 
+            "cpu", 
+            "temperature",
+            "custom/gpu-usage"
         ],
         "modules-center": [
+            "hyprland/workspaces"
         ],
         "modules-right": [
             "tray", 
             "wireplumber", 
-            "disk", 
-            "memory", 
-            "cpu", 
-            "custom/gpu",
-            "temperature",
             "network#ethernet", 
             "clock",
             "custom/poweroff"
@@ -111,14 +109,13 @@
             "spacing": 10
         },
         "custom/appmenu": {
-            "format": " Start",
+            "format": "",
             "on-click": "pkill -x rofi || rofi -show drun"
         },
-        "custom/gpu": {
+        "custom/gpu-usage": {
-            "format": "󰔂 {}%",
+            "format": "󰔂 {text}",
-            "interval": 5,
+            "exec": "gpu-usage-waybar",
-            "tooltip": false,
+            "return-type": "json"
-            "exec": "nvidia-smi --query | grep Gpu | tail -1 | awk '{print $3}'"
         },
         "custom/poweroff": {
             "tooltip": false,

waybar/mocha.css

@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;

waybar/style.css

@@ -1,8 +1,7 @@
-@import "mocha.css";
+@import "colorscheme.css";
 
 * {
     border: none;
-    border-radius: 0px;
     min-height: 0;
     font-weight: normal;
 	font-size: 14px;
@@ -10,25 +9,20 @@
 }
 
 window#waybar {
-    background-color: #D9CFC2;
+    background-color: @bg0;
-    border-radius: 0px;
     border-bottom: 0px solid @overlay0;
 }
 
 #workspaces button {
-    color: black;
+    color: @gray;
-    border-radius: 0px;
+    border: 1px solid @bg0;
-    margin: 0px 0px;
+    margin: 0px 2px;
     padding: 0px 8px;
     transition: all 0.4s ease;
 }
 
-#workspaces button {
-    border: 2px solid #EAE5DE;
-}
-
 #workspaces button.active {
-    border: 2px solid grey;
+    border: 1px solid @yellow;
     transition: all 0.4s ease;
 }
 
@@ -47,7 +41,6 @@ window#waybar {
 
 .modules-right {
     padding-right: 0px;
-    border: 2px solid #EAE5DE;
 }
 
 #clock,
@@ -61,24 +54,21 @@ window#waybar {
 #network,
 #taskbar,
 #custom-appmenu,
-#custom-gpu,
+#custom-gpu-usage,
 #custom-poweroff,
 #custom-weather {
-    border-radius: 0px;
-    border: 0px;
     margin-left: 6px;
     margin-right: 6px;
-    color: black;
+    color: @gray;
     min-width: 45px;
 }
 
 #taskbar button {
-    color: black;
+    color: @gray;
-    border: 1px solid #EAE5DE;
 }
 
 #taskbar button.active {
-    border: 1px solid grey;
+    border: 1px solid @yellow;
 }
 
 #network {
@@ -88,7 +78,6 @@ window#waybar {
 
 #custom-appmenu {
     padding: 0px 4px;
-    border: 2px solid #EAE5DE;
 }
 
 #custom-appmenu,

waybar/winxp

@@ -1,129 +0,0 @@
-[
-    {
-        "name": "main",
-        "layer": "bottom",
-        "position": "bottom",
-        "height": 40,
-        "spacing": 0,
-        "output": "DP-1",
-        "reload_style_on_change": true,
-        "modules-left": [
-            "custom/appmenu",
-            "wlr/taskbar"
-        ],
-        "modules-center": [
-        ],
-        "modules-right": [
-            "tray", 
-            "disk", 
-            "memory", 
-            "cpu", 
-            "custom/gpu",
-            "temperature",
-            "wireplumber", 
-            "network#ethernet", 
-            "clock",
-            "custom/poweroff"
-        ],
-        "clock": {
-            "interval": 1,
-            "format": "<b>{:%I:%M:%S %p}</b>",
-            "format-alt": "{:%Y-%m-%d}",
-            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-        },
-        "cpu": {
-            "format": " {usage}%",
-            "interval": 5,
-            "tooltip": false
-        },
-        "disk": {
-            "format": " {percentage_used}%",
-            "tooltip-format": "{used} / {total} used"
-        },
-        "idle_inhibitor": {
-            "format": "{icon}",
-            "format-icons": {
-                "activated": "",
-                "deactivated": ""
-            }
-        },
-        "memory": {
-            "format": " {}%",
-            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
-        },
-        "wlr/taskbar": {
-            "format": "{name}",
-            "tooltip-format": "{title}",
-            "on-click": "activate",
-            "on-click-right": "close",
-            "ignore-list": [
-                "Wayland to X Recording bridge — Xwayland Video Bridge"
-            ]
-        },
-        "temperature": {
-            "format": "{icon} {temperatureC}°C ",
-            "format-icons": ["", "", "", "", ""],
-            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp",
-            "critical-threshold": 80,
-            "interval": 5
-        },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
-        },
-        "sway/mode": {
-            "format": "<span style=\"italic\">{}</span>"
-        },
-        "hyprland/workspaces": {
-            "format": "{icon}",
-            "sort-by-number": true,
-            "all-outputs": true,
-            "disable-scroll": true,
-            "active-only": false,
-            "format-icons": {
-                "default": "",
-                "persistent": "",
-            },
-            "persistent-workspaces": {
-                "1": [ ],
-                "2": [ ],
-                "3": [ ],
-                "4": [ ],
-                "5": [ ]
-            }
-
-        },
-        "wireplumber": {
-            "format": " {volume}%",
-            "format-muted": " 0%",
-            "on-click": "pavucontrol",
-            "on-click-right": "helvum",
-            "max-volume": 100,
-            "scroll-step": 5
-        },
-        "tray": {
-            "icon-size": 21,
-            "spacing": 10
-        },
-        "custom/appmenu": {
-            "format": " start",
-            "on-click": "pkill -x rofi || rofi -show drun"
-        },
-        "custom/gpu": {
-            "format": "󰔂 {}%",
-            "interval": 5,
-            "tooltip": false,
-            "exec": "nvidia-smi --query | grep Gpu | tail -1 | awk '{print $3}'"
-        },
-        "custom/poweroff": {
-            "tooltip": false,
-            "format": " ",
-            "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh"
-        },
-    }
-]

waybar/winxp.css

@@ -1,84 +0,0 @@
-@import "mocha.css";
-
-* {
-    border: none;
-    border-radius: 0px;
-    min-height: 0;
-    font-weight: bold;
-	font-size: 14px;
-	font-family: "Hack Nerd Font";
-}
-
-window#waybar {
-    border-radius: 0px;
-    border-bottom: 0px solid @overlay0;
-    background: rgb(0, 78, 214);
-}
-
-#workspaces button {
-    border-radius: 8px;
-    margin: 4px 2px;
-    padding: 0px 8px;
-    transition: all 0.4s ease;
-}
-
-#workspaces button.active {
-    transition: all 0.4s ease;
-}
-
-.modules-left,
-.modules-center,
-.modules-right {
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
-.modules-left {
-    padding-left: 0px;
-}
-
-.modules-right {
-    padding-right: 0px;
-    background: rgb(63, 149, 235);
-}
-
-#custom-appmenu {
-    background: rgb(0, 141, 0);
-    padding: 0px 12px;
-    border-top-right-radius: 13px;
-    border-bottom-right-radius: 13px;
-    border-right: solid 3px #088;
-}
-
-#clock,
-#cpu,
-#disk,
-#memory,
-#temperature,
-#tray,
-#wireplumber,
-#workspaces,
-#network,
-#custom-gpu,
-#custom-poweroff,
-#custom-weather {
-    margin-left: 4px;
-    margin-right: 2px;
-    min-width: 45px;
-}
-
-#network {
-    margin: 0px;
-    padding: 0px;
-}
-
-#custom-appmenu,
-#workspaces label,
-#network {
-    font-size: 18px;
-}
-
-
-#clock {
-    min-width: 80px;
-}