From e0ba9d21c4a8bcf378c50f22e18cf3066dc29b11 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 15 Apr 2024 07:58:33 +0100
Subject: [PATCH] Style updates

Adjust font sizes to be more sensible

Tweak sway gaps, and blur layer effects

Set waybar and swaync font sizes in rem instead of px, move waybar to
bottom and adjust spacing accordingly
---
 flake.nix               |  8 ++++----
 home/sway/default.nix   | 12 ++++++------
 home/swaync/default.nix |  2 +-
 home/waybar/default.nix |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index fedd21f4..60c05455 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,10 +44,10 @@
         fonts = with import nixpkgs {inherit system;};
         with iosevka-custom.outputs; rec {
           sizes = {
-            applications = 16;
-            desktop = 20;
-            popups = 20;
-            terminal = 16;
+            applications = 12;
+            desktop = 12;
+            popups = 12;
+            terminal = 12;
           };
           serif = sansSerif;
           sansSerif = {
diff --git a/home/sway/default.nix b/home/sway/default.nix
index f0dbfe24..7f943993 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -35,14 +35,11 @@
       menu = "${config.programs.rofi.finalPackage}/bin/rofi -show drun";
       workspaceAutoBackAndForth = true;
       bars = [];
-      gaps = {
-        inner = 10;
-        # outer = 5;
-      };
+      gaps = {inner = 5;};
       fonts = {
         names = [fonts.monospace.name];
         style = "regular";
-        size = 12.0; # fonts.sizes.desktop;
+        size = fonts.sizes.desktop * 1.0;
       };
       colors = with scheme.withHashtag; let
         text = toString base05;
@@ -164,8 +161,11 @@
       corner_radius 10
       shadows enable
       shadow_blur_radius 4
+      layer_effects "waybar" blur enable; blur_ignore_transparent enable
+      layer_effects "swaync-control-center" blur enable; blur_ignore_transparent enable
+      layer_effects "rofi" blur enable; blur_ignore_transparent enable
       titlebar_separator enable
-      scratchpad_minimize disable
+      scratchpad_minimize enable
     '';
   };
 }
diff --git a/home/swaync/default.nix b/home/swaync/default.nix
index f86f1b97..8fae7735 100644
--- a/home/swaync/default.nix
+++ b/home/swaync/default.nix
@@ -9,7 +9,7 @@
   xdg.configFile."swaync/style.css".text = with scheme; ''
     * {
       all: unset;
-      font-size: ${toString fonts.sizes.desktop}px;
+      font-size: 1.2rem;
       font-family: "${fonts.monospace.name}";
       transition: 200ms;
     }
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 0d7ee077..e8e4680c 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -18,7 +18,7 @@
     };
     settings.main = {
       layer = "top";
-      position = "top";
+      position = "bottom";
       # Layout
       "modules-left" = ["sway/workspaces"];
       "modules-center" = ["mpris"];
@@ -249,8 +249,8 @@
     in ''
       * {
           all: unset;
-          font-size: ${toString fonts.sizes.desktop}px;
-          font-family: "${fonts.monospace.name}";
+          font-size: 1.2rem;
+          font-family: ${fonts.monospace.name};
       }
 
       window {
@@ -260,7 +260,7 @@
       window > box {
           color: ${base05};
           background: alpha(${base00}, 0.8);
-          margin: 5px 10px 0px;
+          margin: 0px 10px 5px;
           padding: 0px;
           border: 1px solid ${accent};
           border-radius: 10px;