From 302e31f10e24252cafea33c7e2d8193a2f964980 Mon Sep 17 00:00:00 2001
From: Kate Temkin <kate@deprekated.net>
Date: Wed, 21 May 2025 07:15:06 +0200
Subject: [PATCH] music-server: navidrome tweaks

---
 nixos/configs/music-server/default.nix      |  23 +++-------
 nixos/configs/music-server/subsonic.cfg.age | Bin 0 -> 731 bytes
 nixos/packages/default.pkgs.nix             |   1 -
 nixos/packages/gui.pkgs.nix                 |   1 +
 packages/age-plugin-yubikey.nix             |  48 --------------------
 packages/default.nix                        |   1 -
 secrets.nix                                 |   1 +
 7 files changed, 9 insertions(+), 66 deletions(-)
 create mode 100644 nixos/configs/music-server/subsonic.cfg.age
 delete mode 100644 packages/age-plugin-yubikey.nix

diff --git a/nixos/configs/music-server/default.nix b/nixos/configs/music-server/default.nix
index 47a5b74..6bc6d9f 100644
--- a/nixos/configs/music-server/default.nix
+++ b/nixos/configs/music-server/default.nix
@@ -5,7 +5,11 @@
 #
 { pkgs, config, ... }:
 {
-  age.secrets.bandcamp.file = ./bandcamp.cfg.age;
+#age.secrets.bandcamp.file = ./bandcamp.cfg.age;
+  age.secrets.subsonic = {
+    file = ./subsonic.cfg.age;
+    owner = "deprekated";
+  };
 
   home-manager.users.deprekated =
     { pkgs, ... }:
@@ -18,25 +22,12 @@
         extensionPackages = with pkgs; [
           mopidy-iris
           mopidy-mpd
-          mopidy-tidal
-          (mopidy-bandcamp.overrideAttrs (prev: {
-            patches = [ ./001-fix-mopidy-bandcamp.patch ];
-          }))
+          mopidy-subidy
         ];
 
-        settings = {
-
-          # Tidal for streaming more-commercial music.
-          tidal = {
-            enabled = true;
-            quality = "LOSSLESS";
-          };
-
-        };
-
 				# Probvide our bandcamp authentication as an extra config file.
 				extraConfigFiles = [
-          config.age.secrets.bandcamp.path
+          config.age.secrets.subsonic.path
         ];
 
       };
