From 5e984158732572f20d154f4250d38ef048ea4ae0 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Tue, 22 Apr 2025 23:04:05 -0400
Subject: [PATCH] Small changes to waybar and smallfetch

---
 modules/home/programs/gui/librewolf/default.nix       |  2 +-
 .../programs/terminal/fastfetch/small/default.nix     |  2 +-
 modules/home/programs/terminal/zsh/default.nix        |  2 +-
 modules/home/wms/programs/waybar/default.nix          | 11 ++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 82376161..9db6e348 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -248,6 +248,6 @@
     };
 
     # Symlinks to Librewolf
-    home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox";
+    home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/firefox";
   };
 }
diff --git a/modules/home/programs/terminal/fastfetch/small/default.nix b/modules/home/programs/terminal/fastfetch/small/default.nix
index fb6dac51..eb8c4eb5 100644
--- a/modules/home/programs/terminal/fastfetch/small/default.nix
+++ b/modules/home/programs/terminal/fastfetch/small/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [ (writeScriptBin "pfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ];
+  home.packages = with pkgs; [ (writeScriptBin "smallfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ];
   xdg.configFile."fastfetch/small.jsonc".source = ./small.jsonc;
 }
diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix
index 0fcbb99c..933ba0f2 100644
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@@ -21,7 +21,7 @@
       path = "$ZDOTDIR/.zsh_history";
     };
     initExtra = ''
-      pfetch
+      smallfetch
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
     '';
   };
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 81e8c774..cfd1644c 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -124,7 +124,6 @@
       tooltip-format-connected = "{num_connections} connected\n{device_enumerate}";
       tooltip-format-enumerate-connected = "{device_alias}";
       tooltip-format-enumerate-connected-battery = "{device_alias} {device_battery_percentage}%";
-      on-click = "rofi-bluetooth";
     };
 
     scratchpadModule = {
@@ -148,7 +147,7 @@
       icon-size = 15;
     };
 
-    mediaModule = {
+    mpdModule = {
       format = "  {title}";
       format-paused = "  {artist}";
       format-stopped = "";
@@ -156,8 +155,9 @@
       tooltip-format = "{artist} - {title}";
       interval = 2;
       max-length = 30;
-      on-click = "mpc toggle";
+      on-click = "playerctl -p mpd play-pause";
     };
+
     notificationModule = {
       exec = pkgs.writeScript "notificationScript" ''
         # Run makoctl mode and store the output in a variable
@@ -193,6 +193,7 @@
       format-icons = [ "" "󰖨" ];
       tooltip = false;
     };
+
     batteryModule = {
       interval = 60;
       states = {
@@ -278,7 +279,7 @@
         "niri/window" = windowModule;
         "hyprland/window" = windowModule;
         "pulseaudio" = pulseModule;
-        "mpd" = mediaModule;
+        "mpd" = mpdModule;
         "custom/notifs" = notificationModule;
         "cpu" = cpuModule;
         "memory" = ramModule;
@@ -358,7 +359,7 @@
         "niri/window" = windowModule;
         "hyprland/window" = windowModule;
         "pulseaudio" = pulseModule;
-        "mpd" = mediaModule;
+        "mpd" = mpdModule;
         "custom/notifs" = notificationModule;
         "custom/weather2" = weatherModule;
         "cpu" = cpuModule;