Merge remote-tracking branch 'orange/master'

3 files changed, 91 insertions, 44 deletions

diff --git a/lass/1systems/aergia/config.nix b/lass/1systems/aergia/config.nix
index d49040a7a..618938ce8 100644
--- a/lass/1systems/aergia/config.nix
+++ b/lass/1systems/aergia/config.nix
@@ -27,6 +27,83 @@
     <stockholm/lass/2configs/print.nix>
     <stockholm/lass/2configs/br.nix>
     <stockholm/lass/2configs/c-base.nix>
+    # steam-deck like experience https://github.com/Jovian-Experiments/Jovian-NixOS
+    {
+      imports = [
+        "${builtins.fetchTarball "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/master.tar.gz"}/modules"
+      ];
+      jovian.steam.enable = true;
+    }
+    { # autorandrs
+      services.autorandr = {
+        enable = true;
+        hooks.postswitch.reset_usb = ''
+          echo 0 > /sys/bus/usb/devices/usb9/authorized; echo 1 > /sys/bus/usb/devices/usb9/authorized
+          ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 96 = F12 Insert F12 F12' # rebind shift + F12 to shift + insert
+        '';
+        profiles = {
+          default = {
+            fingerprint = {
+              eDP = "00ffffffffffff00288931000100000016200104805932780a0dc9a05747982712484c0000000101010101010101010101010101010108700088a1401360c820a300d9870000001ead4a0088a1401360c820a30020c23100001e000000fd0016480f5a1e000a202020202020000000fc0047504431303031480a2020202000cf";
+            };
+            config = {
+              eDP = {
+                enable = true;
+                primary = true;
+                position = "0x0";
+                mode = "2560x1600";
+                rate = "60.01";
+                transform = [
+                  [ 0.750000 0.000000 0.000000 ]
+                  [ 0.000000 0.750000 0.000000 ]
+                  [ 0.000000 0.000000 1.000000 ]
+                ];
+                # scale = {
+                #   x = 0.599991;
+                #   y = 0.599991;
+                # };
+              };
+            };
+          };
+          docked2 = {
+            fingerprint = {
+              eDP = config.services.autorandr.profiles.default.fingerprint.eDP;
+              DisplayPort-8 = "00ffffffffffff0010ac39d14c3346300f200104b5462878fb26f5af4f46a5240f5054a54b00714f8140818081c081009500b300d1c0565e00a0a0a0295030203500b9882100001a000000ff00444342375847330a2020202020000000fc0044454c4c204733323233440a20000000fd0030a5fafa41010a2020202020200181020332f149030212110490131f3f2309070783010000e200eae305c000e606050162622c6d1a0000020b30a50007622c622c5a8780a070384d4030203500b9882100001af4fb0050a0a0285008206800b9882100001a40e7006aa0a0675008209804b9882100001a6fc200a0a0a0555030203500b9882100001a000000000009";
+              DisplayPort-7 = "00ffffffffffff0020a32f00010000000c190103807341780acf74a3574cb02309484c21080081c0814081800101010101010101010104740030f2705a80b0588a00501d7400001e023a801871382d40582c4500501d7400001e000000fc00484953454e53450a2020202020000000fd00324b0f451e000a2020202020200172020333714f5f5e5d01020400101113001f2021222909070715075057070083010000e200f96d030c002000183c200060010203662150b051001b304070360056005300001e011d8018711c1620582c2500c48e2100009e011d007251d01e206e285500c48e2100001800000000000000000000000000000000000000000000ea";
+            };
+            config = {
+              DisplayPort-7 = {
+                enable = true;
+                position = "2560x0";
+                mode = "1920x1080";
+                rate = "60.00";
+              };
+              DisplayPort-8 = config.services.autorandr.profiles.docked1.config.DisplayPort-1;
+              eDP = config.services.autorandr.profiles.docked1.config.eDP;
+            };
+          };
+          docked1 = {
+            fingerprint = {
+              eDP = config.services.autorandr.profiles.default.fingerprint.eDP;
+              DisplayPort-1 = "00ffffffffffff0010ac39d14c3346300f200104b5462878fb26f5af4f46a5240f5054a54b00714f8140818081c081009500b300d1c0565e00a0a0a0295030203500b9882100001a000000ff00444342375847330a2020202020000000fc0044454c4c204733323233440a20000000fd0030a5fafa41010a2020202020200181020332f149030212110490131f3f2309070783010000e200eae305c000e606050162622c6d1a0000020b30a50007622c622c000000000000000000000000000000000000f4fb0050a0a0285008206800b9882100001a40e7006aa0a0675008209804b9882100001a6fc200a0a0a0555030203500b9882100001a000000000040";
+            };
+            config = {
+              DisplayPort-1 = {
+                enable = true;
+                primary = true;
+                position = "0x0";
+                mode = "2560x1440";
+                rate = "165.08";
+              };
+              eDP = config.services.autorandr.profiles.default.config.eDP // {
+                primary = false;
+                position = "640x1440";
+              };
+            };
+          };
+        };
+      };
+    }
   ];
 
   system.stateVersion = "22.11";
