From 5e2f3c5fa5a57e5557d27925430482d703f70aba Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 12 Apr 2023 21:48:50 +0100
Subject: [PATCH] Add hyprpaper to sway, improve styling for waybar on sway

---
 nixos/home-manager/env/config/sway/swayconfig        | 1 +
 nixos/home-manager/env/config/waybar/config-hyprland | 2 +-
 nixos/home-manager/env/config/waybar/config-sway     | 4 ++--
 nixos/home-manager/env/config/waybar/style.css       | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/home-manager/env/config/sway/swayconfig b/nixos/home-manager/env/config/sway/swayconfig
index a45ed3ba..908e11d0 100644
--- a/nixos/home-manager/env/config/sway/swayconfig
+++ b/nixos/home-manager/env/config/sway/swayconfig
@@ -218,5 +218,6 @@ bindsym $mod+r mode "resize"
 include /etc/sway/config.d/*
 
 exec dunst
+exec hyprpaper -c ~/.dotfiles/nixos/home-manager/env/config/hypr/hyprpaper.conf
 exec waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config-sway
 exec eww daemon
diff --git a/nixos/home-manager/env/config/waybar/config-hyprland b/nixos/home-manager/env/config/waybar/config-hyprland
index a1704f49..0d7f919e 100644
--- a/nixos/home-manager/env/config/waybar/config-hyprland
+++ b/nixos/home-manager/env/config/waybar/config-hyprland
@@ -7,7 +7,7 @@
     // Choose the order of the modules
     "modules-left": ["wlr/workspaces", "hyprland/submap"],
     "modules-center": ["hyprland/window"],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "hyprland/language", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "hyprland/language", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
     "wlr/workspaces": {
         "disable-scroll": true,
diff --git a/nixos/home-manager/env/config/waybar/config-sway b/nixos/home-manager/env/config/waybar/config-sway
index 3cc5d59b..89cc1765 100644
--- a/nixos/home-manager/env/config/waybar/config-sway
+++ b/nixos/home-manager/env/config/waybar/config-sway
@@ -7,9 +7,9 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": ["sway/window"],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "hyprland/language", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight",  "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
-    "wlr/workspaces": {
+    "sway/workspaces": {
         "disable-scroll": true,
         "all-outputs": true,
         "format": "{icon}",
diff --git a/nixos/home-manager/env/config/waybar/style.css b/nixos/home-manager/env/config/waybar/style.css
index 92709802..c71ddb85 100644
--- a/nixos/home-manager/env/config/waybar/style.css
+++ b/nixos/home-manager/env/config/waybar/style.css
@@ -92,7 +92,8 @@ button:hover {
   color: @surface2;
 }
 
-#workspaces button.active {
+#workspaces button.active,
+#workspaces button.focused {
   color: @text;
   box-shadow: inset 0 -2px;
 }