changed pc to stable drivers, updated amdgpu drivers and reverted to older kernel version, added swaylock and swayidle, revamped screenshots and niri keybinds

2 files changed, 8 insertions, 15 deletions

diff --git a/os/core/core.nix b/os/core/core.nix
index f13396e..160e67b 100644
--- a/os/core/core.nix
+++ b/os/core/core.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 let
   cfg = config.os.core;
 in
@@ -22,26 +22,15 @@ in
 
   options.os.core = {
     allowUnfree.enable = lib.mkEnableOption "unfree software";
-
     flatpak.enable = lib.mkEnableOption "Flatpak support";
-    
-    hardwareTools = {
-      enable = lib.mkEnableOption "peripheral and thermal tools";
-    };
   };
 
   config = lib.mkMerge [
     (lib.mkIf cfg.allowUnfree.enable {
       nixpkgs.config.allowUnfree = true;
     })
-
     (lib.mkIf cfg.flatpak.enable {
       services.flatpak.enable = true;
     })
-
-    (lib.mkIf cfg.hardwareTools.enable {
-      programs.coolercontrol.enable = true;
-      environment.systemPackages = [ pkgs.rivalcfg ];
-    })
   ];
 }
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 30028dc..57f370a 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -13,6 +13,8 @@ in
   };
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
+      programs.coolercontrol.enable = true;
+      services.lact.enable = true;
       services.smartd.enable = true;
       hardware.sensor.iio.enable = true;
       hardware.enableAllFirmware = true;
@@ -20,19 +22,21 @@ in
       hardware.graphics = {
         enable = true;
         enable32Bit = true;
+        extraPackages = with pkgs; [
+          rocmPackages.clr.icd
+        ];
       };
     }
 
     (lib.mkIf cfg.amdgpu.enable {
-      services.xserver.videoDrivers = [ "amdgpu" ];
       hardware.amdgpu = {
         initrd.enable = true;
         overdrive.enable = true;
       };
+      boot.kernelParams = [ "amdgpu.gpu_recovery=1" ];
     })
 
     (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") {
-      services.lact.enable = true;
       boot.kernelPackages = pkgs.linuxPackages_latest;
       chaotic.mesa-git = {
         enable = true;
@@ -44,7 +48,7 @@ in
     })
 
     (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") {
-      boot.kernelPackages = pkgs.linuxPackages_latest;
+      boot.kernelPackages = pkgs.linuxPackages_6_12;
     })
   ]);
 }