From 95188f8cd307732e297dafdea3a1f87ba2d82992 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 8 Aug 2023 19:42:51 +0200
Subject: [PATCH] remove polaris-14 pr

---
 flake.nix                         | 15 +--------------
 profiles/web/services/polaris.nix |  4 +++-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index c544cd5..88ef42e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,6 @@
 
     # TODO: somehow make these private repos optional (a lazy fetch would be nice)
     pbsds-papers.url = "git+ssh://git@github.com/pbsds/papers.git";
-
-    # temporary stuff i want to use
-    # TODO: can i fetch a subset of files of these?
-    pr-polaris14.url   = "github:pbsds/nixpkgs/polaris-14";
   };
 
   nixConfig.extra-substituters = [
@@ -82,22 +78,13 @@
       #"riscv64-linux"
     ];
 
-    # TODO: move unstable here?
-    tmpConfig = {
-      disabledModules = [ "services/misc/polaris.nix" ];
-      imports = [ "${inputs.pr-polaris14}/nixos/modules/services/misc/polaris.nix" ];
-      nixpkgs.overlays = [(final: prev: { # TODO: nixpkgs.config.packageOverrides ?
-        polaris     = prev.callPackage "${inputs.pr-polaris14}/pkgs/servers/polaris" { };
-        polaris-web = prev.callPackage "${inputs.pr-polaris14}/pkgs/servers/polaris/web.nix" { };
-      })];
-    };
     mkConfig = hostname: domain: system: modules: nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = {
         inherit inputs;
         flakes = flake inputs system;
       };
-      modules = modules ++ [ ./base.nix "${self}/hosts/${hostname}" tmpConfig ({
+      modules = modules ++ [ ./base.nix "${self}/hosts/${hostname}" ({
         home-manager.extraSpecialArgs = {
           inherit inputs;
           flakes = flake inputs system;
diff --git a/profiles/web/services/polaris.nix b/profiles/web/services/polaris.nix
index 4c38e34..6c769c4 100644
--- a/profiles/web/services/polaris.nix
+++ b/profiles/web/services/polaris.nix
@@ -3,13 +3,15 @@
   # Polaris
   # Self-host your music collection, and access it from any computer and mobile device
 
+  #disabledModules = [ "services/misc/polaris.nix" ];
+  #imports = [ "${inputs.unstable}/nixos/modules/services/misc/polaris.nix" ];
 
   services.polaris = {
     enable = true;
     #user = "pbsds";
     #group = "users";
     port = 7890;
-    #package = pkgs.unstable.polaris; # instead of my overlay, TODO: move that overlay here
+    package = pkgs.unstable.polaris;
     settings = {
       settings.reindex_every_n_seconds = 7*24*60*60; # weekly, default is 1800, i.e. hourly
       settings.album_art_pattern =