From eecf0c370b316ff8d6bfbff1a5b2455bd16e5683 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Sep 2024 17:53:04 +0300
Subject: [PATCH 1/2] modules/steamos/misc: add separate option for zram setup

---
 modules/steamos/misc.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/steamos/misc.nix b/modules/steamos/misc.nix
index 37215d34..739720d3 100644
--- a/modules/steamos/misc.nix
+++ b/modules/steamos/misc.nix
@@ -22,6 +22,14 @@ in
           — holo-dmi-rules 1.0
         '';
       };
+      enableZram = mkOption {
+        default = cfg.useSteamOSConfig;
+        defaultText = lib.literalExpression "config.jovian.steamos.useSteamOSConfig";
+        type = types.bool;
+        description = ''
+          Whether to enable SteamOS-like zram swap configuration
+        '';
+      };
     };
   };
 
@@ -31,7 +39,7 @@ in
         "z /sys/class/dmi/id/product_serial 440 root wheel - -"
       ];
     })
-    (mkIf (cfg.useSteamOSConfig) {
+    (mkIf (cfg.enableZram) {
       # Match vendor settings: https://github.com/Jovian-Experiments/PKGBUILDs-mirror/blob/holo-main/holo-zram-swap-0.1-0/zram-generator.conf
       zramSwap = {
         enable = lib.mkDefault true;

From ce8ea310530c77b112fda3c88cb1f57e78823467 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Sep 2024 17:54:13 +0300
Subject: [PATCH 2/2] modules: scope fbcon rotation to Valve kernel

---
 modules/devices/steamdeck/kernel.nix | 2 ++
 modules/steamos/boot.nix             | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/devices/steamdeck/kernel.nix b/modules/devices/steamdeck/kernel.nix
index 9e2214ae..f067b508 100644
--- a/modules/devices/steamdeck/kernel.nix
+++ b/modules/devices/steamdeck/kernel.nix
@@ -29,6 +29,8 @@ in
       boot.kernelPackages = mkDefault pkgs.linuxPackages_jovian;
       # see https://github.com/Jovian-Experiments/steamos-customizations-jupiter/blob/jupiter-20240709.1/misc/modules-load.d/hid-playstation.conf
       boot.kernelModules = ["hid_playstation"];
+      # Deck specific, not needed on latest non-vendor kernels
+      boot.kernelParams = ["fbcon=rotate:1"];
     }
   ]);
 }
diff --git a/modules/steamos/boot.nix b/modules/steamos/boot.nix
index 00010fb0..2bb9192b 100644
--- a/modules/steamos/boot.nix
+++ b/modules/steamos/boot.nix
@@ -49,7 +49,8 @@ in
         # Jovian: intentionally not using this one, as many people run
         # setups with LUKS password prompts on fbcon
         # "fbcon=vc:4-6"
-        "fbcon=rotate:1"
+        # Jovian: this is Steam Deck specific so it goes into the Deck profile
+        # "fbcon=rotate:1"
       ];
     })
   ];