diff --git a/nixos/configs/music-server/subsonic.cfg.age b/nixos/configs/music-server/subsonic.cfg.age
new file mode 100644
index 0000000000000000000000000000000000000000..1cc539ffa21f1247a6baa13af56c63b42030d914
GIT binary patch
literal 731
zcmY+<J&%)M003YI&BZ$C;%o<piv%f9Xt_jVDJ?A@r7ta|;M7w3_Jcwx1qu$%m+0nZ
z;^LyCj%Un8ozCHsiw@@E;HJZ=iJvi-sCVQ2f+tT8+NkYXi)6kWd+t?l0kH_rpx3iO
zFhcDCK~Xr9&6BKQg6tSd6qAlI!y$bdGRrD1Mn<HRVNOtBiACZnKlBFbY7oPWsN}Vr
zSMohWvO~V2%^X)*^vHrEmlGHoFs_kups|&KX&r0xafHqZiq494U-08>X^we>B$C~B
zB>JMNL%pjJ@f@iSbtp~yt1*=)DsI8W)0&jgx|mhfkdReF2;34YS#CO!i-7QRVW$Hj
z7^PEQqgzZ#K4Iajz=KCt4j&OhEdWk84VTrzP!?KCWm22*OtB#}Vu5UnV!Ij56yMC~
zL5wG`V-I=H^UYN-=})m4!ik29sU8vgW#3{9Nt`TYaKhqJ4|>OzfROr7Z6+R|JG5&i
zF1E191+WqpqjfxSA}OEBjxB^#rdl+qkh9yJ_E4EkCTZeOEvIQWV^(7(NB_1Za+JK(
zaNjs#>9rC7AX`G1vcQIFqOQ_WVJ4EjMoOzKgjDN^K4JNKk<=ofaDp>1GObh>g<QX#
zCmWW_w{qOVO!I704Cq-{({PX*bwIty^`d4agQ95GXjU2BPsd?pEc)Gn5@CM7Li00j
zsyc+`^%liZL%<{sth`L^*V8+l?TxLQ4=Z;+2LIlkLD)ar*yib5?{~)U{(d_3c`bPp
zUD%hd-Kgr^<HO!L^!DL1`rg+s>9>n7K72pGH=Ovs`JlRaX_xC;k6P>Je_k8>06S;b
fUmak-doc*~J;%7rzFbSe*1`Uh*SlAqBh$VAYxM!G

literal 0
HcmV?d00001

diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix
index aa76216..bb55fe3 100644
--- a/nixos/packages/default.pkgs.nix
+++ b/nixos/packages/default.pkgs.nix
@@ -63,7 +63,6 @@ with pkgs;
   cyberchef
   dasel
   delta
-  deprekages.age-plugin-yubikey
   deprekages.avbroot
   deprekages.mergiraf
   difftastic
diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix
index e2143fe..50846d1 100644
--- a/nixos/packages/gui.pkgs.nix
+++ b/nixos/packages/gui.pkgs.nix
@@ -100,6 +100,7 @@ with pkgs;
       kicad
       obsidian
       onboard
+      supersonic
 
       # Development.
       jetbrains.rust-rover
diff --git a/packages/age-plugin-yubikey.nix b/packages/age-plugin-yubikey.nix
deleted file mode 100644
index 12641e2..0000000
--- a/packages/age-plugin-yubikey.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, pcsclite
-, PCSC ? null
-, Foundation ? null
-, IOKit ? null
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "age-plugin-yubikey";
-  version = "0.5.0";
-
-  src = fetchFromGitHub {
-    owner = "str4d";
-    repo = "age-plugin-yubikey";
-    rev = "ca1cd587ff289ee1b9d8f72120e5a2acfb9560ae";
-    hash = "sha256-9ghnPe83K+qixaFKCdM2FCPoENTNJnZA+OmmpD0E5LE=";
-  };
-
-  cargoHash = "sha256-WddBZG+K6mbI35XF32BltinXkmkwpcRd8CZOB1PTwM8=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-  ]
-  ++ lib.optional stdenv.isLinux pcsclite
-  ++ lib.optionals stdenv.isDarwin [
-    IOKit
-    Foundation
-    PCSC
-  ];
-
-  meta = with lib; {
-    description = "YubiKey plugin for age";
-    mainProgram = "age-plugin-yubikey";
-    homepage = "https://github.com/str4d/age-plugin-yubikey";
-    changelog = "https://github.com/str4d/age-plugin-yubikey/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ kranzes vtuan10 ];
-  };
-}
diff --git a/packages/default.nix b/packages/default.nix
index fc53061..5572f2b 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -56,7 +56,6 @@ flake-utils.lib.eachDefaultSystem (
       wsl-gpg-forward = callPackage ./windows/gpg-forward.nix { };
       oxfs = callPackage ./oxfs.nix { };
       pcsclite = callPackage ./pcsclite.nix { };
-      age-plugin-yubikey = callPackage ./age-plugin-yubikey.nix { inherit pcsclite; };
       humanfx = callPackage ./humanfx { };
       clipboard-sync = callPackage ./clipboard-sync.nix { };
       vsmartcard = callPackage ./vsmartcard.nix { };
diff --git a/secrets.nix b/secrets.nix
index 788d6e1..3a23d96 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -21,4 +21,5 @@ let
 in
 {
   "nixos/configs/music-server/bandcamp.cfg.age".publicKeys  = all-machine-pubkeys;
+  "nixos/configs/music-server/subsonic.cfg.age".publicKeys  = all-machine-pubkeys;
 }