From 1019dd7ed7d783ff0c93a9d2f2027d1b66d80040 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 19 Apr 2024 18:51:24 -0400
Subject: [PATCH] waybar: move wm specific settings to wm modules

---
 homeManagerModules/apps/waybar/default.nix   |  4 +---
 homeManagerModules/apps/waybar/waybar.css    |  2 +-
 homeManagerModules/desktop/hypr/default.nix  | 10 ++++++++--
 homeManagerModules/desktop/river/default.nix |  6 ++++++
 homeManagerModules/desktop/sway/default.nix  |  6 ++++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/homeManagerModules/apps/waybar/default.nix b/homeManagerModules/apps/waybar/default.nix
index 306f2dc1..f179140c 100644
--- a/homeManagerModules/apps/waybar/default.nix
+++ b/homeManagerModules/apps/waybar/default.nix
@@ -24,14 +24,12 @@
         output = ["*"];
         position = "top";
         reload_style_on_change = true;
-        modules-left = ["hyprland/workspaces" "river/tags" "sway/workspaces" "hyprland/submap"];
+        modules-left = lib.mkDefault ["hyprland/workspaces" "hyprland/submap"];
         modules-center = ["clock"];
         modules-right = [
           "tray"
           "bluetooth"
-          # "network"
           "pulseaudio"
-          # "wireplumber"
           "group/power"
           "custom/logout"
         ];
diff --git a/homeManagerModules/apps/waybar/waybar.css b/homeManagerModules/apps/waybar/waybar.css
index ddf41899..17f2c921 100644
--- a/homeManagerModules/apps/waybar/waybar.css
+++ b/homeManagerModules/apps/waybar/waybar.css
@@ -21,7 +21,7 @@ window#waybar {
     color: #ca9ee6;
 }
 
-#submap {
+#submap, #mode {
     padding: 0 15px;
     margin: 0 5px;
     color: #e78284;
diff --git a/homeManagerModules/desktop/hypr/default.nix b/homeManagerModules/desktop/hypr/default.nix
index b756f6a6..5561f0db 100644
--- a/homeManagerModules/desktop/hypr/default.nix
+++ b/homeManagerModules/desktop/hypr/default.nix
@@ -65,6 +65,12 @@
       extraPortals = [pkgs.xdg-desktop-portal-hyprland];
     };
 
+    programs.waybar.settings = {
+      mainBar = {
+        modules-left = ["hyprland/workspaces" "hyprland/submap"];
+      };
+    };
+
     wayland.windowManager.hyprland.enable = true;
     wayland.windowManager.hyprland.extraConfig = let
       modifier = "SUPER";
@@ -368,7 +374,7 @@
       binde=,left,resizeactive,-10 0
       binde=,up,resizeactive,0 -10
       binde=,down,resizeactive,0 10
-      bind=,escape,submap,reset 
+      bind=,escape,submap,reset
       submap=reset
 
       bind=ALT,M,submap,move
@@ -392,7 +398,7 @@
       # hyprnome
       bind = , comma, exec, ${hyprnome} --previous --move
       bind = , period, exec, ${hyprnome} --move
-      bind=,escape,submap,reset 
+      bind=,escape,submap,reset
       submap=reset
     '';
   };
diff --git a/homeManagerModules/desktop/river/default.nix b/homeManagerModules/desktop/river/default.nix
index e074ccf4..6e32f606 100644
--- a/homeManagerModules/desktop/river/default.nix
+++ b/homeManagerModules/desktop/river/default.nix
@@ -109,6 +109,12 @@
       }
     '';
 
+    programs.waybar.settings = {
+      mainBar = {
+        modules-left = ["river/tags" "river/mode"];
+      };
+    };
+
     wayland.windowManager.river.enable = true;
     wayland.windowManager.river.extraConfig = let
       modifier = "Super";
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 49dfa1d2..11ead6e2 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -47,6 +47,12 @@
 
     services.cliphist.enable = lib.mkDefault true;
 
+    programs.waybar.settings = {
+      mainBar = {
+        modules-left = ["sway/workspaces" "sway/mode"];
+      };
+    };
+
     wayland.windowManager.sway.enable = true;
     wayland.windowManager.sway.config = let
       modifier = "Mod4";