From 59d3fb55383f9f10306a44b9da7fe9560c1c2f2a Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Tue, 31 Dec 2024 05:11:58 -0500
Subject: [PATCH] ~

---
 TODO                                 |  2 ++
 configs/openbox/autostart            |  1 -
 nixos/home/base.nix                  | 10 ++++++++++
 nixos/hosts/base.nix                 | 19 ++++---------------
 nixos/hosts/ioides/configuration.nix |  1 -
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/TODO b/TODO
index 17c2cb5..5ff7866 100644
--- a/TODO
+++ b/TODO
@@ -32,3 +32,5 @@
 [x] Give yambar a try ;w;
 [ ] Dig polybar's grave (you're not using it anymore so why keep it around?)
 [ ] Get a pager/systray <https://wiki.gentoo.org/wiki/Openbox/Guide#Pagers_and_systrays>
+[ ] Fix yambar being offset on your screen for some reason (might have to file an issue on its repo)
+[ ] Host-dependent home configurations (e.g. don't assume MPD music is in `/mnt/world/music` for every machine)
diff --git a/configs/openbox/autostart b/configs/openbox/autostart
index db18982..a55e2fd 100644
--- a/configs/openbox/autostart
+++ b/configs/openbox/autostart
@@ -1,4 +1,3 @@
 hsetroot -cover ~/.dotfiles/assets/wallpapers/current
 xcompmgr &
-sleep 5
 yambar &
diff --git a/nixos/home/base.nix b/nixos/home/base.nix
index 2f38cb4..29ca115 100644
--- a/nixos/home/base.nix
+++ b/nixos/home/base.nix
@@ -63,6 +63,16 @@
                 };
             };
         };
+        mpd = {
+            enable = true;
+            musicDirectory = "/mnt/world/music";
+            extraConfig = ''
+                audio_output {
+                    type "pipewire"
+                    name "main"
+                }
+            '';
+        };
         mpris-proxy.enable = true;
     };
 
diff --git a/nixos/hosts/base.nix b/nixos/hosts/base.nix
index 59419af..3763d4e 100644
--- a/nixos/hosts/base.nix
+++ b/nixos/hosts/base.nix
@@ -57,18 +57,6 @@
             alsa.enable = true;
             pulse.enable = true;
         };
-        # Music directory is host-dependent
-        #? Using ALSA when we're using pipewire??? <https://nixos.wiki/wiki/MPD#PipeWire>
-        mpd = {
-            enable = true;
-            #? user = "rae";
-            extraConfig = ''
-                audio_output {
-                    type "pipewire"
-                    name "main"
-                }
-            '';
-        };
         # CUPS printing
         printing.enable = true;
         # misc
@@ -104,10 +92,11 @@
                 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
             '';
         };
+        #?rm
         # https://github.com/NixOS/nixpkgs/issues/102547#issuecomment-1016671189
-        mpd.environment = {
-            XDG_RUNTIME_DIR = "/run/user/1000";
-        };
+        # mpd.environment = {
+        #     XDG_RUNTIME_DIR = "/run/user/1000";
+        # };
     };
 
     xdg.portal = {
diff --git a/nixos/hosts/ioides/configuration.nix b/nixos/hosts/ioides/configuration.nix
index 12d515c..1db5d0b 100644
--- a/nixos/hosts/ioides/configuration.nix
+++ b/nixos/hosts/ioides/configuration.nix
@@ -28,7 +28,6 @@
     networking.hostName = "ioides";
 
     services = {
-        mpd.musicDirectory = "/mnt/world/music";
         xserver.videoDrivers = [ "nvidia" ];
     };
     hardware.nvidia = {