From 4016b181b0c78b76a91bb9d80dc2c50531ad9df1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 24 Feb 2023 16:03:52 +0100
Subject: [PATCH] Hoping this fixes nvidia issues

---
 flake.nix                              | 7 +++++--
 modules/user/jopejoe1/default.nix      | 2 +-
 modules/user/jopejoe1/home.nix         | 3 ---
 modules/user/root/default.nix          | 1 +
 modules/user/root/home.nix             | 3 ---
 systems/x86_64-linux/kami/default.nix  | 2 +-
 systems/x86_64-linux/kami/hardware.nix | 6 +++---
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index d6eb49c..d3763ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,7 +99,10 @@
     };
     flake-utils.url = github:numtide/flake-utils;
     nixlib.url = github:nix-community/nixpkgs.lib;
-    naersk.url = github:nix-community/naersk;
+    naersk.url = {
+      url = github:nix-community/naersk;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-utils-plus = {
       url = github:gytis-ivaskevicius/flake-utils-plus;
       inputs.flake-utils.follows = "flake-utils";
@@ -135,7 +138,7 @@
             useGlobalPkgs = true;
             useUserPackages = true;
           };
-          system.stateVersion = "23.05";
+          system.stateVersion = "22.11";
           services.peerix = {
             #enable = true;
             package = peerix.packages.x86_64-linux.peerix;
diff --git a/modules/user/jopejoe1/default.nix b/modules/user/jopejoe1/default.nix
index 7d2ebd8..ad5ca16 100644
--- a/modules/user/jopejoe1/default.nix
+++ b/modules/user/jopejoe1/default.nix
@@ -22,11 +22,11 @@ in
         kate
         carla
         xdg-ninja
-        prismlauncher
         ark
       ];
     };
 
     home-manager.users.jopejoe1 = import ./home.nix;
+    home-manager.users.jopejoe1.home.stateVersion = config.system.stateVersion;
   };
 }
diff --git a/modules/user/jopejoe1/home.nix b/modules/user/jopejoe1/home.nix
index c3eaad6..ca3b541 100644
--- a/modules/user/jopejoe1/home.nix
+++ b/modules/user/jopejoe1/home.nix
@@ -11,9 +11,6 @@
       XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos";
       XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
     };
-
-    # Do not change this version unless 100% sure updatet evrything to the new version
-    stateVersion = "23.05";
   };
 
   accounts.email.accounts = {
diff --git a/modules/user/root/default.nix b/modules/user/root/default.nix
index 72562e8..72c868f 100644
--- a/modules/user/root/default.nix
+++ b/modules/user/root/default.nix
@@ -12,5 +12,6 @@ in
   config = mkIf cfg.enable {
 
     home-manager.users.root = import ./home.nix;
+    home-manager.users.root.home.stateVersion = config.system.stateVersion;
   };
 }
diff --git a/modules/user/root/home.nix b/modules/user/root/home.nix
index f37e1ff..469a54c 100644
--- a/modules/user/root/home.nix
+++ b/modules/user/root/home.nix
@@ -11,9 +11,6 @@
       XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos";
       XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
     };
-
-    # Do not change this version unless 100% sure updatet evrything to the new version
-    stateVersion = "23.05";
   };
 
   xdg = {
diff --git a/systems/x86_64-linux/kami/default.nix b/systems/x86_64-linux/kami/default.nix
index e9a9089..d46ac99 100644
--- a/systems/x86_64-linux/kami/default.nix
+++ b/systems/x86_64-linux/kami/default.nix
@@ -27,7 +27,7 @@ with lib;
 
   hardware.opengl.enable = true;
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
-  #boot.kernelParams = [ "module_blacklist=i915" ];
+  boot.kernelParams = [ "module_blacklist=i915" ];
 
   programs = {
     dconf.enable = true;
diff --git a/systems/x86_64-linux/kami/hardware.nix b/systems/x86_64-linux/kami/hardware.nix
index fa36ed9..efc9ccd 100644
--- a/systems/x86_64-linux/kami/hardware.nix
+++ b/systems/x86_64-linux/kami/hardware.nix
@@ -7,14 +7,14 @@ in
   imports = with nixos-hardware.nixosModules; [
     (modulesPath + "/installer/scan/not-detected.nix")
     common-cpu-intel
-    common-gpu-nvidia
+    #common-gpu-nvidia
     common-pc
     common-pc-ssd
   ];
 
   hardware.nvidia.prime = {
     offload.enable = false;
-    sync.enable = true;
+    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";
@@ -24,7 +24,7 @@ in
   };
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_latest;
 
     initrd = {
       # kernelModules = [ "amdgpu" ];