From 4164832eeaa9d9f4e36a104df22cd4d0c5d4bd28 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Thu, 4 Dec 2025 16:12:58 -0800 Subject: [PATCH] Upgrade NixOS to 25.11 and fix Jovian module organization - Update flake inputs from 25.05 to 25.11 (nixpkgs, home-manager, nix-darwin) - Remove Jovian compatibility shim that's no longer needed - Move SteamOS configuration to only import in nix-deck machine - Fixes jovian module not found error during nixos-rebuild --- flake.lock | 66 ++++++++++++++--------------- flake.nix | 7 ++- machines/nix-deck/configuration.nix | 1 + roles/desktop/default.nix | 1 - roles/jovian-compat.nix | 64 ---------------------------- 5 files changed, 37 insertions(+), 102 deletions(-) delete mode 100644 roles/jovian-compat.nix diff --git a/flake.lock b/flake.lock index 2e99648..4a44cc4 100644 --- a/flake.lock +++ b/flake.lock @@ -43,16 +43,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1764872372, + "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00", "type": "github" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1763223001, - "narHash": "sha256-Hi6XxTJJjKsDrO+D0fYXS88ehCYzQkZlp9qxX1zoM1s=", + "lastModified": 1764746434, + "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "68a1bcc019378272e601558719f82005a80ddab0", + "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", "type": "github" }, "original": { @@ -106,16 +106,16 @@ ] }, "locked": { - "lastModified": 1762912391, - "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } @@ -148,11 +148,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763385941, - "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=", + "lastModified": 1764730608, + "narHash": "sha256-FxKIa3OCSRVC23qrk7VT68vExUcmSruJ8OobVlSWOxc=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "cc6483354b236c2fc95cc1d4ba1f0f40b7345e69", + "rev": "10124c58674360765adcb38c9a8b081fb72904e4", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -180,11 +180,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -196,16 +196,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1764677808, + "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1762784320, - "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ ] }, "locked": { - "lastModified": 1762784320, - "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4d47f72..9607294 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,17 @@ description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nix-darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; + url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -48,7 +48,6 @@ nixosModules = [ ./roles ] ++ [ - ./roles/jovian-compat.nix inputs.home-manager.nixosModules.home-manager { nixpkgs.overlays = [ diff --git a/machines/nix-deck/configuration.nix b/machines/nix-deck/configuration.nix index f90f9bd..011cf27 100644 --- a/machines/nix-deck/configuration.nix +++ b/machines/nix-deck/configuration.nix @@ -2,6 +2,7 @@ { imports = [ ./hardware-configuration.nix + ../../roles/desktop/steamos.nix ]; roles = { diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix index 4011e25..d90a107 100644 --- a/roles/desktop/default.nix +++ b/roles/desktop/default.nix @@ -22,6 +22,5 @@ with lib; ./kde.nix ./programs.nix ./sddm.nix - ./steamos.nix ]; } diff --git a/roles/jovian-compat.nix b/roles/jovian-compat.nix deleted file mode 100644 index 9cf85e1..0000000 --- a/roles/jovian-compat.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, config, ... }: - -# Minimal Jovian compatibility layer for NixOS stable (25.05) -# Defines only the Jovian options used by roles/desktop/steamos.nix -# 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; - -let - nixosVersion = config.system.nixos.release; - isCompatibleVersion = versionOlder nixosVersion "25.11"; -in -{ - options.jovian = { - steam = { - enable = mkEnableOption "Steam (jovian-compat stub)"; - - 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 [ - { - assertions = [ - { - assertion = isCompatibleVersion; - 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 nixosModules list. - ''; - } - ]; - } - # No config implementation - these options do nothing on stable systems - # steamos role is only enabled on nix-deck which uses unstable anyway - (mkIf config.jovian.steam.enable { - warnings = [ - "Jovian is enabled but you're using the compatibility stub. This won't work correctly. Use NixOS unstable for Jovian support." - ]; - }) - ]; -}