2025_03_31 nvidia

Author: randomizedcoder

laptops/t/Makefile

@@ -18,6 +18,9 @@ endif
 rebuild:
 	sudo nixos-rebuild switch --flake .
 
+impure:
+	sudo nixos-rebuild switch --impure --flake .
+
 rebuild_trace:
 	sudo nixos-rebuild switch --show-trace --flake .
 

laptops/t/configuration.nix

@@ -55,7 +55,8 @@
     loader.efi.canTouchEfiVariables = true;
 
     # https://nixos.wiki/wiki/Linux_kernel
-    kernelPackages = pkgs.linuxPackages; # need to run this old kernel to allow nvidia driver to compile :(
+    #kernelPackages = pkgs.linuxPackages; # need to run this old kernel to allow nvidia driver to compile :(
+    kernelPackages = pkgs.unstable.linuxPackages;
     #boot.kernelPackages = pkgs.linuxPackages_latest;
     #boot.kernelPackages = pkgs.linuxPackages_rpi4
 
@@ -175,7 +176,7 @@
   systemd.services.modem-manager.enable = false;
   systemd.services."dbus-org.freedesktop.ModemManager1".enable = false;
 
-  services.clickhouse.enable = true;
+  services.clickhouse.enable = false;
 
   # environment.variables defined in hardware-graphics.nix
   environment.sessionVariables = {
@@ -209,6 +210,12 @@
   };
 
   # # https://wiki.hyprland.org/Nix/Hyprland-on-NixOS/
+  programs.hyprland = {
+    enable = true;
+    # Nvidia patches are no longer needed
+    #nvidiaPatches = true;
+    xwayland.enable = true;
+  };
   # programs.hyprland = {
   #   enable = true;
   #   # set the flake package
@@ -278,5 +285,7 @@
   # services.qemuGuest.enable = true;
   # services.spice-vdagentd.enable = true;
 
+  nixpkgs.config.allowUnfree = true;
+
   # https://wiki.nixos.org/wiki/Laptop
 }

laptops/t/flake.lock

@@ -39,8 +39,14 @@
         config = { allowUnfree = true; };
       };
       # https://nixos.wiki/wiki/Flakes#Importing_packages_from_multiple_channels
+      # overlay-unstable = final: prev: {
+      #   unstable = nixpkgs-unstable.legacyPackages.${prev.system};
+      # };
       overlay-unstable = final: prev: {
-        unstable = nixpkgs-unstable.legacyPackages.${prev.system};
+        unstable = import nixpkgs-unstable {
+          inherit system;
+          config = { allowUnfree = true; };
+        };
       };
       lib = nixpkgs.lib;
     in {

laptops/t/flake.nix

@@ -63,7 +63,9 @@
     #package = config.boot.kernelPackages.nvidiaPackages.beta; # <---------- was using this
     #package = config.boot.kernelPackages.nvidiaPackages.production;
     # https://nixos.wiki/wiki/Nvidia#Determining_the_Correct_Driver_Version
-    package = pkgs.linuxPackages.nvidia_x11;
+    # https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/nv/nvidia-modprobe/package.nix
+    #package = pkgs.linuxPackages.nvidia_x11;
+    package = pkgs.unstable.linuxPackages.nvidia_x11;
   };
 
   # https://theo.is-a.dev/blog/post/hyprland-adventure/
@@ -154,4 +156,8 @@
     #   #  #sync.enable = true;
     #   #  enableOffloadCmd = true;
     #   #};
-    # };
+    # };
+
+# [LOG] GPU information:
+# 00:02.0 VGA compatible controller [0300]: Intel Corporation CometLake-H GT2 [UHD Graphics] [8086:9bc4] (rev 05) (prog-if 00 [VGA controller])
+# 01:00.0 VGA compatible controller [0300]: NVIDIA Corporation TU117GLM [Quadro T2000 Mobile / Max-Q] [10de:1fb8] (rev a1) (prog-if 00 [VGA controller])

laptops/t/hardware-graphics.nix

@@ -133,16 +133,17 @@
     #  thunderbird
     #go_1_23
     unstable.go
-    gopls
-    golint
+    unstable.gopls
+    unstable.golint
     golangci-lint
-    golangci-lint-langserver
-    trunk-io
+    unstable.golangci-lint-langserver
+    # trunk is unfree, and i can't work out how to enable unfree
+    #trunk-io
     # https://github.com/go-delve/delve
-    delve
+    unstable.delve
     # https://github.com/aarzilli/gdlv
     gdlv
-    buf
+    unstable.buf
     protobuf_27
     grpcurl
     # https://github.com/go-gorm/gen

laptops/t/home.nix

@@ -22,7 +22,6 @@
     usbutils
     pciutils
     virt-manager
-    cudatoolkit
     pkgs.gnomeExtensions.appindicator
     iw
     wirelesstools
@@ -31,13 +30,13 @@
     lldpd
     #snmp seems to be needed by lldpd
     net-snmp
-    neofetch
+    unstable.neofetch
 
     # https://wiki.nixos.org/wiki/Flameshot
     (flameshot.override { enableWlrSupport = true; })
 
     # hyprland
-    hyprland
+    unstable.hyprland
     swww # for wallpapers
     xdg-desktop-portal-gtk
     xdg-desktop-portal-hyprland
@@ -50,16 +49,16 @@
 
     #
     #nvidia
-    vdpauinfo             # sudo vainfo
-    libva-utils           # sudo vainfo
+    unstable.vdpauinfo             # sudo vainfo
+    unstable.libva-utils           # sudo vainfo
     # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/2
     #
-    ffmpeg-full
+    unstable.ffmpeg-full
     #
     # https://nixos.wiki/wiki/CUDA
-    cudatoolkit
-    linuxPackages.nvidia_x11
-    libGLU
-    libGL
+    unstable.cudatoolkit
+    unstable.linuxPackages.nvidia_x11
+    unstable.libGLU
+    unstable.libGL
   ];
 }