From dd8d7a8b6e50726f45876a9dd9ebcf31b475add1 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 11 Dec 2024 18:34:12 +0100
Subject: [PATCH] Finally get rid of nvidia gpu

---
 hosts/north/default.nix  |  3 +--
 hosts/north/hardware.nix | 14 +++++++-------
 hosts/north/nvidia.nix   | 29 -----------------------------
 3 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 hosts/north/nvidia.nix

diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index f4b30e6..40a8642 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -4,11 +4,10 @@
     ../common.nix
     ./hardware.nix
     ./disko.nix
-    ./nvidia.nix
   ];
 
   system.stateVersion = "23.11";
-  boot.kernelPackages = pkgs.linuxPackages_6_11;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   myConfig = {
     boot = {
diff --git a/hosts/north/hardware.nix b/hosts/north/hardware.nix
index 82eaec8..c70c23b 100644
--- a/hosts/north/hardware.nix
+++ b/hosts/north/hardware.nix
@@ -53,16 +53,16 @@
   hardware.fancontrol = {
     enable = true;
     config = ''
-      # pwm1=rear pwm2=cpu pwm3=front+top pwm4=gpu pwm=motherboard?
+      # pwm1=rear pwm2=cpu pwm3=front+top
       INTERVAL=2
       DEVPATH=hwmon1=devices/pci0000:00/0000:00:18.3 hwmon2=devices/platform/nct6775.656
       DEVNAME=hwmon1=k10temp hwmon2=nct6798
-      FCTEMPS=hwmon2/pwm1=hwmon2/temp1_input hwmon2/pwm2=hwmon1/temp1_input hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm4=/tmp/nvidia-gpu-temp
-      FCFANS=hwmon2/pwm1=hwmon2/fan1_input hwmon2/pwm2=hwmon2/fan7_input+hwmon2/fan2_input hwmon2/pwm3=hwmon2/fan3_input hwmon2/pwm4=hwmon2/fan4_input
-      MINTEMP=hwmon2/pwm1=35 hwmon2/pwm2=45 hwmon2/pwm3=35 hwmon2/pwm4=40
-      MAXTEMP=hwmon2/pwm1=100 hwmon2/pwm2=100 hwmon2/pwm3=100 hwmon2/pwm4=100
-      MINSTART=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16 hwmon2/pwm4=30
-      MINSTOP=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16 hwmon2/pwm4=30
+      FCTEMPS=hwmon2/pwm1=hwmon2/temp1_input hwmon2/pwm2=hwmon1/temp1_input hwmon2/pwm3=hwmon2/temp1_input
+      FCFANS=hwmon2/pwm1=hwmon2/fan1_input hwmon2/pwm2=hwmon2/fan7_input+hwmon2/fan2_input hwmon2/pwm3=hwmon2/fan3_input
+      MINTEMP=hwmon2/pwm1=35 hwmon2/pwm2=45 hwmon2/pwm3=35
+      MAXTEMP=hwmon2/pwm1=100 hwmon2/pwm2=100 hwmon2/pwm3=100
+      MINSTART=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16
+      MINSTOP=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16
     '';
   };
 }
diff --git a/hosts/north/nvidia.nix b/hosts/north/nvidia.nix
deleted file mode 100644
index 340996a..0000000
--- a/hosts/north/nvidia.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia = {
-    open = true;
-    modesetting.enable = true;
-    powerManagement.enable = true;
-    package = config.boot.kernelPackages.nvidiaPackages.latest;
-  };
-
-  systemd.services.gpu-temp-reader = {
-    wantedBy = [ "multi-user.target" ];
-    requires = [ "fancontrol.service" ];
-    before = [ "fancontrol.service" ];
-    script = ''
-      ${lib.getExe' pkgs.coreutils "touch"} /tmp/nvidia-gpu-temp
-      while :; do
-        temp="$(${lib.getExe' config.hardware.nvidia.package "nvidia-smi"} --query-gpu=temperature.gpu --format=csv,noheader,nounits)"
-        ${lib.getExe' pkgs.coreutils "echo"} "$((temp * 1000))" > /tmp/nvidia-gpu-temp
-        ${lib.getExe' pkgs.coreutils "sleep"} 2
-      done
-    '';
-  };
-}