diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkHome.nix | 9 | ||||
| -rw-r--r-- | lib/mkNixos.nix | 7 | ||||
| -rw-r--r-- | lib/unfree-allowlist.nix | 6 |
3 files changed, 21 insertions, 1 deletions
diff --git a/lib/mkHome.nix b/lib/mkHome.nix index db85b86..ab27981 100644 --- a/lib/mkHome.nix +++ b/lib/mkHome.nix | |||
| @@ -1,6 +1,13 @@ | |||
| 1 | { inputs }: | 1 | { inputs }: |
| 2 | { username, system, extraModules ? [ ] }: | 2 | { username, system, extraModules ? [ ] }: |
| 3 | let | ||
| 4 | unfreeAllowlist = import ./unfree-allowlist.nix; | ||
| 5 | in | ||
| 3 | inputs.home-manager.lib.homeManagerConfiguration { | 6 | inputs.home-manager.lib.homeManagerConfiguration { |
| 4 | pkgs = inputs.nixpkgs.legacyPackages.${system}; | 7 | pkgs = import inputs.nixpkgs { |
| 8 | inherit system; | ||
| 9 | config.allowUnfreePredicate = pkg: | ||
| 10 | builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreeAllowlist; | ||
| 11 | }; | ||
| 5 | modules = [ ../users/${username}.nix ] ++ extraModules; | 12 | modules = [ ../users/${username}.nix ] ++ extraModules; |
| 6 | } | 13 | } |
diff --git a/lib/mkNixos.nix b/lib/mkNixos.nix index 5f1d8ac..a058dfc 100644 --- a/lib/mkNixos.nix +++ b/lib/mkNixos.nix | |||
| @@ -1,9 +1,16 @@ | |||
| 1 | { inputs }: | 1 | { inputs }: |
| 2 | { hostname, system ? "x86_64-linux", users ? [ "tom" ], extraModules ? [ ] }: | 2 | { hostname, system ? "x86_64-linux", users ? [ "tom" ], extraModules ? [ ] }: |
| 3 | let | ||
| 4 | unfreeAllowlist = import ./unfree-allowlist.nix; | ||
| 5 | in | ||
| 3 | inputs.nixpkgs.lib.nixosSystem { | 6 | inputs.nixpkgs.lib.nixosSystem { |
| 4 | inherit system; | 7 | inherit system; |
| 5 | specialArgs = { inherit inputs; }; | 8 | specialArgs = { inherit inputs; }; |
| 6 | modules = [ | 9 | modules = [ |
| 10 | { | ||
| 11 | nixpkgs.config.allowUnfreePredicate = pkg: | ||
| 12 | builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreeAllowlist; | ||
| 13 | } | ||
| 7 | ../modules/nixos/common.nix | 14 | ../modules/nixos/common.nix |
| 8 | ../hosts/${hostname}/configuration.nix | 15 | ../hosts/${hostname}/configuration.nix |
| 9 | inputs.home-manager.nixosModules.home-manager | 16 | inputs.home-manager.nixosModules.home-manager |
diff --git a/lib/unfree-allowlist.nix b/lib/unfree-allowlist.nix new file mode 100644 index 0000000..fb84c52 --- /dev/null +++ b/lib/unfree-allowlist.nix | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | [ | ||
| 2 | "slack" | ||
| 3 | "discord" | ||
| 4 | "spotify" | ||
| 5 | "claude-code" | ||
| 6 | ] | ||
