re-order workspace button css, re-enable persistent workspaces

2 files changed, 15 insertions, 10 deletions

diff --git a/modules/user/desktop/swayfx.nix b/modules/user/desktop/swayfx.nix
index e1399fa..80a9a71 100644
--- a/modules/user/desktop/swayfx.nix
+++ b/modules/user/desktop/swayfx.nix
@@ -102,13 +102,13 @@
             persistent-workspaces = {
               "1" = [ "DP-1" "eDP-1" ];
               "2" = [ "DP-2" "eDP-1" ];
-              "3" = [ "eDP-1" ];
-              "4" = [ "eDP-1" ];
-              "5" = [ "eDP-1" ];
-              "6" = [ "eDP-1" ];
-              "7" = [ "eDP-1" ];
-              "8" = [ "eDP-1" ];
-              "9" = [ "eDP-1" ];
+              "3" = [];
+              "4" = [];
+              "5" = [];
+              "6" = [];
+              "7" = [];
+              "8" = [];
+              "9" = [];
             };
           };
 
diff --git a/modules/user/desktop/waybar.css b/modules/user/desktop/waybar.css
index decf542..9aa4d1e 100644
--- a/modules/user/desktop/waybar.css
+++ b/modules/user/desktop/waybar.css
@@ -21,13 +21,13 @@ tooltip label {
 
 #workspaces button {
     background: none;
+    box-shadow: none;
     color: #6e6a86;
     padding: 0;
 }
 
-#workspaces button:hover {
-    color: #e0def4;
-    text-shadow: inherit;
+#workspaces button.empty {
+    color: #403d52;
 }
 
 #workspaces button.visible {
@@ -42,6 +42,11 @@ tooltip label {
     color: #eb6f92;
 }
 
+#workspaces button:hover {
+    color: #e0def4;
+    text-shadow: inherit;
+}
+
 .module {
     padding: 0 8px;
     padding-top: 2px;