cleanup

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;

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
   ];

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 = {