From 29da74a2fbb7305a9e37ae2460a51c3657df20a9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 7 Sep 2023 01:44:45 +0200
Subject: [PATCH] bye bye prime

---
 flake.nix              | 2 +-
 hosts/sopp/default.nix | 7 ++++---
 users/default.nix      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8967035..22fe0de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -132,7 +132,7 @@
       noximilien = mkConfig "noximilien" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]);
       bolle      = mkConfig "bolle"      "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]);
       nord       = mkConfig "nord"       "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-cpu-intel-sandy-bridge common-gpu-amd common-hidpi ]);
-      sopp       = mkConfig "sopp"       "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia ]);
+      sopp       = mkConfig "sopp"       "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]);
       garp       = mkConfig "garp"       "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia ]);
       #gomperud smattkuken skrytebiffen skalkesnerken
     };
diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix
index a97e4e8..b9bbc1c 100644
--- a/hosts/sopp/default.nix
+++ b/hosts/sopp/default.nix
@@ -15,8 +15,8 @@
   #hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start
 
   # PRIME: (lspci)
-  hardware.nvidia.prime.intelBusId  = "PCI:0:02:0";
-  hardware.nvidia.prime.nvidiaBusId = "PCI:1:00:0";
+  #hardware.nvidia.prime.intelBusId  = "PCI:0:02:0";
+  #hardware.nvidia.prime.nvidiaBusId = "PCI:1:00:0";
 
   imports = [
     ./hardware-configuration.nix
@@ -114,7 +114,8 @@
   ];
 
   # nvidia bad
-  nixpkgs.config.packageOverrides = lib.mkIf (!config.hardware.nvidia.prime.offload.enable) (pkgs: {
+  #nixpkgs.config.packageOverrides = lib.mkIf (!config.hardware.nvidia.prime.offload.enable) (pkgs: {
+  nixpkgs.config.packageOverrides = (pkgs: {
     teams = pkgs.teams.overrideAttrs (old: rec {
       postInstall = (old.postInstall or "") + ''
         substituteInPlace $out/share/applications/teams.desktop \
diff --git a/users/default.nix b/users/default.nix
index 2cb58e5..018c904 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -2,7 +2,7 @@
 {
   #imports = [ <home-manager/nixos> ];
   imports = [ inputs.home-manager.nixosModule ];
-  home-manager.useGlobalPkgs = true; # go brrr
+  home-manager.useGlobalPkgs = true; # go brrr, reuse overrides
   #home-manager.useUserPackages = true # needed if VM, somewhat brrr, installs user packages to /etc instead of ~/.nix-profile
 
   # When adding a new user accounts: Don't forget to set a password with ‘passwd’!