diff --git a/configuration.nix b/configuration.nix index cbf8aa1..acfeb28 100644 --- a/configuration.nix +++ b/configuration.nix @@ -83,34 +83,37 @@ }; # TODO: make a mergable option - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "cuda-merged" - "libnpp" - "libcusparse" - "libcusolver" - "libcurand" - "libcufft" - "libcublas" - "libnvjitlink" - "cuda_sanitizer_api" - "cuda_profiler_api" - "cuda_nvtx" - "cuda_nvrtc" - "cuda_nvml_dev" - "cuda_cuobjdump" - "cuda_gdb" - "cuda_nvcc" - "cuda_nvdisasm" - "cuda_nvprune" - "cuda_cccl" - "cuda_cudart" - "cuda_cupti" - "cuda_cuxxfilt" - "displaylink" - "nvidia-persistenced" "nvidia-settings" "nvidia-x11" - "steam" "steam-original" "steam-run" "steam-unwrapped" - "zerotierone" - ]; + nixpkgs.config = { + allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "cuda-merged" + "libnpp" + "libcusparse" + "libcusolver" + "libcurand" + "libcufft" + "libcublas" + "libnvjitlink" + "cuda_sanitizer_api" + "cuda_profiler_api" + "cuda_nvtx" + "cuda_nvrtc" + "cuda_nvml_dev" + "cuda_cuobjdump" + "cuda_gdb" + "cuda_nvcc" + "cuda_nvdisasm" + "cuda_nvprune" + "cuda_cccl" + "cuda_cudart" + "cuda_cupti" + "cuda_cuxxfilt" + "displaylink" + "nvidia-persistenced" "nvidia-settings" "nvidia-x11" + "steam" "steam-original" "steam-run" "steam-unwrapped" + "zerotierone" + ]; + cudaSupport = true; + }; programs = { adb.enable = true; diff --git a/desktop-configuration.nix b/desktop-configuration.nix index cd0526f..3d7ac44 100644 --- a/desktop-configuration.nix +++ b/desktop-configuration.nix @@ -14,10 +14,10 @@ # kcachegrind # kicad # 8GB kitty + koboldcpp libnotify mpv obs-studio - okular # openhmd pavucontrol perlPackages.AppClusterSSH diff --git a/flake.lock b/flake.lock index e536dd8..a39a261 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "firefox-addons": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1740212040, - "narHash": "sha256-Gpvn9Z+ZgKPyb6qaAbahLbo6ZVj7VuLzSCmHZRvsACA=", + "lastModified": 1746245018, + "narHash": "sha256-TOACPgc9tglXxhGuzufXXYD/LveTLGbIuxXVQMzFbDM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9a8a0914000e4453c99a4c12e9862a0a40075851", + "rev": "d84fe90605d425ccfe40cb465c6192a0402bd537", "type": "gitlab" }, "original": { @@ -23,21 +22,6 @@ "type": "gitlab" } }, - "flake-utils": { - "locked": { - "lastModified": 1629284811, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -45,11 +29,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1746243165, + "narHash": "sha256-DQycVmlyLQNLjLJ/FzpokVmbxGQ8HjQQ4zN4nyq2vII=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "c0962eeeabfb8127713f859ec8a5f0e86dead0f2", "type": "github" }, "original": { @@ -71,11 +55,11 @@ ] }, "locked": { - "lastModified": 1740394183, - "narHash": "sha256-qQkR9YltMqt3OhFvUxDI59jVfyN18rBW7/NXwnkyEDY=", + "lastModified": 1745712708, + "narHash": "sha256-jZmtCSjuUXQ32LY7qwPdAktNj+J7xR8EWuerRuHi+AI=", "owner": "illustris", "repo": "flake", - "rev": "2d82c635e3a608ed80390cc394e0d73f6a48c152", + "rev": "322a1c9ff7a83a5f858289a8477fd87e63e1a813", "type": "github" }, "original": { @@ -106,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": {