diff --git a/flake.nix b/flake.nix index de7c7d6..5a6dbd2 100644 --- a/flake.nix +++ b/flake.nix @@ -79,10 +79,9 @@ (hardware args).nixpkgs.hostPlatform; importNixpkgs = - system: host: nixpkgs: + system: nixpkgs: let - config.allowUnfreePredicate = - pkg: builtins.elem (lib.getName pkg) (import ./hosts/${host}/unfree.nix).allowed; + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) (import ./unfree.nix).allowed; config.rocmSupport = true; in import nixpkgs { @@ -97,7 +96,7 @@ host: system: lib.nixosSystem { system = system; - pkgs = importNixpkgs system host nixpkgs; + pkgs = importNixpkgs system nixpkgs; specialArgs = inputs // { inherit system; }; diff --git a/hosts/lilith-pad/unfree.nix b/hosts/lilith-pad/unfree.nix deleted file mode 100644 index 9c46533..0000000 --- a/hosts/lilith-pad/unfree.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - allowed = [ - "steam" - "steam-unwrapped" - - "libcublas" - "cuda_cudart" - "cuda_cccl" - "cuda_nvcc" - "nvidia-x11" - "nvidia-settings" - "nvidia-persistenced" - ]; -} diff --git a/hosts/lilith-pc/unfree.nix b/hosts/lilith-pc/unfree.nix deleted file mode 100644 index 6675cc3..0000000 --- a/hosts/lilith-pc/unfree.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - allowed = [ - "steam" - "steam-unwrapped" - ]; -} diff --git a/hosts/lilith-lab/unfree.nix b/unfree.nix similarity index 100% rename from hosts/lilith-lab/unfree.nix rename to unfree.nix