diff --git a/flake.nix b/flake.nix index f280556..a3c2eab 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,10 @@ url = "github:rycee/home-manager/release-21.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + navidrome.url = "github:antifuchs/nixpkgs/fix-151550"; }; - outputs = inputs@{ self, nixpkgs, nixos-unstable, home-manager }: + outputs = inputs@{ self, nixpkgs, nixos-unstable, home-manager, navidrome}: let system = "x86_64-linux"; @@ -37,6 +38,13 @@ user = "giulio"; roles = [ ]; }]; + imports = [ + { + disabledModules = [ "services/audio/navidrome.nix" ]; + imports = + [ (navidrome + "/nixos/modules/services/audio/navidrome.nix") ]; + } + ]; }; gAluminum = host.mkHost { name = "gAluminum"; diff --git a/lib/host.nix b/lib/host.nix index afae61d..4513efb 100644 --- a/lib/host.nix +++ b/lib/host.nix @@ -1,7 +1,7 @@ { pkgs, nixpkgs, nixos-unstable, unstable, home-manager, user, ... }: { - mkHost = { name, users, roles ? [] }: + mkHost = { name, users, roles ? [], imports ? [] }: let system = "x86_64-linux"; @@ -9,12 +9,13 @@ users_mod= (map (u: user.mkUser {name = u.user; roles = u.roles; }) users); roles_mod = (map (r: mkRole r) roles); + add_imports = imports; in nixpkgs.lib.nixosSystem { inherit system; modules = [ { - imports = users_mod ++ roles_mod; + imports = users_mod ++ roles_mod ++ add_imports; nixpkgs = { pkgs = pkgs; };