From 81c53777e4c892b1764a222ae341bf45a802f64f Mon Sep 17 00:00:00 2001
From: beanigen <beanigit@protonmail.com>
Date: Sat, 8 Mar 2025 21:38:05 +0800
Subject: [PATCH] balls fish 2: the ballening

---
 home/default.nix      | 5 ++++-
 home/waybar/config    | 7 +++++--
 home/waybar/style.css | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 136f845..46e62ed 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -15,6 +15,8 @@
     username = vars.user; #this is set in flake.nix 
     homeDirectory = "/home/${username}"; #change this if you use a non-standard home dir
     stateVersion = "23.11";
+    sessionVariables = { PASSWORD_STORE_DIR = "$HOME/sync/general/pass";};
+    shell.enableBashIntegration = true;
     file = {
       ".config/waybar/config".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/config";
       ".config/waybar/style.css".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/style.css";
@@ -22,6 +24,7 @@
   };
   programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix
   #targets.genericLinux.enable = (!vars.isNixOS);
+  
   programs.foot = {
     enable = true;
     settings.main.font = "monospace:size=10";
@@ -36,7 +39,7 @@
   programs.password-store = {
     enable = true;
     package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-import]);
-    settings = { PASSWORD_STORE_DIR = "~/sync/general/pass"; };
+    settings = { PASSWORD_STORE_DIR = "$HOME/sync/general/pass"; };
   };
     
   services.mpd = {
diff --git a/home/waybar/config b/home/waybar/config
index 2d4cda1..e966f1b 100644
--- a/home/waybar/config
+++ b/home/waybar/config
@@ -8,8 +8,11 @@
     "spacing": 5,
     "position": "top",
     "modules-center": ["group/mpdg"],
-    "modules-left": ["group/dtray"],
-    "modules-right": ["disk", "battery", "battery#bat1", "battery#bat2", "clock", "group/audio", "cpu"],
+    "modules-left": ["group/dtray", "battery", "battery#bat1", "battery#bat2"],
+    "modules-right": ["clock", "group/audio", "disk", "memory", "cpu"],
+    "memory": {
+    	"format": "  {avail} +   {swapAvail} GiB",
+    },
     "cava": {
         "method": "pipewire",
         "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
diff --git a/home/waybar/style.css b/home/waybar/style.css
index f0f0cd9..f19a152 100644
--- a/home/waybar/style.css
+++ b/home/waybar/style.css
@@ -39,7 +39,8 @@ window#waybar {
 #mpd,
 #battery,
 #cpu,
-#disk {
+#disk,
+#memory {
 	padding: 5px; 
 	border-radius: 10px;
 	border: 0.2em solid #cba6f7;