mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2026-03-20 08:22:55 +01:00
Compare commits
No commits in common. "35db81ac4df7e934d57781345068b9d6e070712b" and "12039dfbc017303becf952aaac564489cde03c6b" have entirely different histories.
35db81ac4d
...
12039dfbc0
4 changed files with 4 additions and 16 deletions
|
|
@ -11,7 +11,6 @@
|
||||||
./../../modules/core
|
./../../modules/core
|
||||||
./../../modules/core/virtualization.nix
|
./../../modules/core/virtualization.nix
|
||||||
./../../modules/services/tailscale.nix
|
./../../modules/services/tailscale.nix
|
||||||
./../../modules/services/mpd.nix
|
|
||||||
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,5 @@
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # main laptop
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # main laptop
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2nsQHyWnrmuQway0ehoMUcYYfhD8Ph/vpD0Tzip1b1 liv@meow" # main phone
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2nsQHyWnrmuQway0ehoMUcYYfhD8Ph/vpD0Tzip1b1 liv@meow" # main phone
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHv2zxCy22KU1tZOH2hA1p8fWVpOSrTYF68+3E5r330O liv@ichiyo" # 2nd laptop
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHv2zxCy22KU1tZOH2hA1p8fWVpOSrTYF68+3E5r330O liv@ichiyo" # 2nd laptop
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGm9dLpj13r+Iso5SuHSCSQbriumwW1Fs7TkgaBmmXeo liv@azalea" # linux phone
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,6 @@
|
||||||
"$mainMod SHIFT, W, exec, wdisplays"
|
"$mainMod SHIFT, W, exec, wdisplays"
|
||||||
"$mainMod SHIFT, T, exec, thunderbird"
|
"$mainMod SHIFT, T, exec, thunderbird"
|
||||||
"$mainMod SHIFT, E, exec, element-desktop"
|
"$mainMod SHIFT, E, exec, element-desktop"
|
||||||
"$mainMod SHIFT, X, exec, gajim"
|
|
||||||
"$mainMod SHIFT, P, exec, pavucontrol-qt"
|
"$mainMod SHIFT, P, exec, pavucontrol-qt"
|
||||||
"$mainMod SHIFT, N ,exec, notes"
|
"$mainMod SHIFT, N ,exec, notes"
|
||||||
"$mainMod, N,exec, swaync-client -t"
|
"$mainMod, N,exec, swaync-client -t"
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,8 @@
|
||||||
{
|
{ username, config, ... }:
|
||||||
username,
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
services.mpd = {
|
services.mpd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
musicDirectory = "/home/liv/Music";
|
musicDirectory = "/dandelion/home/liv/music";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
audio_output {
|
audio_output {
|
||||||
type "pipewire"
|
type "pipewire"
|
||||||
|
|
@ -18,14 +13,10 @@
|
||||||
|
|
||||||
# Optional:
|
# Optional:
|
||||||
# network.listenAddress = "any"; # if you want to allow non-localhost connections
|
# 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 = {
|
systemd.services.mpd.environment = {
|
||||||
# see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
|
# 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
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue