From 565ac6ff9f54064a04d2d6dce1bebbec6b5c8333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Fri, 31 May 2024 12:53:58 +0200
Subject: [PATCH] Hyperland/waybar changes

---
 home/hyprland/hyprland_gunter.nix | 33 ++++++++++++++++++++-----------
 home/hyprland/waybar/default.nix  | 20 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/home/hyprland/hyprland_gunter.nix b/home/hyprland/hyprland_gunter.nix
index 50ed671..e9fd9a7 100644
--- a/home/hyprland/hyprland_gunter.nix
+++ b/home/hyprland/hyprland_gunter.nix
@@ -42,7 +42,7 @@
           # "$mon_left,2560x1440@75,0x1080,1" # left
           "DP-8,2560x1440@75,0x1080,1" # left 75hz
           # "$mon_center,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd
-          "DP-5,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
+          "DP-5,2560x1440@144,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
           # "$mon_right,2560x1440@75,5120x1080,1" # right
           "DP-7,2560x1440@75,5120x1080,1" # right 75hz
         ];
@@ -96,7 +96,10 @@
           preserve_split = true;
         };
         master.new_is_master = true;
-        misc.force_default_wallpaper = -1;
+        misc = {
+          force_default_wallpaper = 0;
+          disable_hyprland_logo = true;
+        };
 
         windowrulev2 = [
           "opacity 0.95 override 0.7 override,class:^(Alacritty)$"
@@ -104,11 +107,13 @@
         ];
 
         workspace = [
-          "name:mumble, monitor:$mon_top, persistent:true, default:true"
-          "name:left, monitor:$mon_left, persistent:true, default:true"
-          "name:right, monitor:$mon_right, persistent:true, default:true"
-          "name:main 1, monitor:$mon_center, persistent:true, default:true"
-          "name:main 2, monitor:$mon_center, persistent:true, default:true"
+          "name:T, monitor:$mon_top, persistent:true, default:true"
+          "name:L, monitor:$mon_left, persistent:true, default:true"
+          "name:R, monitor:$mon_right, persistent:true, default:true"
+          "name:c1, monitor:$mon_center, persistent:true, default:true"
+          "name:c2, monitor:$mon_center, persistent:true, default:true"
+          "name:c3, monitor:$mon_center, persistent:true, default:true"
+          "name:c4, monitor:$mon_center, persistent:true, default:true"
         ];
 
         bindm = [
@@ -161,17 +166,21 @@
           ",code:202,pass,^discord$"
 
           # worspace switching
-          "$mainMod,1,workspace,name:main 1"
-          "$mainMod,2,workspace,name:main 2"
-          "$mainMod,3,workspace,3"
-          "$mainMod,4,workspace,4"
+          "$mainMod,1,workspace,name:c1"
+          "$mainMod,2,workspace,name:c2"
+          "$mainMod,3,workspace,name:c3"
+          "$mainMod,4,workspace,name:c4"
           "$mainMod,5,workspace,5"
           "$mainMod,6,workspace,6"
+
+          # Special workspace
+          "$mainMod,c,togglespecialworkspace"
+          "$shiftMainMod,c,movetoworkspace, special"
         ];
 
         exec-once = [
           "waybar"
-          "hyprpaper & sleep 2 && randomwp"
+          "hyprpaper & sleep 10 && randomwp"
           "easyeffects --gapplication-service"
           "hypridle"
           # "dunst"
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 5cc64d2..a63ba7b 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -48,17 +48,18 @@ in
       @import "macchiato.css";
       * {
         border: none;
-        border-radius: 10px;
-        min-height: 10px;
         font-family: "JetbrainsMono Nerd Font";
         font-size: 15px;
         transition-property: background-color;
         transition-duration: 0.5s;
         color: @text;
+        border-radius: 10px;
+        min-height: 10px;
       }
 
       window#waybar {
-        background: transparent;
+        background-color: @surface2;
+        border-radius: 0px;
       }
 
       window#waybar.hidden {
@@ -69,10 +70,10 @@ in
         margin-top: 6px;
         padding-left: 10px;
         padding-right: 10px;
-        border-radius: 10px;
+        border-radius: 0px;
         transition: none;
         color: transparent;
-        background: transparent;
+        background-color: @surface2;
       }
 
       @keyframes blink_red {
@@ -99,7 +100,7 @@ in
         padding-right: 12px;
       }
       #workspaces button.active {
-        background-color: @surface1;
+        background-color: @surface2;
       }
       #workspaces button.urgent {
         color: alpha(@red, 0.4);
@@ -121,6 +122,11 @@ in
       }
       .modules-right {
         background-color: @base;
+        border-radius: 10px 0px 0px 10px;
+      }
+      .modules-left {
+        background-color: @base;
+        border-radius: 0px 10px 10px 0px;
       }
       #mode,
       #clock,
@@ -162,9 +168,9 @@ in
             "pulseaudio#microphone"
             "memory"
             "cpu"
-            "tray"
             (lib.mkIf (withBattery) "battery")
             "clock"
+            "tray"
           ];
         "hyprland/workspaces" = {
           "format" = "{name}";