From 4f28815018ce9b6a557a2b6b8beb3d1e3f29eeef Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felixalb@pvv.ntnu.no>
Date: Sat, 22 Feb 2025 19:44:23 +0100
Subject: [PATCH] wenche: Fix nvidia driver. flake: add shells/cuda.

---
 flake.nix                               |  9 +++++++++
 hosts/wenche/configuration.nix          |  2 +-
 hosts/wenche/hardware-configuration.nix |  2 +-
 shells/cuda.nix                         | 25 +++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 shells/cuda.nix

diff --git a/flake.nix b/flake.nix
index 2c549e4..0fd9091 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,6 +160,15 @@
 
     devShells = forAllSystems (system: {
       default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { };
+      cuda = let
+        cuda-pkgs = import nixpkgs {
+          inherit system;
+          config = {
+            allowUnfree = true;
+            cudaSupport = true;
+          };
+        };
+      in cuda-pkgs.callPackage ./shells/cuda.nix { };
     });
 
     packages = {
diff --git a/hosts/wenche/configuration.nix b/hosts/wenche/configuration.nix
index 79eade7..fab9926 100644
--- a/hosts/wenche/configuration.nix
+++ b/hosts/wenche/configuration.nix
@@ -27,7 +27,7 @@
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
     modesetting.enable = true;
-    open = true;
+    open = false;
     package = config.boot.kernelPackages.nvidiaPackages.production;
   };
 
diff --git a/hosts/wenche/hardware-configuration.nix b/hosts/wenche/hardware-configuration.nix
index 42840be..4c6a6e2 100644
--- a/hosts/wenche/hardware-configuration.nix
+++ b/hosts/wenche/hardware-configuration.nix
@@ -7,7 +7,7 @@
 
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [ "nvidia"  ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
diff --git a/shells/cuda.nix b/shells/cuda.nix
new file mode 100644
index 0000000..b0af009
--- /dev/null
+++ b/shells/cuda.nix
@@ -0,0 +1,25 @@
+# nix develop .#cuda
+# Copied from https://nixos.wiki/wiki/CUDA
+{ pkgs  }:
+
+pkgs.mkShell {
+   name = "cuda-env-shell";
+   buildInputs = with pkgs; [
+     git gitRepo gnupg autoconf curl
+     procps gnumake util-linux m4 gperf unzip
+     cudatoolkit linuxPackages.nvidia_x11
+     libGLU libGL
+     xorg.libXi xorg.libXmu freeglut
+     xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib
+     ncurses5 stdenv.cc binutils
+
+     # Other applications, like
+     hashcat
+   ];
+   shellHook = ''
+      export CUDA_PATH=${pkgs.cudatoolkit}
+      # export LD_LIBRARY_PATH=${pkgs.linuxPackages.nvidia_x11}/lib:${pkgs.ncurses5}/lib
+      export EXTRA_LDFLAGS="-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib"
+      export EXTRA_CCFLAGS="-I/usr/include"
+   '';
+}