@@ -38,6 +115,8 @@
     bank
     l-gen-secrets
     generate-secrets
+    nixpkgs-review
+    pipenv
   ];
 
   programs.adb.enable = true;
@@ -65,4 +144,5 @@
   ];
 
   boot.cleanTmpDir = true;
+  programs.noisetorch.enable = true;
 }
diff --git a/lass/1systems/aergia/disk.nix b/lass/1systems/aergia/disk.nix
index 0ae0892ee..848157729 100644
--- a/lass/1systems/aergia/disk.nix
+++ b/lass/1systems/aergia/disk.nix
@@ -10,14 +10,12 @@
         partitions = [
           {
             name = "boot";
-            type = "partition";
             start = "0";
             end = "1M";
             part-type = "primary";
             flags = ["bios_grub"];
           }
           {
-            type = "partition";
             name = "ESP";
             start = "1MiB";
             end = "1GiB";
@@ -31,7 +29,6 @@
           }
           {
             name = "root";
-            type = "partition";
             start = "1GiB";
             end = "100%";
             content = {
diff --git a/lass/1systems/aergia/physical.nix b/lass/1systems/aergia/physical.nix
index 692f68dcc..9f06dccdc 100644
--- a/lass/1systems/aergia/physical.nix
+++ b/lass/1systems/aergia/physical.nix
@@ -19,15 +19,9 @@
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.kernelParams = [
-    # Enable energy savings during sleep
-    "mem_sleep_default=deep"
-
     # use less power with pstate
     "amd_pstate=passive"
 
-    # for ryzenadj -i
-    "iomem=relaxed"
-
     # suspend
     "resume_offset=178345675"
   ];
@@ -37,24 +31,6 @@
     # On recent AMD CPUs this can be more energy efficient.
     "amd-pstate"
     "kvm-amd"
-
-    # needed for zenstates
-    "msr"
-
-    # zenpower
-    "zenpower"
-  ];
-
-  boot.extraModulePackages = [
-    (config.boot.kernelPackages.zenpower.overrideAttrs (old: {
-      src = pkgs.fetchFromGitea {
-        domain = "git.exozy.me";
-        owner = "a";
-        repo = "zenpower3";
-        rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f";
-        hash = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI=";
-      };
-    }))
   ];
 
   # hardware.cpu.amd.updateMicrocode = true;
@@ -76,7 +52,6 @@
 
   environment.systemPackages = [
     pkgs.vulkan-tools
-    pkgs.ryzenadj
     (pkgs.writers.writeDashBin "set_tdp" ''
       set -efux
       watt=$1
@@ -85,9 +60,6 @@
     '')
   ];
 
-  # textsize
-  services.xserver.dpi = 200;
-
   # corectrl
   programs.corectrl = {
     enable = true;
@@ -99,17 +71,6 @@
   users.users.mainUser.extraGroups = [ "corectrl" ];
 
   # use newer ryzenadj
-  nixpkgs.config.packageOverrides = super: {
-    ryzenadj = super.ryzenadj.overrideAttrs (old: {
-      version = "unstable-2023-01-15";
-      src = pkgs.fetchFromGitHub {
-        owner = "FlyGoat";
-        repo = "RyzenAdj";
-        rev = "1052fb52b2c0e23ac4cd868c4e74d4a9510be57c"; # unstable on 2023-01-15
-        sha256 = "sha256-/IxkbQ1XrBrBVrsR4EdV6cbrFr1m+lGwz+rYBqxYG1k=";
-      };
-    });
-  };
 
   # keyboard quirks
   services.xserver.displayManager.sessionCommands = ''
@@ -122,11 +83,16 @@
       KEYBOARD_KEY_70027=reserved
   '';
 
-  # ignore power key
-
   # update cpu microcode
   hardware.cpu.amd.updateMicrocode = true;
 
+  hardware.opengl.enable = true;
+  hardware.opengl.extraPackages = [
+    pkgs.amdvlk
+    pkgs.rocm-opencl-icd
+    pkgs.rocm-opencl-runtime
+  ];
+
   # suspend to disk
   swapDevices = [{
     device = "/swapfile";
@@ -139,4 +105,8 @@
 
   # firefox touchscreen support
   environment.sessionVariables.MOZ_USE_XINPUT2 = "1";
+  # reinit usb after docking station connect
+  services.udev.extraRules = ''
+    SUBSYSTEM=="drm", ACTION=="change", RUN+="${pkgs.dash}/bin/dash -c 'echo 0 > /sys/bus/usb/devices/usb9/authorized; echo 1 > /sys/bus/usb/devices/usb9/authorized'"
+  '';
 }