diff --git a/flake.lock b/flake.lock index a2b2564..d60974a 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1777475243, - "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=", + "lastModified": 1779903856, + "narHash": "sha256-uRShMtD6xW3ZKZbCQ6sDzKWEnbBXUg3IGfOARYogKhg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8", + "rev": "50671fc7f29d686f63ef34b603320d44ad7f2d29", "type": "github" }, "original": { @@ -43,6 +43,27 @@ "type": "github" } }, + "darwin_2": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1779036909, + "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "56c666e108467d87d13508936aade6d567f2a501", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -62,57 +83,47 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1761577921, - "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=", - "rev": "47849c7625e223d36766968cc6dc23ba0e135922", - "revCount": 107, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" - } - }, - "flake-schemas_2": { - "locked": { - "lastModified": 1761577921, - "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=", - "rev": "47849c7625e223d36766968cc6dc23ba0e135922", - "revCount": 107, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -131,11 +142,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1778507602, + "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", "type": "github" }, "original": { @@ -173,11 +184,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1777487930, - "narHash": "sha256-vdB1KmqUuUmzr0H1JI491jvuninmuSkeaARwBsTHM58=", + "lastModified": 1779167584, + "narHash": "sha256-iAMW53zbWUrGtLjtq66Sqzbz803aT+IBPg+0l6mztE8=", "owner": "purpleclay", "repo": "go-overlay", - "rev": "aa92d14492077f331898bd8ed671765ef5a5884e", + "rev": "1a7dd3c1e396d5d969da6f7a39bc6affd0847f1c", "type": "github" }, "original": { @@ -193,11 +204,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1779506708, + "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "type": "github" }, "original": { @@ -207,6 +218,24 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1779507042, + "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1739444422, @@ -225,11 +254,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -241,11 +270,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777077449, - "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { @@ -256,6 +285,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -271,32 +332,25 @@ "type": "github" } }, - "nixpkgs_4": { + "nur": { + "inputs": { + "darwin": "darwin_2", + "flake-utils": "flake-utils_2", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1766201043, - "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", - "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", - "revCount": 904049, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz" + "lastModified": 1780250071, + "narHash": "sha256-Xh+CL7UkH6H0hLZFkG9zgT4gj/NOH/BqOduacD6AAyw=", + "ref": "refs/heads/master", + "rev": "7693a998cc38738f38d2f7f2818dee396551d2c4", + "revCount": 22, + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/nur.git" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", - "revCount": 906333, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.906333%2Brev-078d69f03934859a181e81ba987c2bb033eebfc5/019bebf2-031c-7119-8fdc-ce9d29d005fa/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/nur.git" } }, "root": { @@ -307,9 +361,8 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2", - "swaytreesave": "swaytreesave", - "vintage-story": "vintage-story" + "nur": "nur", + "rust-overlay": "rust-overlay_2" } }, "rust-overlay": { @@ -320,11 +373,11 @@ ] }, "locked": { - "lastModified": 1770952264, - "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", + "lastModified": 1777605393, + "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", + "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c", "type": "github" }, "original": { @@ -335,14 +388,14 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1777432579, - "narHash": "sha256-Ce11TStDsqCge2vAAfLKe2+4lDI5cSX5ZYZOuKJBKKQ=", + "lastModified": 1780197589, + "narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ecb5e6ab380ced3272ef7fcfe398bffbcc0f152", + "rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc", "type": "github" }, "original": { @@ -351,25 +404,6 @@ "type": "github" } }, - "swaytreesave": { - "inputs": { - "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1767148467, - "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=", - "ref": "refs/heads/master", - "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a", - "revCount": 4, - "type": "git", - "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git" - }, - "original": { - "type": "git", - "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -385,23 +419,19 @@ "type": "github" } }, - "vintage-story": { - "inputs": { - "flake-schemas": "flake-schemas_2", - "nixpkgs": "nixpkgs_5" - }, + "systems_2": { "locked": { - "lastModified": 1769397199, - "narHash": "sha256-MSajncUGZtlpl88rqFdj42eGGyWnk2jw84VbK3AgUBA=", - "ref": "refs/heads/master", - "rev": "4d2313c50933645040a0d12556016fc2916bfa65", - "revCount": 1, - "type": "git", - "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git" + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" }, "original": { - "type": "git", - "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git" + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 1e60924..e40a40b 100644 --- a/flake.nix +++ b/flake.nix @@ -17,10 +17,7 @@ url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # My personal flakes - swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"; - vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"; + nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git"; }; outputs = inputs @ { @@ -32,14 +29,13 @@ rust-overlay, go-overlay, aagl, - swaytreesave, - vintage-story, + nur, ... }: let userName = "wyatt"; userEmail = "wyatt@wyattjmiller.com"; extraSpecialArgs = { - inherit userName userEmail swaytreesave; + inherit userName userEmail nur; }; myOverlays = { ... }: { @@ -86,7 +82,7 @@ nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit userName userEmail aagl vintage-story; + inherit userName userEmail aagl nur; hostname = "cloud"; role = "workstation"; }; @@ -169,7 +165,7 @@ nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit userName userEmail vintage-story; + inherit userName userEmail nur; hostname = "thancred"; role = "server"; }; diff --git a/home/default.nix b/home/default.nix index 22636b3..5c56ad1 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,6 @@ { lib , pkgs , userName -, swaytreesave , isNixOS ? true , ... }: let diff --git a/home/sway.nix b/home/sway.nix index 7827aa8..41a14ae 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -1,7 +1,7 @@ { lib, pkgs, - swaytreesave, + nur, ... }: let dirs = { @@ -17,7 +17,7 @@ }; in { imports = [ - swaytreesave.homeManagerModules.default + nur.homeManagerModules.swaytreesave ]; programs.swaytreesave.enable = if pkgs.stdenv.isLinux then true else false; @@ -155,5 +155,4 @@ in { enable = pkgs.stdenv.isLinux; systemd.enable = true; }; - } diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index e1a2c3f..aca6cbb 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -3,7 +3,7 @@ lib, pkgs, aagl, - vintage-story, + nur, ... }: let cfg = config.gaming; @@ -218,7 +218,7 @@ in { )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ - (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++ + (lib.optionals cfg.vintage-story.enable [nur.packages.${pkgs.system}.vintage-story]) ++ (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 f73f057..6557556 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -34,7 +34,22 @@ in { ]; # Enable flakes for NixOS - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings = { + experimental-features = ["nix-command" "flakes"]; + substituters = [ + "https://attic.home.wyattjmiller.com/wyatt" + ]; + + trusted-substituters = [ + "https://attic.home.wyattjmiller.com/wyatt" + ]; + + trusted-public-keys = [ + "wyatt:KBM2U2fVUomYUdMsxeNp0MDrUrCU5BECZHLF72o8TOI=" + ]; + }; + + # Custom kernel/boot stuff boot = { diff --git a/modules/machine/thancred/configuration.nix b/modules/machine/thancred/configuration.nix index 8a7e277..acdd44a 100644 --- a/modules/machine/thancred/configuration.nix +++ b/modules/machine/thancred/configuration.nix @@ -1,7 +1,7 @@ { pkgs, userName, - vintage-story, + nur, ... }: { imports = [ @@ -60,7 +60,7 @@ }; environment.systemPackages = [ - vintage-story.packages.${pkgs.system}.default + nur.packages.${pkgs.system}.vintage-story ]; systemd.services.vintagestory-server = { @@ -71,7 +71,7 @@ Type = "simple"; User = userName; WorkingDirectory = "/home/${userName}"; - ExecStart = "${vintage-story.packages.${pkgs.system}.default}/bin/vintagestory-server"; + ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server"; Restart = "on-failure"; RestartSec = "5s"; };