ebisu: move nixpkgs configuration to kansaiPkgs

2 files changed, 33 insertions, 38 deletions

diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix
index eec344d..fa0354e 100644
--- a/home/ebisu/default.nix
+++ b/home/ebisu/default.nix
@@ -10,7 +10,39 @@
 }:
 host:
 let
-  pkgs = (kansaiPkgs { }).${system};
+  pkgs =
+    (kansaiPkgs {
+      nixpkgsExtraConfig.overlays = [ inputs.nur.overlay ];
+
+      nixpkgsAllowUnfreePredicate =
+        pkg:
+        builtins.elem (pkgs.lib.getName pkg) [
+          "cuda-merged"
+          "cuda_cccl"
+          "cuda_cudart"
+          "cuda_cuobjdump"
+          "cuda_cupti"
+          "cuda_cuxxfilt"
+          "cuda_gdb"
+          "cuda_nvcc"
+          "cuda_nvdisasm"
+          "cuda_nvml_dev"
+          "cuda_nvprune"
+          "cuda_nvrtc"
+          "cuda_nvtx"
+          "cuda_profiler_api"
+          "cuda_sanitizer_api"
+          "httpie-desktop"
+          "libcublas"
+          "libcufft"
+          "libcurand"
+          "libcusolver"
+          "libcusparse"
+          "libnvjitlink"
+          "libnpp"
+          "spotify"
+        ];
+    }).${system};
 in
 inputs.home-manager.lib.homeManagerConfiguration {
   inherit pkgs;
diff --git a/home/ebisu/kansai/default.nix b/home/ebisu/kansai/default.nix
index 6f0ff57..0b58091 100644
--- a/home/ebisu/kansai/default.nix
+++ b/home/ebisu/kansai/default.nix
@@ -1,46 +1,9 @@
 {
   pkgs,
-  inputs,
-  lib,
   ...
 }:
 {
   imports = [ ./fortune ];
   pywal-nix.wallpaper = ./wallpaper.png;
   nix.package = pkgs.nix;
-
-  nixpkgs = {
-    overlays = [ inputs.nur.overlay ];
-
-    config = {
-      allowUnfreePredicate =
-        pkg:
-        builtins.elem (lib.getName pkg) [
-          "cuda-merged"
-          "cuda_cccl"
-          "cuda_cudart"
-          "cuda_cuobjdump"
-          "cuda_cupti"
-          "cuda_cuxxfilt"
-          "cuda_gdb"
-          "cuda_nvcc"
-          "cuda_nvdisasm"
-          "cuda_nvml_dev"
-          "cuda_nvprune"
-          "cuda_nvrtc"
-          "cuda_nvtx"
-          "cuda_profiler_api"
-          "cuda_sanitizer_api"
-          "httpie-desktop"
-          "libcublas"
-          "libcufft"
-          "libcurand"
-          "libcusolver"
-          "libcusparse"
-          "libnvjitlink"
-          "libnpp"
-          "spotify"
-        ];
-    };
-  };
 }