From 5babaf7a112b79939dee102f9dceac00a20992ed Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sat, 30 Mar 2024 23:59:57 -0400
Subject: [PATCH] home: improved reproducibility with nixpkgs calls rather than
 $PATH searches

---
 .../desktopEnv/hypr/hyprpaper/hyprpaper.conf  |  4 ++--
 homeManagerModules/guiApps/fuzzel/default.nix | 10 +++++++++
 homeManagerModules/guiApps/mako/default.nix   |  3 +++
 .../guiApps/vsCodium/default.nix              |  4 ++--
 homeManagerModules/guiApps/waybar/default.nix | 14 +++++++++----
 homeManagerModules/guiApps/waybar/waybar.css  | 21 ++++++++++++++++---
 .../guiApps/wlogout/default.nix               |  6 +++---
 7 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper.conf b/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper.conf
index 03c9d0ee..1641c52e 100644
--- a/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper.conf
+++ b/homeManagerModules/desktopEnv/hypr/hyprpaper/hyprpaper.conf
@@ -1,6 +1,6 @@
 preload = ~/.config/hypr/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg
-preload = ~/.config/hypr/wallpapers/salty-justice-NOMebOREvtc-unsplash.jpg
-preload = ~/.config/hypr/wallpapers/tokyoGreen.jpg
+# preload = ~/.config/hypr/wallpapers/salty-justice-NOMebOREvtc-unsplash.jpg
+# preload = ~/.config/hypr/wallpapers/tokyoGreen.jpg
 
 wallpaper = ,~/.config/hypr/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg
 
diff --git a/homeManagerModules/guiApps/fuzzel/default.nix b/homeManagerModules/guiApps/fuzzel/default.nix
index 82a9fa9d..decd2055 100644
--- a/homeManagerModules/guiApps/fuzzel/default.nix
+++ b/homeManagerModules/guiApps/fuzzel/default.nix
@@ -3,6 +3,15 @@
   options = { guiApps.fuzzel.enable = lib.mkEnableOption "Enables fuzzel."; };
 
   config = lib.mkIf config.guiApps.fuzzel.enable {
+
+    home.packages = with pkgs; [
+      (nerdfonts.override { fonts = [ "Noto" ]; })
+      (catppuccin-papirus-folders.override {
+        flavor = "frappe";
+        accent = "mauve";
+      })
+    ];
+
     programs.fuzzel = {
       enable = true;
       settings = {
@@ -19,6 +28,7 @@
           selection-match = "#e78284FF";
           selection-text = "#f4b8e4FF";
           text = "#fafafaFF";
+          border = "#ca9ee6aa";
         };
       };
     };
