From d83c9960095c6e82b66f6efa643d4f38684be46b Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 10 Jul 2024 22:12:06 +0200
Subject: [PATCH] clean up kuraokami

---
 systems/kuraokami/default.nix  | 43 ++++++++++++++++++++++++----------
 systems/kuraokami/hardware.nix | 22 ++++++++---------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix
index 991ac66..6447eb5 100644
--- a/systems/kuraokami/default.nix
+++ b/systems/kuraokami/default.nix
@@ -3,9 +3,9 @@
 {
   imports = [
     ./hardware.nix
-    #nixos-hardware.nixosModules.common-cpu-intel
-    nixos-hardware.nixosModules.common-gpu-intel
-    nixos-hardware.nixosModules.common-gpu-nvidia
+    nixos-hardware.nixosModules.common-cpu-intel
+    #nixos-hardware.nixosModules.common-gpu-intel
+    #nixos-hardware.nixosModules.common-gpu-nvidia
     nixos-hardware.nixosModules.common-pc
     nixos-hardware.nixosModules.common-hidpi
     nixos-hardware.nixosModules.common-pc-ssd
@@ -86,32 +86,46 @@
   time.timeZone = "Europe/Berlin";
 
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [ ];
+      extraPackages32 = with pkgs.pkgsi686Linux; [ ];
     };
     nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      modesetting.enable = true;
+      #package = config.boot.kernelPackages.nvidiaPackages.stable;
+      #modesetting.enable = true;
     };
     gpgSmartcards.enable = true;
   };
 
   boot.kernelModules = [ "i2c-nct6775" ];
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
 
   environment.systemPackages = with pkgs; [
     localPkgs.prismlauncher-withExtraStuff
     mixxx
     picard
     goverlay
-    strawberry
-    whatsapp-for-linux
-    teams-for-linux
+    (strawberry-qt6.overrideAttrs (finalAttrs: previousAttrs: {
+      version = "1.1.0-rc3";
+      src = fetchFromGitHub {
+        owner = "strawberrymusicplayer";
+        repo = "strawberry";
+        rev = "1.1.0-rc3";
+        hash = "sha256-4LhFxCi0ixMAjVaNVrQrLc0Vf1Z2dhnw6DTfTqtpiC4=";
+      };
+      buildInputs = previousAttrs.buildInputs ++ [
+        kdsingleapplication
+        gst_all_1.gst-plugins-rs
+        kdePackages.qtsvg
+        kdePackages.qtimageformats
+      ];
+    }))
     libreoffice-qt
-    webex
     jitsi-meet-electron
     thunderbird
-    python3
+    vesktop
   ];
 
   programs = {
@@ -138,4 +152,9 @@
     ++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or [ ]);
 
   boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" ];
+
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [ libz xz xorg.libX11 freetype zstd dbus ];
+  };
 }
diff --git a/systems/kuraokami/hardware.nix b/systems/kuraokami/hardware.nix
index 7df39eb..7529c97 100644
--- a/systems/kuraokami/hardware.nix
+++ b/systems/kuraokami/hardware.nix
@@ -6,25 +6,25 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  hardware.nvidia.prime = {
-    offload.enable = false;
-    sync.enable = false;
+  hardware.nvidia = {
+    open = true;
+    prime = {
+      offload.enable = false;
+      sync.enable = false;
 
-    # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
-    intelBusId = "PCI:0:2:0";
+      # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
+      intelBusId = "PCI:0:2:0";
 
-    # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
-    nvidiaBusId = "PCI:1:0:0";
+      # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
+      nvidiaBusId = "PCI:1:0:0";
+    };
   };
 
   boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-intel" "nouveau" ];
   boot.extraModulePackages = [ ];
 
-  zramSwap.enable = true;
-
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/ec151a68-5886-4747-b5e3-2f9bdb89e162";