diff --git a/modules/packages.nix b/modules/packages.nix index dcf6ada..0a7d4b0 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -40,6 +40,8 @@ in { yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux; + # mopidy-youtube = super.mopidy-youtube.overrideAttrs (_: { src = inputs.mopidy-youtube; }); + nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd; # inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers; diff --git a/modules/secrets.nix b/modules/secrets.nix index fe7177c..1de074c 100755 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -54,12 +54,6 @@ in rec { description = "Mail server"; }; }; - gpmusic = mkCredOption "Google Play Music (mopidy)" { - deviceid = mkOption { - type = str; - description = "Android device ID"; - }; - }; openvpn = mkCredOption "openvpn" { }; rclone = mkOption { type = nullOr str; diff --git a/modules/workspace/mopidy.nix b/modules/workspace/mopidy.nix index f34cfbe..c478607 100644 --- a/modules/workspace/mopidy.nix +++ b/modules/workspace/mopidy.nix @@ -2,15 +2,10 @@ { services.mopidy = { enable = true; - extensionPackages = with pkgs; [ mopidy-mpd mopidy-gmusic mopidy-youtube ]; - configuration = (if (!isNull config.secrets.gpmusic) then '' - [gmusic] - username = ${config.secrets.gpmusic.user} - refresh_token = ${config.secrets.gpmusic.password} - deviceid = ${config.secrets.gpmusic.deviceid} - bitrate = 128 - '' else - "") + '' + extensionPackages = with pkgs; [ mopidy-mpd mopidy-youtube ]; + configuration = '' + [youtube] + enabled = true [mpd] hostname = 0.0.0.0 port = 6600 diff --git a/secret.nix b/secret.nix index f2de0ac..aa0ab4d 100644 Binary files a/secret.nix and b/secret.nix differ