Reenable znver2 opts

flake.lock

@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741201737,
+        "lastModified": 1740562777,
-        "narHash": "sha256-bLuBf/K4yGokkrMIvEUy4SCh8UJ0AC+Fpd67yEIabW4=",
+        "narHash": "sha256-2Hr6GRQjbStwM4ASLSOzkJZLNil4foNuuOFPGyopj9w=",
         "owner": "oddlama",
         "repo": "agenix-rekey",
-        "rev": "e7b93c191080cd8089f6e60124ed822a8366a69a",
+        "rev": "1a30818e41b6573389abfe4f1f99086714c0ca6a",
         "type": "github"
       },
       "original": {
@@ -1226,11 +1226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741221681,
+        "lastModified": 1741099788,
-        "narHash": "sha256-NsG8qx3Wmyn6jVQLdyPefA0sFjR6hoMc8iDVZ9mefJY=",
+        "narHash": "sha256-ZDTcZmhz7glHFPCSR7cmyK63Ovm1tN90PsH7YwJWTRI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7f9073f6f76849057e73ddadc6b1a305f2358f41",
+        "rev": "c13f06ae97a5c40b170f7ab92251f90981b4df77",
         "type": "github"
       },
       "original": {
@@ -1490,11 +1490,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1740440122,
+        "lastModified": 1739742581,
-        "narHash": "sha256-F6hf8YApwMlXCz27tUS1ohqf5/R1ZE1d+txit8esrJk=",
+        "narHash": "sha256-0Ze86fzS6dzw/i0+egACKR7EGe9eoOriIHwKpTDQvTI=",
         "owner": "brckd",
         "repo": "stylix",
-        "rev": "83645322fd2214b06cf01623f1774fe58cfc3520",
+        "rev": "e3fe2c662862c2fbf09bfd9fc0556d0e4225298b",
         "type": "github"
       },
       "original": {

home-mods/shell/default.nix

@@ -17,7 +17,7 @@ let
     ref = "main";
     rev = "c7392136bed264258c9b8788b14410e1ff06d602";
   };
-  myEmacs = (pkgs.emacsPackagesFor pkgs.emacs-unstable-pgtk).emacsWithPackages (epkgs:
+  myEmacs = (pkgs.pkgsAMD64Microarchs.znver2.emacsPackagesFor pkgs.emacs-unstable-pgtk).emacsWithPackages (epkgs:
     with epkgs; [
       vterm
       treesit-grammars.with-all-grammars
@@ -341,7 +341,7 @@ in
     };
 
     # TODO Disable gui apps & switch to emacs-git instead of pgtk on headless systems
-    packages = with pkgs; [
+    packages = with pkgs.pkgsAMD64Microarchs.znver2; [
       myEmacs
       emacs-lsp-booster
       any-nix-shell
@@ -393,8 +393,8 @@ in
       xpipe
       # surrealist
       # surrealdb
-      pkgs.rage
+      rage
-      pkgs.nh
+      nh
       pkgs.agenix-rekey
       # android-studio-full
     ];

os-mods/amdgpu/default.nix

@@ -18,7 +18,7 @@
   ];
 
   chaotic.mesa-git = {
-    enable = false;
+    enable = true;
     extraPackages = with pkgs; [
       mesa_git.opencl
       libva-vdpau-driver
@@ -52,7 +52,7 @@
   };
 
   systemd.services.lactd = {
-    enable = true;
+    enable = false;
     description = "Radeon GPU monitor";
     after = [ "syslog.target" "systemd-modules-load.service" ];
 
@@ -67,12 +67,12 @@
   };
 
   # Force radv
-  environment.variables.AMD_VULKAN_ICD = "RADV";
+  # environment.variables.AMD_VULKAN_ICD = "RADV";
   environment.systemPackages = with pkgs; [
     ## MONITORING TOOLS ##
     # nvtopPackages.amd # for AMD GPUs # broken ?
 
-    lact
+    # lact
     vulkan-tools
     libva-utils
     glxinfo # TODO right place here or in desktop ?

os-mods/network/default.nix

@@ -50,11 +50,11 @@
   # };
 
   environment.systemPackages = with pkgs; [
-    keybase-gui
+    # keybase-gui
   ];
   services = {
-    keybase.enable = true;
+    # keybase.enable = true;
-    kbfs.enable = true;
+    # kbfs.enable = true;
     # kbfs.enableRedirector = true;
     resolved = {
       enable = true;

systems/nixos-fw16/default.nix

@@ -97,7 +97,7 @@
   # Power mgmt
   services.input-remapper.enable = true;
   services.power-profiles-daemon.enable = true;
-  powerManagement.powertop.enable = true;
+  # powerManagement.powertop.enable = true;
   programs.corectrl.gpuOverclock.enable = lib.mkForce false; # TODO Check if needed
   programs.adb.enable = true;
   ####
@@ -107,6 +107,9 @@
     "big-parallel"
     "kvm"
     "nixos-test"
+    "gccarch-znver1"
+    "gccarch-znver2"
+    "gccarch-znver3"
     "gccarch-znver4"
   ];
   # nixpkgs.hostPlatform.gcc.arch = "znver2";
@@ -131,8 +134,10 @@
     # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
 
     # 6.14 rc wohooo
-    kernelPackages = pkgs.linuxPackages_cachyos-rc;
+    # kernelPackages = pkgs.linuxPackages_cachyos-rc;
-    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos-rc;
+    kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
+    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
+    # kernelPackages = pkgs.linuxPackages_cachyos;
 
     kernelPatches = [ ];
     kernelParams = [
@@ -233,7 +238,7 @@
   systemd = {
     services = {
       ryzenadj = {
-        enable = true;
+        enable = false;
         description = "RyzenAdj Autoset";
         serviceConfig = {
           Type = "oneshot";
@@ -244,13 +249,13 @@
       };
 
       # Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps
-      powertop.postStart = ''
+      # powertop.postStart = ''
-        HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
+      # HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
-        for i in $HIDDEVICES; do
+      # for i in $HIDDEVICES; do
-          echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
+      #   echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
-          echo 'on' > /sys/bus/usb/devices/$i/power/control
+      #   echo 'on' > /sys/bus/usb/devices/$i/power/control
-        done
+      # done
-      '';
+      # '';
 
       # This manually configures the automatically created network-adresses service to be more flexible
       # regarding booting without the the device being available on boot