From 3eaae0b22daa46ceb480c3ec9c4e28b500d29a63 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Tue, 2 Dec 2025 15:56:25 -0500
Subject: [PATCH] cleanup

---
 system/common.nix                                |  9 ++++-----
 system/{hardware_laptop.nix => disk_mreow.nix}   |  0
 ...mpermanence-disk-config.nix => disk_yarn.nix} |  0
 system/system-mreow.nix                          |  2 +-
 system/system-yarn.nix                           | 16 ++++++++++++----
 5 files changed, 17 insertions(+), 10 deletions(-)
 rename system/{hardware_laptop.nix => disk_mreow.nix} (100%)
 rename system/{impermanence-disk-config.nix => disk_yarn.nix} (100%)

diff --git a/system/common.nix b/system/common.nix
index 680175e..64195a8 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -16,9 +16,12 @@
     ./steam.nix
     ./networking.nix
 
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
     inputs.disko.nixosModules.disko
     inputs.lanzaboote.nixosModules.lanzaboote
+
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
   # use tuned instead of tlp or ppd
@@ -37,7 +40,6 @@
   # Add niri to display manager session packages
   services.displayManager.sessionPackages = [ niri-package ];
 
-  # Gamescope configuration for Steam Deck-like experience
   programs = {
     gamescope = {
       enable = true;
@@ -81,9 +83,6 @@
     ];
   };
 
-  # allow unfree packages for jovian-nixos
-  nixpkgs.config.allowUnfree = true;
-
   # kernel options
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/system/hardware_laptop.nix b/system/disk_mreow.nix
similarity index 100%
rename from system/hardware_laptop.nix
rename to system/disk_mreow.nix
diff --git a/system/impermanence-disk-config.nix b/system/disk_yarn.nix
similarity index 100%
rename from system/impermanence-disk-config.nix
rename to system/disk_yarn.nix
diff --git a/system/system-mreow.nix b/system/system-mreow.nix
index bac09f7..b61c5e7 100644
--- a/system/system-mreow.nix
+++ b/system/system-mreow.nix
@@ -9,7 +9,7 @@
 {
   imports = [
     ./common.nix
-    ./hardware_laptop.nix
+    ./disk_mreow.nix
 
     inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
   ];
diff --git a/system/system-yarn.nix b/system/system-yarn.nix
index 60b2f6c..785274c 100644
--- a/system/system-yarn.nix
+++ b/system/system-yarn.nix
@@ -8,16 +8,13 @@
 }:
 {
   imports = [
-    ./impermanence-disk-config.nix
+    ./disk_yarn.nix
     ./common.nix
     ./impermanence.nix
     ./no-rgb.nix
     ./vr.nix
 
-    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
-    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
     inputs.impermanence.nixosModules.impermanence
-    inputs.disko.nixosModules.disko
     inputs.jovian-nixos.nixosModules.default
   ];
 
@@ -60,6 +57,17 @@
 
   systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\"";
 
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steamdeck-hw-theme"
+      "steam-jupiter-unwrapped"
+      "steam"
+      "steam-original"
+      "steam-unwrapped"
+      "steam-run"
+    ];
+
   jovian = {
     devices.steamdeck.enable = false;
     steam = {