music-server: navidrome tweaks

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-subidy
-          (mopidy-bandcamp.overrideAttrs (prev: {
-            patches = [ ./001-fix-mopidy-bandcamp.patch ];
-          }))
         ];
 
-        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
         ];
 
       };

nixos/packages/default.pkgs.nix

@@ -63,7 +63,6 @@ with pkgs;
   cyberchef
   dasel
   delta
-  deprekages.age-plugin-yubikey
   deprekages.avbroot
   deprekages.mergiraf
   difftastic

nixos/packages/gui.pkgs.nix

@@ -100,6 +100,7 @@ with pkgs;
       kicad
       obsidian
       onboard
+      supersonic
 
       # Development.
       jetbrains.rust-rover

packages/age-plugin-yubikey.nix

@@ -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 ];
-  };
-}

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 { };

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;
 }