From 9960cd491a30402dd1723b583755c3ce93266158 Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Tue, 7 May 2024 19:09:51 +0200
Subject: [PATCH] Add some RICE

---
 home-manager/modules/sway.nix   | 56 +++++++++++++++++--
 home-manager/modules/waybar.css | 97 +++++++++------------------------
 home-manager/modules/waybar.nix |  5 +-
 modules/sway.nix                |  1 +
 4 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix
index e7a322d..bc7b24b 100644
--- a/home-manager/modules/sway.nix
+++ b/home-manager/modules/sway.nix
@@ -5,6 +5,7 @@ in
 {
   wayland.windowManager.sway = {
     enable = true;
+    package = pkgs.swayfx;
     wrapperFeatures.gtk = true;
 
     config = {
@@ -41,19 +42,59 @@ in
         };
       };
 
-      gaps = { inner = 8; };
-      window.border = 0;
+      gaps = { inner = 10; };
+      window.border = 2;
+      window.hideEdgeBorders = "smart";
       workspaceAutoBackAndForth = true;
       terminal = "foot";
 
+      colors = {
+        focused = {
+          border = "#4c7899";
+          background = "#285577";
+          text = "#ffffff";
+          indicator = "#2e9ef4";
+          childBorder = "#285577";
+        };
+        focusedInactive = {
+          border = "#333333";
+          background = "#5f676a";
+          text = "#ffffff";
+          indicator = "#484e50";
+          childBorder = "#5f676a";
+        };
+        unfocused = {
+          border = "#333333";
+          background = "#222222";
+          text = "#888888";
+          indicator = "#292d2e";
+          childBorder = "#900000";
+        };
+        urgent = {
+          border = "#2f343a";
+          background = "#900000";
+          text = "#ffffff";
+          indicator = "#900000";
+          childBorder = "#900000";
+        };
+        placeholder = {
+          border = "#000000";
+          background = "#0c0c0c";
+          text = "#ffffff";
+          indicator = "#000000";
+          childBorder = "#0c0c0c";
+        };
+      };
+
+
       bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
 
       startup = [
         {
           command = ''${pkgs.swayidle}/bin/swayidle -w \
                            timeout 600 "${lockCmd}" \
-                           timeout 900 "${pkgs.sway}/bin/swaymsg output * dpms off" \
-                                resume "${pkgs.sway}/bin/swaymsg output * dpms on" \
+                           timeout 900 "${pkgs.swayfx}/bin/swaymsg output * dpms off" \
+                                resume "${pkgs.swayfx}/bin/swaymsg output * dpms on" \
                            before-sleep "${lockCmd}"'';
         }
       ];
@@ -145,6 +186,13 @@ in
         };
 
     };
+    extraConfig = ''
+      blur enable
+      blur_radius 10
+
+      default_dim_inactive 0.2
+      corner_radius 15
+      '';
   };
 
 }
diff --git a/home-manager/modules/waybar.css b/home-manager/modules/waybar.css
index 69584f8..2109610 100644
--- a/home-manager/modules/waybar.css
+++ b/home-manager/modules/waybar.css
@@ -1,11 +1,3 @@
-/* =============================================================================
- *
- * Waybar configuration
- *
- * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
- *
- * =========================================================================== */
-
 /* -----------------------------------------------------------------------------
  * Keyframes
  * -------------------------------------------------------------------------- */
@@ -55,22 +47,34 @@
 @define-color teal #8ec07c;
 @define-color gray #928374;
 
-/* Reset all styles */
 * {
-	border: none;
-	border-radius: 0;
-	min-height: 0;
-	margin: 0;
-	padding: 0;
+    border: none;
+	font-family: Inconsolata, Inconsolata Nerd Font, FiraCode Nerd Font Mono;
+    font-weight: bold;
+	font-size: 14pt;
+	color: @light;
+    border-radius: 20px;
+	background: transparent;
 }
 
-/* The whole bar */
-#waybar {
-	background: @dark;
-	color: @light;
-	font-family: Inconsolata, Inconsolata Nerd Font, FiraCode Nerd Font Mono;
-	font-size: 14pt;
-	font-weight: bold;
+/*-----module groups----*/
+.modules-right {
+    padding: 3px;
+	background-color: @dark;
+    margin: 5px;
+    border-radius: 10px;
+}
+.modules-center {
+    padding: 3px;
+	background-color: @dark;
+    margin: 5px;
+    border-radius: 10px;
+}
+.modules-left {
+    padding: 3px;
+    margin: 5px;
+	background-color: @dark;
+    border-radius: 10px;
 }
 
 /* All modules */
@@ -132,7 +136,6 @@
 	animation-duration: 3s;
 }
 
-/* And now modules themselves in their respective order */
 
 /* Workspaces stuff */
 #workspaces button {
@@ -144,60 +147,14 @@
 }
 
 #workspaces button.focused {
-	border-bottom: 2px solid @orange;
+	border: 1px solid @orange;
 }
 
 #workspaces button.visible:not(.focused) {
-	border-bottom: 2px solid @gray;
+	border: 1px solid @gray;
 }
 
 #workspaces button.urgent {
 	color: @orange;
 }
 
-#mode { /* Shows current Sway mode (resize etc.) */
-	padding-left: 10px;
-	color: @light;
-	background: @red;
-}
-
-#window {
-	margin-right: 30px;
-	margin-left: 30px;
-}
-
-#pulseaudio {
-	border-bottom: 2px solid @red;
-}
-
-#network {
-	border-bottom: 2px solid @orange;
-}
-
-#memory {
-	border-bottom: 2px solid @yellow;
-}
-
-#cpu {
-	border-bottom: 2px solid @green;
-}
-
-#temperature {
-	border-bottom: 2px solid @teal;
-}
-
-#battery {
-	border-bottom: 2px solid @blue;
-}
-
-#tray {
-}
-
-#clock {
-	border-bottom: 2px solid @light;
-}
-
-#pulseaudio.muted {
-	/* No styles */
-}
-
diff --git a/home-manager/modules/waybar.nix b/home-manager/modules/waybar.nix
index 750c457..579b822 100644
--- a/home-manager/modules/waybar.nix
+++ b/home-manager/modules/waybar.nix
@@ -7,9 +7,9 @@
         height = 28;
         modules-left = [
           "sway/workspaces"
-          "sway/window"
         ];
         modules-center = [
+          "clock"
         ];
         modules-right = [
           "disk"
@@ -20,7 +20,6 @@
           "temperature"
           "battery"
           "tray"
-          "clock"
         ];
         modules = {
           "battery" = {
@@ -28,7 +27,7 @@
               warning = 20;
               critical = 10;
             };
-            format = " {capacity}%";
+            format = "  {capacity}%";
             format-discharging = "{icon} {capacity}%";
             format-icons = [
               ""
diff --git a/modules/sway.nix b/modules/sway.nix
index 9afd805..d5a8dec 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -1,6 +1,7 @@
 {
   # enable sway, so we have a swaylock pam config
   programs.sway.enable = true;
+  programs.sway.package = null;
 
   # autologin
   services.greetd = {