From b1afb4a06ab8ff8bab7a6ea487401e2b58d2c703 Mon Sep 17 00:00:00 2001
From: pagedmov <pagedmov@gmail.com>
Date: Wed, 6 Nov 2024 01:13:11 -0500
Subject: [PATCH] hyprland window border and waybar border are now more
 visually consistent

---
 modules/home/environment/hyprland.nix | 15 ++++++++-------
 modules/home/environment/waybar.nix   |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/home/environment/hyprland.nix b/modules/home/environment/hyprland.nix
index ff8c283..6d1f77c 100755
--- a/modules/home/environment/hyprland.nix
+++ b/modules/home/environment/hyprland.nix
@@ -3,12 +3,13 @@
   screenshot_bind =
     if desktop
     then [
-      # My laptop does not have a printscreen button
       "super, print, exec, grimblast copy area"
     ]
     else [
+      # My laptop does not have a printscreen button
       "super, insert, exec, grimblast copy area"
     ];
+  scheme = config.lib.stylix.colors;
 in {
   options = {
     hyprlandConfig.enable = lib.mkEnableOption "enables my hyprland config";
@@ -101,9 +102,9 @@ in {
           layout = "dwindle";
           gaps_in = 4;
           gaps_out = 8;
-          border_size = 2;
+          border_size = 3;
           #"col.inactive_border" = "0xff${scheme.base01}";
-          #"col.active_border" = "0xff${scheme.base0F}";
+          "col.active_border" = lib.mkForce "0xff${scheme.base0F}";
           border_part_of_window = false;
           no_border_on_floating = false;
         };
@@ -134,16 +135,16 @@ in {
         };
 
         decoration = {
-          rounding = 20;
+          rounding = 16;
           # active_opacity = 0.90;
-          # inactive_opacity = 0.90;
-          # fullscreen_opacity = 1.0;
+          inactive_opacity = 0.90;
+          fullscreen_opacity = 1.0;
 
           blur = {
             enabled = true;
             # size = 1;
             # passes = 1;
-            size = 4;
+            size = 2;
             passes = 1;
             brightness = 1;
             contrast = 1.400;
diff --git a/modules/home/environment/waybar.nix b/modules/home/environment/waybar.nix
index 6526457..da79230 100755
--- a/modules/home/environment/waybar.nix
+++ b/modules/home/environment/waybar.nix
@@ -459,7 +459,7 @@ in {
           }
 
           #pulseaudio {
-            color: #${colors.color4};
+            color: #${colors.color1};
             font-size: 18px;
           }
 
@@ -481,11 +481,11 @@ in {
           #backlight-slider highlight,
           #pulseaudio-slider highlight {
             border-radius: 8px;
-            background-color: #${colors.color3};
+            background-color: #${colors.color4};
           }
 
           #network {
-            color: #${colors.color3};
+            color: #${colors.color1};
             font-size: 20px;
             background: #${bg.dark};
             border-radius: 20px;