diff --git a/homeManagerModules/guiApps/mako/default.nix b/homeManagerModules/guiApps/mako/default.nix
index 5c2c0a4e..d2588b3c 100644
--- a/homeManagerModules/guiApps/mako/default.nix
+++ b/homeManagerModules/guiApps/mako/default.nix
@@ -3,6 +3,9 @@
   options = { guiApps.mako.enable = lib.mkEnableOption "Enables mako."; };
 
   config = lib.mkIf config.guiApps.mako.enable {
+
+    home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "Noto" ]; }) ];
+
     services.mako = {
       enable = true;
       anchor = "top-center";
diff --git a/homeManagerModules/guiApps/vsCodium/default.nix b/homeManagerModules/guiApps/vsCodium/default.nix
index 2a4622fb..b190d19a 100644
--- a/homeManagerModules/guiApps/vsCodium/default.nix
+++ b/homeManagerModules/guiApps/vsCodium/default.nix
@@ -26,8 +26,8 @@
         "files.autoSave" = "afterDelay";
         "git.autofetch" = true;
         "git.confirmSync" = false;
-        "nix.formatterPath" = "nixfmt";
-        "terminal.external.linuxExec" = "alacritty";
+        "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
+        "terminal.external.linuxExec" = "${pkgs.alacritty}/bin/alacritty";
         "update.mode" = "none";
         "window.menuBarVisibility" = "hidden";
         "window.zoomPerWindow" = false;
diff --git a/homeManagerModules/guiApps/waybar/default.nix b/homeManagerModules/guiApps/waybar/default.nix
index e6587790..6d2aba63 100644
--- a/homeManagerModules/guiApps/waybar/default.nix
+++ b/homeManagerModules/guiApps/waybar/default.nix
@@ -4,7 +4,12 @@
 
   config = lib.mkIf config.guiApps.waybar.enable {
     # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [ blueberry pavucontrol ];
+    home.packages = with pkgs; [
+      blueberry
+      pavucontrol
+      (nerdfonts.override { fonts = [ "Noto" ]; })
+      nixfmt
+    ];
 
     xdg.configFile."waybar/style.css".source = ./waybar.css;
 
@@ -57,7 +62,7 @@
             {device_enumerate}'';
           "tooltip-format-enumerate-connected" =
             "{device_alias}	{device_address}";
-          "on-click" = "blueberry";
+          "on-click" = "${pkgs.blueberry}/bin/blueberry";
         };
         "pulseaudio" = {
           "format" = "　{volume}%";
@@ -68,7 +73,7 @@
             "handsfree" = "󰋎";
             "headset" = "󰋎";
           };
-          "on-click" = "pavucontrol -t 3";
+          "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol -t 3";
         };
         "network" = {
           "format-wifi" = "󰣾　{signalStrength}%";
@@ -78,7 +83,8 @@
           "tooltip-format-wifi" = "{essid} ({signalStrength}%) 󰣾";
           "tooltip-format-ethernet" = "{ifname} ";
           "tooltip-format-disconnected" = "Disconnected";
-          "on-click" = "alacritty --class nmtui -e nmtui";
+          "on-click" =
+            "${pkgs.alacritty}/bin/alacritty --class nmtui -e ${pkgs.networkmanager}/bin/nmtui";
         };
         "tray" = { "spacing" = 10; };
         "power-profiles-daemon" = {
diff --git a/homeManagerModules/guiApps/waybar/waybar.css b/homeManagerModules/guiApps/waybar/waybar.css
index b11f7e3b..509985b9 100644
--- a/homeManagerModules/guiApps/waybar/waybar.css
+++ b/homeManagerModules/guiApps/waybar/waybar.css
@@ -5,26 +5,41 @@
     font-size: 14px;
     font-weight: 600;
 }
+
 window#waybar {
     background: rgba (35, 38, 52, 0.8);
     color: #FAFAFA;
 }
+
 #workspaces button {
     padding: 0px 5px;
     margin: 0 0px;
     color: #FAFAFA;
 }
+
 #workspaces button.active {
     color: #ca9ee6;
 }
-#clock, #battery, #bluetooth, #network, #power-profiles-daemon, #pulseaudio, #tray {
+
+#clock,
+#battery,
+#bluetooth,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#tray {
     padding: 0 10px;
     margin: 0 5px;
 }
-#battery { color: #FAFAFA; }
+
+#battery {
+    color: #FAFAFA;
+}
+
 #battery.charging {
     color: #ca9ee6;
 }
+
 #battery.critical:not(.charging) {
     color: #e78284;
-}
+}
\ No newline at end of file
diff --git a/homeManagerModules/guiApps/wlogout/default.nix b/homeManagerModules/guiApps/wlogout/default.nix
index 82519106..584da65c 100644
--- a/homeManagerModules/guiApps/wlogout/default.nix
+++ b/homeManagerModules/guiApps/wlogout/default.nix
@@ -8,19 +8,19 @@
       layout = [
         {
           label = "logout";
-          action = "loginctl terminate-user $USER";
+          action = "${pkgs.systemd}/bin/loginctl terminate-user $USER";
           text = "Logout";
           keybind = "e";
         }
         {
           label = "shutdown";
-          action = "systemctl poweroff";
+          action = "${pkgs.systemd}/bin/systemctl poweroff";
           text = "Shutdown";
           keybind = "s";
         }
         {
           label = "reboot";
-          action = "systemctl reboot";
+          action = "${pkgs.systemd}/bin/systemctl reboot";
           text = "Reboot";
           keybind = "r";
         }