diff --git a/flake.lock b/flake.lock index e3ad0a1..9023792 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1780372639, - "narHash": "sha256-VFzXYHlIGwO4h4ovtnpZj9sX/Qu6+dlI00sXjHdwi2w=", + "lastModified": 1783689476, + "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "1ee1e8864a1fcfcc21a5fb5af4bd328b3c829f42", + "rev": "af94408291ad477cae8eed964981ab41f90eb184", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1781190061, - "narHash": "sha256-QRMpLbsmlciMGv4yx75FUoIl54K02JbIX1tgdPHPw1s=", + "lastModified": 1783744694, + "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f2b3fdb347f91dfd344ad196666a0b0fe8aad05c", + "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781239934, - "narHash": "sha256-bK84gDc7MgPdoQfr4k1oSIsdA9pSXVjEc3QPpVFGRPs=", + "lastModified": 1783668331, + "narHash": "sha256-mMfzU9jvq9XQyyssR9w0Rki8/Ec4Ez+bLkFWc7BaGGg=", "owner": "purpleclay", "repo": "go-overlay", - "rev": "efc8ba6788ff0736cc2098d7c588d58819a927e7", + "rev": "423eed783363fa154fc7f0c049f7effa910d2440", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1781184346, - "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=", + "lastModified": 1783740085, + "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea6d221d7aa85652d014b6f719dddf036037515b", + "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780902259, - "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", + "lastModified": 1783703440, + "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", + "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1781241353, - "narHash": "sha256-lY3e7d5bA48qnTWGBSH6SK5jfINRlCQEv+zx1eGl1zU=", + "lastModified": 1783886399, + "narHash": "sha256-pcHOwEcr5xFGFRUriCdWFcBFBU5oouFW3iO65HCZ3cI=", "ref": "refs/heads/master", - "rev": "90afe7c81a068fb1f160d68acd0ad06fa1bf7553", - "revCount": 30, + "rev": "b43f2ace4941315daabccc716e151a0ca47276db", + "revCount": 32, "type": "git", "url": "https://scm.wyattjmiller.com/wymiller/nur.git" }, @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1780197589, - "narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=", + "lastModified": 1782875958, + "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc", + "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", "type": "github" }, "original": { @@ -391,11 +391,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1781234414, - "narHash": "sha256-HdA+P4fKRGOomkewnI/Tww5Wz4xK1O7+hDO90YAsPB4=", + "lastModified": 1783834461, + "narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d18bfe3de6244c641ca4e8011186d0981b81d76", + "rev": "a286e5b998e852297a403786f063fb2c9fe7f57a", "type": "github" }, "original": { diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index 67d7b9b..e871dce 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -149,10 +149,15 @@ in { vintage-story = { enable = lib.mkEnableOption "Vintage Story client and server"; }; + + archon = { + enable = lib.mkEnableOption "Archon from NUR"; + }; }; config = let agl = cfg.aagl; + nurPkgs = import "${nur.outPath}/pkgs" { inherit pkgs; }; in { programs.steam = lib.mkIf cfg.steam.enable { enable = true; @@ -218,7 +223,8 @@ in { )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ - (lib.optionals cfg.vintage-story.enable [nur.packages.${pkgs.system}.vintage-story]) ++ + (lib.optionals cfg.vintage-story.enable [nurPkgs.vintage-story]) ++ + (lib.optionals cfg.archon.enable [nurPkgs.archon]) ++ (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 0b50e0a..85cd474 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -3,6 +3,7 @@ pkgs, userName, aagl, + nur, ... }: let flatpakPackages = [ @@ -49,8 +50,6 @@ in { ]; }; - - # Custom kernel/boot stuff boot = { kernelPackages = pkgs.linuxPackages_latest; @@ -127,6 +126,7 @@ in { }; ffxiv.enable = true; + archon.enable = true; minecraft.enable = true; aagl.wavey-launcher.enable = true; vintage-story.enable = true;