diff --git a/flake.lock b/flake.lock index 45d71dd..bbb1f01 100644 --- a/flake.lock +++ b/flake.lock @@ -375,11 +375,11 @@ }, "nixpkgs-2411": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742388435, + "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", "type": "github" }, "original": { @@ -407,16 +407,16 @@ }, "nixpkgs-test": { "locked": { - "lastModified": 1717543991, - "narHash": "sha256-b9DZdpO+0/in0OK247XtnlVBBA1hBkjbDLfZ73gMWFc=", + "lastModified": 1742513400, + "narHash": "sha256-ZDxjg6NTFzh0uceaq3foOUi30gIi5af/Yd41NYLf6JY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfa58200cd9958eea5221bf5dfcf82778a0e0220", + "rev": "be9edf5057c7e69fde0fb4dc6742b9a699863fa8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "refs/pull/295155/head", + "ref": "refs/pull/379645/merge", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 754b25e..7c4e95b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # https://github.com/nixos/nixpkgs - nixpkgs-test.url = "github:NixOS/nixpkgs/refs/pull/295155/head"; # for testing + nixpkgs-test.url = "github:NixOS/nixpkgs/refs/pull/379645/merge"; # for testing nixpkgs-edge.url = "github:NixOS/nixpkgs/nixos-unstable"; # "edge" is four letters nixpkgs-2411.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; # for old docs @@ -261,7 +261,7 @@ in builtins.mapAttrs (hostname: curried: curried hostname) { #hostname "domain" "system" inputs "state" [ modules ... ] asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; - noximilien = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.11" [ au ts1 tse intel ]; + noximilien = mk "pbsds.net" "x86_64-linux" inputs-241T "24.11" [ au ts1 tse intel ]; nord = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.05" [ au ts1 intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-edge "24.05" [ au ts1 nixld intel cuda p1005 ]; bjarte = mk "pbsds.net" "x86_64-linux" inputs-edge "24.05" [ ts1 nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; diff --git a/profiles/http/services/polaris.nix b/profiles/http/services/polaris.nix index 8733bfb..8b62de5 100644 --- a/profiles/http/services/polaris.nix +++ b/profiles/http/services/polaris.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: let inherit (config.pbsds.nginx) mkDomain; in @@ -6,15 +6,17 @@ in # 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" ]; + /**/ + disabledModules = [ "services/misc/polaris.nix" ]; + imports = [ "${inputs.unstable}/nixos/modules/services/misc/polaris.nix" ]; + services.polaris.package = pkgs.unstable.polaris; + /**/ services.polaris = { enable = true; #user = "pbsds"; #group = "users"; port = 7890; - 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 =