From 76e8ba8527b9300ba3b15f18dc6b683e56a9dc47 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpitchakladar+git@gmail.com>
Date: Sun, 26 Jul 2026 02:26:24 +0530
Subject: feat: configure Wayland scaling, switch to scrolling layout, polish
 theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Set GDK_SCALE, QT_SCALE_FACTOR, monitor scale=1, chromium
--force-device-scale-factor=1.15
- Migrate dwindle → scrolling layout with column config and Equal key
resize
- Bump default font size to 18, cursor to 20, system-monitor font shift
- Change gap_out to 10, border width to 1px, inactive border to base03
- Refactor waybar workspaces/network to use shared mkIcon helper
- Toggle window close with SHIFT+Q, remove redundant file-explorer size
rule
- Thinner rofi borders, larger width, bigger icons, bold prompt color
- Tidy waybar spacing: uniform margins, larger padding, resized
workspace buttons
- Enable xwayland force_zero_scaling
---
 modules/desktop/waybar/module/default.nix    |  2 +-
 modules/desktop/waybar/module/network.nix    |  6 ++++--
 modules/desktop/waybar/module/workspaces.nix |  8 +++++--
 modules/desktop/waybar/style.nix             | 32 ++++++++++++----------------
 4 files changed, 25 insertions(+), 23 deletions(-)

(limited to 'modules/desktop/waybar')

diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix
index ebfa2c4..c1c8048 100644
--- a/modules/desktop/waybar/module/default.nix
+++ b/modules/desktop/waybar/module/default.nix
@@ -24,6 +24,6 @@ in
         ;
     };
     "hyprland/window" = import ./window.nix { inherit config; };
-    "hyprland/workspaces" = import ./workspaces.nix { inherit config lib; };
+    "hyprland/workspaces" = import ./workspaces.nix { inherit config lib mkIcon; };
   };
 }
diff --git a/modules/desktop/waybar/module/network.nix b/modules/desktop/waybar/module/network.nix
index 7f0af4c..f20121f 100644
--- a/modules/desktop/waybar/module/network.nix
+++ b/modules/desktop/waybar/module/network.nix
@@ -2,12 +2,14 @@
 with config.scheme.withHashtag;
 let
   iconColor = base0B;
+  downloadIcon = mkIcon base0F "󰁅";
+  uploadIcon = mkIcon base0F "󰁝";
 in
 {
   interval = 2;
 
-  format-wifi = "${mkIcon iconColor "{icon}"}  󰁅{bandwidthDownBytes}  󰁝{bandwidthUpBytes}";
-  format-ethernet = "${mkIcon iconColor ""}  󰁅{bandwidthDownBytes}  󰁝{bandwidthUpBytes}";
+  format-wifi = "${mkIcon iconColor "{icon}"}  ${downloadIcon}{bandwidthDownBytes}  ${uploadIcon}{bandwidthUpBytes}";
+  format-ethernet = "${mkIcon iconColor ""}  ${downloadIcon}{bandwidthDownBytes}  ${uploadIcon}{bandwidthUpBytes}";
   format-disconnected = "${mkIcon iconColor "󰤮"}  Disconnected";
 
   tooltip-format = "{ifname}";
diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix
index a16b9e5..c8a99c2 100644
--- a/modules/desktop/waybar/module/workspaces.nix
+++ b/modules/desktop/waybar/module/workspaces.nix
@@ -1,9 +1,13 @@
-{ config, lib }:
+{
+  config,
+  lib,
+  mkIcon,
+}:
 with config.scheme.withHashtag;
 let
   mkWindowRewrite =
     enable: color: icon:
-    lib.mkIf enable "<span font_size='150%' color='${color}'>${icon}</span>";
+    lib.mkIf enable (mkIcon color icon);
 in
 {
   format = "{windows} <span rise='-3000' font_size='small'>{id}</span>";
diff --git a/modules/desktop/waybar/style.nix b/modules/desktop/waybar/style.nix
index b0da995..fead24e 100644
--- a/modules/desktop/waybar/style.nix
+++ b/modules/desktop/waybar/style.nix
@@ -14,38 +14,34 @@ with config.scheme.withHashtag;
   #workspaces, #window, #pulseaudio, #battery, #custom-vpn, #network,
   #clock.time, #memory, #cpu, #clock.date {
     background: ${base00};
-    margin: 0 2px;
-  }
-
-  #window {
-    margin-right: 3px;
+    margin: 0 5px;
   }
 
   #workspaces {
     border: none;
-    margin-left: 3px;
-  }
-
-  #clock.date {
-    margin-right: 5px;
+    margin-right: 0;
   }
 
   #window, #pulseaudio, #battery, #custom-vpn, #network,
   #clock.time, #memory, #cpu, #clock.date {
-    border: 1.5px solid ${base07};
+    border: 1px solid ${base07};
     color: ${base07};
-    padding: 0 8px;
+    padding: 0 10px;
+  }
+
+  #clock.date {
+    margin-right: 10px;
   }
 
   #workspaces button {
-    padding: 3px;
+    padding: 5px;
     color: ${base07};
-    border: 1.5px solid ${base03};
+    border: 1px solid ${base03};
     border-radius: 0;
-    min-width: 24px;
-    min-height: 24px;
-    margin: 0 2px;
-    font-size: 30px;
+    min-width: 0px;
+    min-height: 0px;
+    margin: 0 5px;
+    font-size: 24px;
   }
 
   #workspaces button:hover {
-- 
cgit v1.2.3