From b984f313566855f7babd3c57ba9b576aa5c2595f Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sun, 9 Feb 2025 12:10:29 -0500
Subject: [PATCH] fixing up waybar load order

---
 homes/emenel/default.nix                        |  3 ++-
 homes/emenel/dotfiles/dot_config/waybar/config  | 14 +++++++-------
 homes/emenel/dotfiles/dot_local/bin/wezapp      |  2 ++
 homes/emenel/dotfiles/dot_local/bin/wezlauncher |  2 ++
 modules/home/desktop.nix                        |  1 +
 modules/home/niri.nix                           |  3 ++-
 modules/home/waybar.nix                         |  1 +
 modules/home/yazi.nix                           |  2 +-
 8 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100755 homes/emenel/dotfiles/dot_local/bin/wezapp
 create mode 100755 homes/emenel/dotfiles/dot_local/bin/wezlauncher

diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix
index c9d8471..fed742d 100644
--- a/homes/emenel/default.nix
+++ b/homes/emenel/default.nix
@@ -32,7 +32,8 @@
         xorg.libX11
         xorg.libxcb
         freetype
-
+        alsa-utils
+        alsa-oss
         dbus
 
         sops
diff --git a/homes/emenel/dotfiles/dot_config/waybar/config b/homes/emenel/dotfiles/dot_config/waybar/config
index 1f320b5..7e4b766 100644
--- a/homes/emenel/dotfiles/dot_config/waybar/config
+++ b/homes/emenel/dotfiles/dot_config/waybar/config
@@ -20,7 +20,7 @@
     "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
     "tooltip": true,
     "format-icons": {
-      "default": "",
+      "default": "?",
       "performance": "",
       "balanced": "",
       "power-saver": ""
@@ -29,20 +29,20 @@
   "memory": {
     "interval": 30,
     "format": "{used:0.1f}G/{total:0.1f}G ",
-    "on-click": "gnome-system-monitor"
+    "on-click": "$HOME/.local/bin/wezapp htop"
   },
   "cpu": {
     "interval": 10,
     "format": "{}% ",
     "max-length": 10,
-    "on-click": "gnome-system-monitor"
+    "on-click": "$HOME/.local/bin/wezapp htop"
   },
   "network": {
     "format-wifi": "{essid} ",
     "format-ethernet": "{ifname} ",
-    "format-disconnected": "",
+    "format-disconnected": "!",
     "max-length": 50,
-    "on-click": "wezterm --config-file /home/emenel/.config/wezterm/launcher.lua start --class launcher --always-new-process nmtui",
+    "on-click": "$HOME/.local/bin/wezlauncher nmtui",
   },
   "tray": {
     "icon-size": 20,
@@ -51,6 +51,7 @@
   "clock": {
     "format": "{:%a %d %b %Y %I:%M}",
     "on-click": "gnome-calendar",
+    "tooltip": false,
   },
   "wireplumber": {
     "format": "{volume}% {icon}",
@@ -66,7 +67,7 @@
   "mpris": {
     "format": "{player_icon} {dynamic}",
     "format-paused": "{status_icon} <i>{dynamic}</i>",
-    "dynamic-len": 100,
+    "dynamic-len": 75,
     "player-icons": {
       "default": "▶",
     },
@@ -88,7 +89,6 @@
     ],
     "rewrite": {
       "Firefox Web Browser": "Firefox",
-      "Foot Server": "Terminal"
     }
   },
   "niri/workspaces": {
diff --git a/homes/emenel/dotfiles/dot_local/bin/wezapp b/homes/emenel/dotfiles/dot_local/bin/wezapp
new file mode 100755
index 0000000..e12f20a
--- /dev/null
+++ b/homes/emenel/dotfiles/dot_local/bin/wezapp
@@ -0,0 +1,2 @@
+#!/bin/sh
+wezterm --config-file /home/emenel/.config/wezterm/launcher.lua start --always-new-process "$1"
diff --git a/homes/emenel/dotfiles/dot_local/bin/wezlauncher b/homes/emenel/dotfiles/dot_local/bin/wezlauncher
new file mode 100755
index 0000000..8cd6882
--- /dev/null
+++ b/homes/emenel/dotfiles/dot_local/bin/wezlauncher
@@ -0,0 +1,2 @@
+#!/bin/sh
+wezterm --config-file /home/emenel/.config/wezterm/launcher.lua start --class launcher --always-new-process "$1"
diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix
index 2b1bfa1..9ec66d6 100644
--- a/modules/home/desktop.nix
+++ b/modules/home/desktop.nix
@@ -83,6 +83,7 @@
     hyphenDicts.en_US
     plex-mpv-shim
     plexamp
+    plex-media-player
 
     switcheroo
 
diff --git a/modules/home/niri.nix b/modules/home/niri.nix
index 94a9d58..3cbf4ec 100644
--- a/modules/home/niri.nix
+++ b/modules/home/niri.nix
@@ -14,8 +14,9 @@ in {
           { command = ["maestral_qt"]; }
           { command = ["clipse" "-listen"]; }
           { command = ["swayosd-server"]; }
+          { command = ["waybar"]; }
+          { command = [ "systemctl" "--user" "restart" "mako.service" "hypridle.service" "xwayland-satellite.service" ]; }
           { command = ["plexamp"]; }
-          { command = [ "systemctl" "--user" "restart" "waybar.service" "mako.service" "hypridle.service" "xwayland-satellite.service" ]; }
         ];
 
         workspaces = {
diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix
index 7c1588d..2cf85ee 100644
--- a/modules/home/waybar.nix
+++ b/modules/home/waybar.nix
@@ -6,6 +6,7 @@ in {
   programs.waybar = {
       enable = true;
       package = pkgs.waybar;
+      systemd.enable = false;
       style = ''
 * {
     border: none;
diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix
index 734618a..6137a78 100644
--- a/modules/home/yazi.nix
+++ b/modules/home/yazi.nix
@@ -30,7 +30,7 @@
       };
       opener = {
         edit = [
-          { run = "em \"$@\""; }
+          { run = "emacsclient -r -n \"$@\""; }
         ];
         extract = [
           { run = "ouch d -y \"%*\""; desc = "Extract here with ouch"; for = "windows"; }