Fixes for stable systems

flake.nix

@@ -48,8 +48,8 @@
     nixosModules = [
       ./roles
     ] ++ [
+      ./roles/jovian-compat.nix
       inputs.home-manager.nixosModules.home-manager
-      inputs.jovian.nixosModules.jovian
       {
         nixpkgs.overlays = [
           (final: prev: {

machines/zix790prors/configuration.nix

@@ -19,7 +19,6 @@ with lib;
       enable = true;
       gaming = {
         enable = true;
-        emulation = true;
       };
       kde = true;
       sddm = true;

roles/jovian-compat.nix

@@ -1,8 +1,9 @@
 { lib, config, ... }:
 
-# Compatibility shim to provide services.logind.settings for NixOS 25.05
+# Minimal Jovian compatibility layer for NixOS stable (25.05)
-# This allows Jovian-NixOS to work with stable NixOS
+# Defines only the Jovian options used by roles/desktop/steamos.nix
-# REMOVE THIS FILE when upgrading to NixOS 25.11 or later
+# No actual implementation - just option definitions to prevent evaluation errors
+# REMOVE THIS FILE when all systems are on NixOS 25.11+ or unstable
 
 with lib;
 
@@ -11,10 +12,32 @@ let
   isCompatibleVersion = versionOlder nixosVersion "25.11";
 in
 {
-  options.services.logind.settings = mkOption {
+  options.jovian = {
-    type = types.attrsOf (types.attrsOf types.anything);
+    steam = {
-    default = {};
+      enable = mkEnableOption "Steam (jovian-compat stub)";
-    description = "systemd-logind configuration. See logind.conf(5) for available options.";
+
+      autoStart = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Auto-start Steam (jovian-compat stub)";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "user";
+        description = "Steam user (jovian-compat stub)";
+      };
+
+      desktopSession = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Desktop session (jovian-compat stub)";
+      };
+    };
+
+    decky-loader = {
+      enable = mkEnableOption "Decky Loader (jovian-compat stub)";
+    };
   };
 
   config = mkMerge [
@@ -25,19 +48,17 @@ in
           message = ''
             The Jovian compatibility shim (roles/jovian-compat.nix) is only needed for NixOS 25.05 and earlier.
             You are running NixOS ${nixosVersion}.
-            Please remove 'roles/jovian-compat.nix' from your flake.nix imports.
+            Please remove 'roles/jovian-compat.nix' from your flake.nix nixosModules list.
           '';
         }
       ];
     }
-    (mkIf (config.services.logind.settings != {}) {
+    # No config implementation - these options do nothing on stable systems
-      # Convert the settings to extraConfig format for older NixOS
+    # steamos role is only enabled on nix-deck which uses unstable anyway
-      services.logind.extraConfig = let
+    (mkIf config.jovian.steam.enable {
-        mkSection = section: settings:
+      warnings = [
-          "[${section}]\n" +
+        "Jovian is enabled but you're using the compatibility stub. This won't work correctly. Use NixOS unstable for Jovian support."
-          (concatStringsSep "\n" (mapAttrsToList (k: v: "${k}=${toString v}") settings));
+      ];
-      in
-        concatStringsSep "\n\n" (mapAttrsToList mkSection config.services.logind.settings);
     })
   ];
 }

roles/remote-build/default.nix

@@ -91,6 +91,11 @@ in
 
       users.groups.${cfg.builderUser} = {};
 
+      # Ensure home directory has correct permissions
+      systemd.tmpfiles.rules = [
+        "d /var/lib/${cfg.builderUser} 0700 ${cfg.builderUser} ${cfg.builderUser} -"
+      ];
+
       # Allow builder user to perform builds
       nix.settings.trusted-users = [ cfg.builderUser ];