From 21924df69c6d857870c8ab2acde136312323ed35 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Sun, 6 Jul 2025 01:35:03 +0200
Subject: [PATCH 1/5] feat: adds mpdris2 to packages since that is required for
 mpd apparently

---
 modules/services/mpd.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index 18bd767..ff543d5 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -1,4 +1,9 @@
-{ username, config, ... }:
+{
+  username,
+  config,
+  pkgs,
+  ...
+}:
 {
   services.mpd = {
     enable = true;
@@ -19,4 +24,8 @@
     # see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
     XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.userRunningPipeWire.uid}"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
   };
+
+  home.packages = with pkgs; [
+    mpdris2
+  ];
 }

From fe7adc40b60676785e922c0e2241990e66acc834 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Sun, 6 Jul 2025 01:35:11 +0200
Subject: [PATCH 2/5] feat: make keybinding to open gajim

---
 modules/home/hyprland/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index 5ee7713..94a37a1 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -226,6 +226,7 @@
         "$mainMod SHIFT, W, exec, wdisplays"
         "$mainMod SHIFT, T, exec, thunderbird"
         "$mainMod SHIFT, E, exec, element-desktop"
+        "$mainMod SHIFT, X, exec, gajim"
         "$mainMod SHIFT, P, exec, pavucontrol-qt"
         "$mainMod SHIFT, N ,exec, notes"
         "$mainMod, N,exec, swaync-client -t"

From 3644edd3e7859328bc9f01eb127d64fe60af34cb Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Sun, 6 Jul 2025 01:35:18 +0200
Subject: [PATCH 3/5] feat: enable mpd on sakura

---
 hosts/sakura/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index 5c1c991..99124c4 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -11,6 +11,7 @@
     ./../../modules/core
     ./../../modules/core/virtualization.nix
     ./../../modules/services/tailscale.nix
+    ./../../modules/services/mpd.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];
 

From 243787b2bd736a9420905eeb81de7f184f1ec06a Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Mon, 7 Jul 2025 23:20:13 +0200
Subject: [PATCH 4/5] feat: adds linux phone

---
 modules/core/sshd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/core/sshd.nix b/modules/core/sshd.nix
index 13fba58..2616303 100644
--- a/modules/core/sshd.nix
+++ b/modules/core/sshd.nix
@@ -17,5 +17,6 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # main laptop
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2nsQHyWnrmuQway0ehoMUcYYfhD8Ph/vpD0Tzip1b1 liv@meow" # main phone
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHv2zxCy22KU1tZOH2hA1p8fWVpOSrTYF68+3E5r330O liv@ichiyo" # 2nd laptop
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGm9dLpj13r+Iso5SuHSCSQbriumwW1Fs7TkgaBmmXeo liv@azalea" # linux phone
   ];
 }

From 35db81ac4df7e934d57781345068b9d6e070712b Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Mon, 7 Jul 2025 23:20:43 +0200
Subject: [PATCH 5/5] fix: mpd still has issues but less than before

---
 modules/services/mpd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index ff543d5..232ef62 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -7,7 +7,7 @@
 {
   services.mpd = {
     enable = true;
-    musicDirectory = "/dandelion/home/liv/music";
+    musicDirectory = "/home/liv/Music";
     extraConfig = ''
       audio_output {
         type "pipewire"
@@ -18,14 +18,14 @@
 
     # Optional:
     # network.listenAddress = "any"; # if you want to allow non-localhost connections
-    network.startWhenNeeded = false; # systemd feature: only start MPD service upon connection to its socket
   };
   systemd.services.mpd.environment = {
     # see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
-    XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.userRunningPipeWire.uid}"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
+    XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.${username}.uid}"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
   };
 
-  home.packages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     mpdris2
+    ncmpcpp
   ];
 }