From 00e13e5a82229a1e0dd2125b93601e14e20d298b Mon Sep 17 00:00:00 2001
From: sioodmy <hello@sioodmy.dev>
Date: Tue, 24 Dec 2024 00:03:09 +0100
Subject: [PATCH] feat: new waybar

---
 user/theme/default.nix              |  1 +
 user/wrapped/foot/default.nix       |  2 +-
 user/wrapped/nvim/default.nix       |  1 +
 user/wrapped/waybar/style.nix       | 34 ++++-------------------------
 user/wrapped/waybar/waybar-conf.nix | 12 ++--------
 5 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/user/theme/default.nix b/user/theme/default.nix
index 3791c286..266b5f87 100644
--- a/user/theme/default.nix
+++ b/user/theme/default.nix
@@ -1,4 +1,5 @@
 pkgs: rec {
+  opacity = 0.88;
   background = "2e3440";
 
   text = "d8dee9";
diff --git a/user/wrapped/foot/default.nix b/user/wrapped/foot/default.nix
index bc5d0da3..ea924f8b 100644
--- a/user/wrapped/foot/default.nix
+++ b/user/wrapped/foot/default.nix
@@ -82,7 +82,7 @@
       command = "${notify-send} -a \${app-id} -i \${app-id} \${title} \${body}";
     };
     colors = with theme; {
-      alpha = 0.95;
+      alpha = theme.opacity;
       background = background;
       foreground = text;
       bright0 = bright.background;
diff --git a/user/wrapped/nvim/default.nix b/user/wrapped/nvim/default.nix
index 3198da96..41ba63ee 100644
--- a/user/wrapped/nvim/default.nix
+++ b/user/wrapped/nvim/default.nix
@@ -102,6 +102,7 @@ in
           gopls
           prettierd
           go
+          python3
           nil
           rust-analyzer
           alejandra
diff --git a/user/wrapped/waybar/style.nix b/user/wrapped/waybar/style.nix
index 1e9679ac..de6f6958 100644
--- a/user/wrapped/waybar/style.nix
+++ b/user/wrapped/waybar/style.nix
@@ -4,8 +4,8 @@
 }: let
   snowflake = builtins.fetchurl rec {
     name = "Logo-${sha256}.svg";
-    url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nix-snowflake-colours.svg";
-    sha256 = "1cifj774r4z4m856fva1mamnpnhsjl44kw3asklrc57824f5lyz3";
+    url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nix-snowflake-white.svg";
+    sha256 = "01hhqanih2d07c8f5spjnw6b8yyfc27jbdb9yy5l0zgl3kh7vyr7";
   };
 in
   pkgs.writeText "style.css" ''
@@ -15,13 +15,9 @@ in
     }
 
     window#waybar {
-      background-color: #${theme.background};
+      background-color: transparent;
       color: #${theme.text};
-      box-shadow: 3px 2px 3px 2px #151515;
-      font-size: 13px;
-      /* transition-property: background-color; */
-      transition-property: background-color;
-      transition-duration: 0.5s;
+      opacity: 0.9;
     }
     window#waybar>box {
      padding: 1px 5px;
@@ -33,8 +29,6 @@ in
 
 
     .module{
-      border-radius: 10px;
-      background-color: #${theme.regular.background};
       padding: 0px 8px;
     }
 
@@ -48,26 +42,15 @@ in
 
     #workspaces button {
       background-color: transparent;
-      /* Use box-shadow instead of border so the text isn't offset */
-      color: #${theme.regular.blue};
       padding-left: 6px;
       margin: 0px 7px;
       font-family: JetBrains Mono Nerd Font;
-      box-shadow: inset 0 -3px transparent;
       transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.68);
     }
 
-    #workspaces button.active {
-      color: #${theme.regular.yellow};
-      transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-    }
     #workspaces button.urgent {
       color: #${theme.regular.red};
     }
-    #custom-vpn,
-    #network {
-      color: #${theme.regular.blue};
-    }
 
     #clock {
       font-weight: 700;
@@ -75,15 +58,6 @@ in
       font-family: "Iosevka Term";
     }
 
-    #backlight {
-      color: #${theme.regular.yellow};
-    }
-
-    #pulseaudio,
-    #battery {
-      color: #${theme.regular.green};
-    }
-
     #battery.warning {
       color: #${theme.regular.red};
     }
diff --git a/user/wrapped/waybar/waybar-conf.nix b/user/wrapped/waybar/waybar-conf.nix
index afcd38b1..b52b168b 100644
--- a/user/wrapped/waybar/waybar-conf.nix
+++ b/user/wrapped/waybar/waybar-conf.nix
@@ -81,16 +81,8 @@
       format = "{icon}";
       active-only = false;
       format-icons = {
-        "1" = "一";
-        "2" = "二";
-        "3" = "三";
-        "4" = "四";
-        "5" = "五";
-        "6" = "六";
-        "7" = "七";
-        "8" = "八";
-        "9" = "九";
-        "10" = "十";
+        default = "";
+        active = "";
       };
 
       persistent_workspaces = {