diff --git a/flake.lock b/flake.lock index f5171384..b82a732f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,7 @@ "nodes": { "avf": { "locked": { - "lastModified": 1745372740, + "lastModified": 1745286281, "narHash": "sha256-pkbIduXLW85yB5wV6j72Gpxz5JJhuJBZxhXWsJ4BMd8=", "type": "tarball", "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/avf-channel-24.11-aarch64.tar.xz" @@ -15,7 +15,7 @@ "avf-channel": { "locked": { "lastModified": 1, - "narHash": "sha256-iA5CEp0rAhYInuOhyoIt5kvp+2fqNtWjd5aezFVlCxs=", + "narHash": "sha256-56qCMHw9q2hkyh6qlbrTKTN102OfZPkXVI4YGLa5Wgc=", "type": "tarball", "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/nixos-channel-24.11-aarch64.tar.xz" }, @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1745369821, - "narHash": "sha256-mi6cAjuBztm9gFfpiVo6mAn81cCID6nmDXh5Kmyjwyc=", + "lastModified": 1745224732, + "narHash": "sha256-0OWgbEKhpMLpk3WQi3ugOwxWW4Y6JVpKiQ+o0nuNzus=", "owner": "nix-community", "repo": "disko", - "rev": "c5140c6079ff690e85eac0b86e254de16a79a4b7", + "rev": "1770bf1ae5da05564f86b969ef21c7228cc1a70b", "type": "github" }, "original": { @@ -361,11 +361,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1745373492, - "narHash": "sha256-gZG/Lpqo4vcey27lyXtAt1jy74cTJ0G+mwCT7dBxapA=", + "lastModified": 1745287043, + "narHash": "sha256-y8DH++s3Zt9LDCRDp7+tehFaeLs4WXRxnR3lFC5qbuY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "41913d868adce57fa88f678e10c3965a2560e541", + "rev": "9c4b4690ea3a1f7233e7f9d3bdfa88e464f77d57", "type": "github" }, "original": { @@ -467,11 +467,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745430461, - "narHash": "sha256-hQs026p3fxkwVxRSF0GIGZ51CiZugNNLyt42IwCh+7g=", + "lastModified": 1745353885, + "narHash": "sha256-pPO6GlommUHHbjIilUCBeZdHI4SUyGfTJFBrT6rKhfk=", "owner": "nix-community", "repo": "NUR", - "rev": "3b16e74eae922df0a2ad3a4da3d1779fcd426c3d", + "rev": "8bb84605f2d228a466a10b97fa8aa2dc2995cd7d", "type": "github" }, "original": { @@ -551,11 +551,11 @@ }, "stable": { "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index 2b53f4e9..4188f63f 100644 --- a/hosts/jupiter/default.nix +++ b/hosts/jupiter/default.nix @@ -1,10 +1,11 @@ -{ lib, jovian, ... }: +{ ... }: { imports = [ ./boot ./disko ./filesystems ./hardware + ./jovian ./network ./users ../../modules/system @@ -19,10 +20,4 @@ desktop.enable = true; stateVersion = "24.05"; }; - - jovian = { - steam.enable = true; - hardware.has.amd.gpu = true; - decky-loader.enable = true; - }; } diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix new file mode 100644 index 00000000..1580f669 --- /dev/null +++ b/hosts/jupiter/jovian/default.nix @@ -0,0 +1,21 @@ +{ config, jovian, ... }: +{ + imports = [ jovian.nixosModules.jovian ]; + + jovian = { + steam = { + enable = true; + user = config.sysusers.main; + }; + devices.steamdeck.enable = true; + hardware.has.amd.gpu = true; + decky-loader.enable = true; + }; + + nixpkgs.allowUnfreePackages = [ + "steam" + "steam-jupiter-unwrapped" + "steamdeck-firmware" + "steamdeck-hw-theme" + ]; +} diff --git a/hosts/jupiter/users/main/default.nix b/hosts/jupiter/users/main/default.nix index 26b7a3ad..d36388c0 100644 --- a/hosts/jupiter/users/main/default.nix +++ b/hosts/jupiter/users/main/default.nix @@ -3,6 +3,7 @@ home-manager.users."${config.sysusers.main}".home = { desktop.enable = true; remote-desktop.enable = true; + enableNixpkgsReleaseCheck = false; stateVersion = lib.mkForce config.system.stateVersion; }; } diff --git a/modules/system/settings/nix/unfree/default.nix b/modules/system/settings/nix/unfree/default.nix index c9730546..8c0a288a 100644 --- a/modules/system/settings/nix/unfree/default.nix +++ b/modules/system/settings/nix/unfree/default.nix @@ -1,7 +1,8 @@ { config, lib, ... }: -{ - options.nixpkgs.allowUnfreePackages = lib.mkOption { - type = with lib.types; listOf str; +with lib; { + options.nixpkgs.allowUnfreePackages = mkOption { + type = types.listOf types.str; + default = []; }; config.nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowUnfreePackages;