chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

switch to apple type c to 3.5mm adapter for music-player.target

Browse source
This commit is contained in:
chaos 2024-05-09 08:19:31 +01:00
parent 02f43fc950
commit bb1d36cf8e
No known key found for this signature in database
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/hetzner-arm/containers/storage/data/ports.nix
View file

@ -23,7 +23,7 @@ in {
restic_jellyfin = restic + 9; restic_jellyfin = restic + 9;
restic_grocy = restic + 10; restic_grocy = restic + 10;
restic_lappy_t495 = restic + 11; restic_lappy_t495 = restic + 11;
http_music = http + 0; http_music = http + 0;
http_public = http + 1; http_public = http + 1;
http_uploads_public = http + 2; http_uploads_public = http + 2;

2
hosts/hetzner-arm/containers/storage/profiles/rcloneServe.nix
View file

@ -91,7 +91,7 @@ in {
"--vfs-cache-max-age=5m" "--vfs-cache-max-age=5m"
"--vfs-cache-max-size=1g" "--vfs-cache-max-size=1g"
"--vfs-cache-mode=full" "--vfs-cache-mode=full"
]; ];
} }
{ {
id = "notes"; id = "notes";

6
hosts/hetzner-arm/containers/storage/secrets.nix
View file

@ -45,10 +45,10 @@
"api-keys/data/storage/webdav/Uploads" "api-keys/data/storage/webdav/Uploads"
"api-keys/data/storage/webdav/Gaming" "api-keys/data/storage/webdav/Gaming"
"api-keys/data/storage/webdav/Notes" "api-keys/data/storage/webdav/Notes"
"private-public-keys/data/rclone/Chaos-Media-Crypt" "private-public-keys/data/rclone/Chaos-Media-Crypt"
"private-public-keys/data/rclone/Chaos-Gaming-Crypt" "private-public-keys/data/rclone/Chaos-Gaming-Crypt"
"private-public-keys/data/rclone/Chaos-Notes-Crypt" "private-public-keys/data/rclone/Chaos-Notes-Crypt"
]; ];
packages = with pkgs; [ packages = with pkgs; [
@ -245,7 +245,7 @@
simple_get_htpasswd "/api-keys/storage/webdav/Notes" "$secretFile" simple_get_htpasswd "/api-keys/storage/webdav/Notes" "$secretFile"
''; '';
}; };
rclone_config = { rclone_config = {
user = "storage"; user = "storage";
group = "storage"; group = "storage";

26
hosts/lappy-surface/profiles/music-player-target.nix
View file

@ -4,25 +4,26 @@
tree, tree,
... ...
}: let }: let
alsaDevice = "sysdefault:CARD=BTR3K"; alsaDevice = "sysdefault:CARD=A";
pipewireDevice = "alsa_output.usb-FiiO_FiiO_BTR3K_ABCDEF0123456789-00.analog-stereo"; alsaControl = "Headphone";
hardwareVolume = 75; mpvDevice = "alsa/${alsaDevice}";
hardwareVolume = 80;
startMusicPlayer = pkgs.writeShellScriptBin "startMusicPlayer" '' startMusicPlayer = pkgs.writeShellScriptBin "startMusicPlayer" ''
${pkgs.alsa-utils}/bin/amixer -D "${alsaDevice}" sset "${alsaControl}" "${toString hardwareVolume}%"
exec ${pkgs.mpv}/bin/mpv \ exec ${pkgs.mpv}/bin/mpv \
"https://music:$(cat /secrets/music_stream_password)@mpd.owo.monster/flac" \ "https://music:$(cat /secrets/music_stream_password)@mpd.owo.monster/flac" \
--cache=yes --cache-pause-initial=yes --cache-pause-wait=5 \ --cache=yes --cache-pause-initial=yes --cache-pause-wait=5 \
--vo=gpu --force-window --script-opts-append=osc-visibility=always \ --vo=gpu --force-window --script-opts-append=osc-visibility=always \
--ao=pipewire --audio-device="pipewire/${pipewireDevice}" --ao=alsa --audio-device="${mpvDevice}"
''; '';
startMusicPlayerSession = pkgs.writeShellScriptBin "startMusicPlayerSession" '' startMusicPlayerSession = pkgs.writeShellScriptBin "startMusicPlayerSession" ''
set -x set -x
export XDG_RUNTIME_DIR=/run/user/$UID export XDG_RUNTIME_DIR=/run/user/$UID
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
systemctl --user start dbus pipewire
${pkgs.alsa-utils}/bin/amixer -D ${alsaDevice} sset PCM "${toString hardwareVolume}%"
exec systemd-inhibit --what=sleep:idle:handle-lid-switch ${startMusicPlayer}/bin/startMusicPlayer exec systemd-inhibit --what=sleep:idle:handle-lid-switch ${startMusicPlayer}/bin/startMusicPlayer
''; '';
@ -35,6 +36,7 @@ in {
environment.systemPackages = [startMusicPlayer startMusicPlayerSession]; environment.systemPackages = [startMusicPlayer startMusicPlayerSession];
users.users.music-player = { users.users.music-player = {
uid = 1001;
isNormalUser = true; isNormalUser = true;
linger = true; linger = true;
extraGroups = [ extraGroups = [
@ -49,8 +51,6 @@ in {
programs.mpv.enable = true; programs.mpv.enable = true;
imports = with tree; [ imports = with tree; [
home.base home.base
home.apps.kitty
home.apps.pavucontrol
]; ];
home.stateVersion = "23.05"; home.stateVersion = "23.05";
}; };
@ -63,10 +63,11 @@ in {
"plymouth-quit.service" "plymouth-quit.service"
"systemd-logind.service" "systemd-logind.service"
"getty@tty1.service" "getty@tty1.service"
"user@1001.service"
"network.target" "network.target"
]; ];
before = ["music-player.target"]; before = ["music-player.target"];
wants = ["dbus.socket" "network.target" "systemd-logind.service" "plymouth-quit.service"]; wants = ["dbus.socket" "network.target" "user@1001.service" "systemd-logind.service" "plymouth-quit.service"];
wantedBy = ["music-player.target"]; wantedBy = ["music-player.target"];
conflicts = ["getty@tty1.service"]; conflicts = ["getty@tty1.service"];
@ -77,8 +78,7 @@ in {
${pkgs.cage}/bin/cage -s ${startMusicPlayerSession}/bin/startMusicPlayerSession ${pkgs.cage}/bin/cage -s ${startMusicPlayerSession}/bin/startMusicPlayerSession
''; '';
User = "music-player"; User = "music-player";
StandardOutput = "append:/var/log/music-player.log"; StandardError = "append:/var/log/music-player.log";
StandardError = "inherit";
IgnoreSIGPIPE = "no"; IgnoreSIGPIPE = "no";
UtmpIdentifier = "%n"; UtmpIdentifier = "%n";
UtmpMode = "user"; UtmpMode = "user";
@ -109,6 +109,6 @@ in {
systemd.targets.music-player = { systemd.targets.music-player = {
description = "Music player"; description = "Music player";
wants = ["music-player.service" "networkmanager.service"]; wants = ["music-player.service" "networkmanager.service" "user@1001.service"];
}; };
} }