From 294e7dbd183490ae4b1719b92ca4a119a8879721 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Thu, 4 Jan 2024 22:40:07 +0900
Subject: [PATCH] Updates

---
 README.md                                                 | 1 +
 home-manager/common/desktops/hyprland/default.nix         | 2 +-
 .../desktops/hyprland/themes/stylix/hyprland-conf.nix     | 5 ++++-
 .../desktops/hyprland/themes/stylix/waybar-conf.nix       | 2 +-
 .../desktops/hyprland/themes/stylix/wlogout-conf.nix      | 8 ++++----
 nixos/common/desktops/hyprland/default.nix                | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ebde01fd..6d745f53 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,7 @@ Completed ToDo List [here](docs/complete.md)
   * Nix colors - [Link](https://github.com/Misterio77/nix-colors)
   * Hyprland Inspirations
     * Aylur - [Link](https://github.com/Aylur/dotfiles)
+  * Base16 Colors (For Stylix) - [Link](https://tinted-theming.github.io/base16-gallery/)
 
 ---
 # Theming
diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix
index 2fd563a7..71a1e696 100644
--- a/home-manager/common/desktops/hyprland/default.nix
+++ b/home-manager/common/desktops/hyprland/default.nix
@@ -22,7 +22,7 @@
     stylix  = {
       image = /etc/nixos/git/wallpapers/stylix/wallpaper2.jpg;
       autoEnable = true;
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/kanagawa.yaml";
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
       polarity = "dark";
       targets = {
         vscode.enable = true;
diff --git a/home-manager/common/desktops/hyprland/themes/stylix/hyprland-conf.nix b/home-manager/common/desktops/hyprland/themes/stylix/hyprland-conf.nix
index ea9ed328..45c67e1e 100644
--- a/home-manager/common/desktops/hyprland/themes/stylix/hyprland-conf.nix
+++ b/home-manager/common/desktops/hyprland/themes/stylix/hyprland-conf.nix
@@ -49,7 +49,6 @@
         };
       };
       animations = {
-        # https://wiki.hyprland.org/Configuring/Animations/ 
         enabled = true;
         bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
         animation = [
@@ -68,6 +67,10 @@
         no_gaps_when_only = 1;
       };
       master.new_is_master = true;
+      windowrule = [
+        "noblur,^(firefox)$" # disables blur for firefox
+        "opacity 1.0 override,^(firefox)$"
+      ];
     };
   };
 }
diff --git a/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix b/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix
index cb936060..18a80629 100644
--- a/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix
+++ b/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix
@@ -173,7 +173,7 @@
             font-size: 16px;
             padding: 0px 10px;
             margin: 5px;
-            border-radius: 0px;
+            border-radius: 3px;
             font-weight: normal;
         }
 
diff --git a/home-manager/common/desktops/hyprland/themes/stylix/wlogout-conf.nix b/home-manager/common/desktops/hyprland/themes/stylix/wlogout-conf.nix
index ddbab302..e61caf7b 100644
--- a/home-manager/common/desktops/hyprland/themes/stylix/wlogout-conf.nix
+++ b/home-manager/common/desktops/hyprland/themes/stylix/wlogout-conf.nix
@@ -7,14 +7,14 @@
                 background-image: none;
             }
             window {
-                background-color: "#${config.lib.stylix.colors.base05}";
+                background-color: #${config.lib.stylix.colors.base05};
             }
             button {
-                color: "#${config.lib.stylix.colors.base04}";
+                color: #${config.lib.stylix.colors.base04};
                 font-size: 0px;
                 border-radius: 5000px;
                 margin: 25px;
-                background-color: "#${config.lib.stylix.colors.base01}";
+                background-color: #${config.lib.stylix.colors.base01};
                 border-style: solid;
                 border-width: 3px;
                 background-repeat: no-repeat;
@@ -23,7 +23,7 @@
             }
 
             button:active, button:hover {
-                background-color: "#${config.lib.stylix.colors.base00}";
+                background-color: #${config.lib.stylix.colors.base00};
                 outline-style: none;
             }
 
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 6b9e0a6b..42b58ec9 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -16,7 +16,7 @@
       };
       autoEnable = true;
       polarity = "dark";
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/kanagawa.yaml";
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
       fonts = {
         serif = {
           package = pkgs.dejavu_fonts;