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 ]; 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 ]; } 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" diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index 18bd767..232ef62 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -1,8 +1,13 @@ -{ username, config, ... }: +{ + username, + config, + pkgs, + ... +}: { services.mpd = { enable = true; - musicDirectory = "/dandelion/home/liv/music"; + musicDirectory = "/home/liv/Music"; extraConfig = '' audio_output { type "pipewire" @@ -13,10 +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. }; + + environment.systemPackages = with pkgs; [ + mpdris2 + ncmpcpp + ]; }