rui: use new flags

3 files changed, 35 insertions, 14 deletions

diff --git a/flake.lock b/flake.lock
index f73e0e3..06a3fc2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1080,11 +1080,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726797660,
-        "narHash": "sha256-4jmq7DS8NmNSrBc42loMlh6me7f2ZNiVZulkvTxWuEc=",
+        "lastModified": 1726959240,
+        "narHash": "sha256-Nky5h9eDR5yEigZfpMhHj4J+UIK6xLIKS2XOczD9aEk=",
         "owner": "Fuwn",
         "repo": "rui",
-        "rev": "b871077822a5a01c99b66caaa10c6411eb5b9b70",
+        "rev": "267683280287223d0ea018de007dbb17d52e8b6d",
         "type": "github"
       },
       "original": {
diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix
index 820b67c..53332b6 100644
--- a/home/ebisu/default.nix
+++ b/home/ebisu/default.nix
@@ -3,6 +3,7 @@
   config,
   inputs,
   username,
+  lib,
   ...
 }:
 {
@@ -32,10 +33,34 @@
     overlays = [ inputs.nur.overlay ];
 
     config = {
-      allowUnfree = true;
-      # allowInsecure = true;
-      # allowBroken = true;
-      # allowUnfreePredicate = _: true;
+      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"
+        ];
     };
   };
 }
diff --git a/justfile b/justfile
index 128815c..06381d1 100644
--- a/justfile
+++ b/justfile
@@ -1,18 +1,14 @@
-set export
-
-NIXPKGS_ALLOW_UNFREE := "1"
-
 default:
   @just --list
 
 os hostname='kansai':
-  git add . && rui os switch --hostname {{hostname}} -- --impure
+  git add . && rui --allow-unfree os switch --hostname {{hostname}} -- --impure
 
 home user='ebisu':
-  git add . && rui home switch --user {{user}} -- --impure
+  git add . && rui --allow-unfree home switch --user {{user}} -- --impure
 
 news user='ebisu':
-  rui home news --user {{user}}
+  rui home news --user {{user}} -- --impure
 
 push message:
   git add . && git commit -m "{{message}}" && git push origin main