diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index 99124c4..5c1c991 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -11,7 +11,6 @@
     ./../../modules/core
     ./../../modules/core/virtualization.nix
     ./../../modules/services/tailscale.nix
-    ./../../modules/services/mpd.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];
 
diff --git a/modules/core/sshd.nix b/modules/core/sshd.nix
index 2616303..13fba58 100644
--- a/modules/core/sshd.nix
+++ b/modules/core/sshd.nix
@@ -17,6 +17,5 @@
     "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
   ];
 }
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index 94a37a1..5ee7713 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -226,7 +226,6 @@
         "$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"
diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index 232ef62..18bd767 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -1,13 +1,8 @@
-{
-  username,
-  config,
-  pkgs,
-  ...
-}:
+{ username, config, ... }:
 {
   services.mpd = {
     enable = true;
-    musicDirectory = "/home/liv/Music";
+    musicDirectory = "/dandelion/home/liv/music";
     extraConfig = ''
       audio_output {
         type "pipewire"
@@ -18,14 +13,10 @@
 
     # 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.${username}.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.userRunningPipeWire.uid}"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
   };
-
-  environment.systemPackages = with pkgs; [
-    mpdris2
-    ncmpcpp
-  ];
 }