From 2397ab4151c13817b745aea3cb8e11f773e1a6b7 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 9 Aug 2026 13:01:27 -0400 Subject: [PATCH 01/10] mod: upgrade archon version added archon to application chooser --- pkgs/linux/archon.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/linux/archon.nix b/pkgs/linux/archon.nix index 9d3ad21..0714387 100644 --- a/pkgs/linux/archon.nix +++ b/pkgs/linux/archon.nix @@ -1,11 +1,11 @@ { pkgs }: let pname = "archon"; - version = "9.3.119"; + version = "9.5.8"; src = pkgs.fetchurl { url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-mUsmaIxm3DZ1vvcwxpmDTWTj+UlFSv+jYkBrteL8xQk="; + hash = "sha256-tEMfDK0BCBvNWFlA78FKWcOvU1wzIorBM4ZmLQ+6hzU="; }; appimageContents = pkgs.appimageTools.extract { @@ -17,8 +17,11 @@ pkgs.appimageTools.wrapType2 { nativeBuildInputs = with pkgs; [ makeWrapper ]; extraInstallCommands = '' - install -Dm444 "${appimageContents}/Archon App.desktop" "$out/share/applications/archon.desktop" - install -Dm444 "${appimageContents}/Archon App.png" "$out/share/icons/hicolor/256x256/apps/archon.png" + install -Dm444 "${appimageContents}/archon.desktop" "$out/share/applications/archon.desktop" + install -Dm444 "${appimageContents}/archon.png" "$out/share/icons/hicolor/512x512/apps/archon.png" + + substituteInPlace "$out/share/applications/archon.desktop" \ + --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=archon --no-sandbox %U" ''; meta = with pkgs.lib; { From 9c207d6ba80320a99ab1ed66ce76780ea8606f0a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 9 Aug 2026 13:12:39 -0400 Subject: [PATCH 02/10] mod: upgrade vintage story client, server --- pkgs/linux/vintage-story.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/linux/vintage-story.nix b/pkgs/linux/vintage-story.nix index 295ff89..86913c2 100644 --- a/pkgs/linux/vintage-story.nix +++ b/pkgs/linux/vintage-story.nix @@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null; stdenv.mkDerivation (finalAttrs: { pname = "vintagestory"; - version = "1.22.3"; + version = "1.22.6"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz"; - hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04="; + hash = "sha256-xJPyaYklEq2BeUX9+7hNPI6WC6ibcQDS+sKeqKYSh3A="; }; __structuredAttrs = true; From 3207f9abec1533364b02797c3011ccb088dc1919 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 9 Aug 2026 13:35:28 -0400 Subject: [PATCH 03/10] add: ani-cli-rs package added package to publish to attic --- .gitea/workflows/publish-attic.yaml | 1 + pkgs/default.nix | 1 + pkgs/linux/ani-cli-rs.nix | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/linux/ani-cli-rs.nix diff --git a/.gitea/workflows/publish-attic.yaml b/.gitea/workflows/publish-attic.yaml index 36e1c46..a342738 100644 --- a/.gitea/workflows/publish-attic.yaml +++ b/.gitea/workflows/publish-attic.yaml @@ -67,6 +67,7 @@ jobs: ".#packages.${system}.vintage-story" \ ".#packages.${system}.swaytreesave" \ ".#packages.${system}.archon" \ + ".#packages.${system}.ani-cli-rs" \ | tee built-paths.txt - name: Push packages to Attic diff --git a/pkgs/default.nix b/pkgs/default.nix index a556f03..ed81ac2 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,4 +6,5 @@ vintage-story = pkgs.callPackage ./linux/vintage-story.nix {}; archon = pkgs.callPackage ./linux/archon.nix {}; yubilock = pkgs.callPackage ./linux/yubilock/default.nix { }; + ani-cli-rs = pkgs.callPackage ./linux/ani-cli-rs.nix { }; } diff --git a/pkgs/linux/ani-cli-rs.nix b/pkgs/linux/ani-cli-rs.nix new file mode 100644 index 0000000..56e6ec6 --- /dev/null +++ b/pkgs/linux/ani-cli-rs.nix @@ -0,0 +1,27 @@ +{ pkgs }: +let + pname = "ani-cli-rs"; + version = "0.9.3"; + + src = pkgs.fetchFromGitHub { + owner = "vorlie"; + repo = "ani-cli-rs"; + rev = "${version}"; + sha256 = "sha256-4JjCe9dCggLtETmH8yWYyn1tkHimPYtTp0BLQML3NKY="; + }; +in pkgs.rustPlatform.buildRustPackage { + inherit pname version src; + cargoLock = { lockFile = "${src}/Cargo.lock"; }; + + # tests make this package fail to build, this line skips them + doCheck = false; + + meta = { + description = "A cross-platform Rust port of ani-cli with two independent Anikoto catalogs and native MegaPlay/KotoCDN playback"; + mainProgram = "ani-cli-rs"; + homepage = "https://github.com/vorlie/ani-cli-rs"; + maintainers = [ "wymillerlinux" ]; + platforms = [ "x86_64-linux" ]; + changelog = "https://github.com/vorlie/ani-cli-rs/releases/tag/${version}"; + }; +} From 0ffb8f549383c28ed069ec3dc1fbd062d06d6a51 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 9 Aug 2026 15:38:24 -0400 Subject: [PATCH 04/10] add: add hildibrand input, package --- flake.lock | 76 ++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 8 ++++- pkgs/default.nix | 6 +++- 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 13ca140..5f02025 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1780327564, + "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=", + "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6", + "revCount": 149, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -38,9 +52,29 @@ "type": "github" } }, + "hildibrand": { + "inputs": { + "flake-schemas": "flake-schemas", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1785717646, + "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=", + "ref": "refs/heads/master", + "rev": "9588520925513ed0e47711a5798c6e9958143a0a", + "revCount": 5, + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" + }, + "original": { + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" + } + }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1779507042, @@ -57,6 +91,20 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1784280462, + "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", + "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f", + "revCount": 1009740, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1778443072, "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", @@ -72,7 +120,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1780902259, "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", @@ -92,8 +140,30 @@ "inputs": { "darwin": "darwin", "flake-utils": "flake-utils", + "hildibrand": "hildibrand", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "hildibrand", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784438913, + "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index 6192da9..a1e594b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ home-manager.url = "github:nix-community/home-manager"; darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; + hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git"; }; outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, darwin, ... }: @@ -26,7 +27,12 @@ overlays = [ self.overlays.default ]; }; in - import ./pkgs { inherit pkgs; } + import ./pkgs { + inherit pkgs; + + # packages that are already built with Nix go here + hildibrand = inputs.hildibrand.packages.${system}.default; + } ); devShells = forAllSystems (system: diff --git a/pkgs/default.nix b/pkgs/default.nix index a556f03..1df984e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,9 @@ -{ pkgs }: +{ pkgs, hildibrand }: { + # any packages that are added to pkgs and are inputs, we inherit them here + inherit hildibrand; + + # any packages that build instructions are in this repo, they go here # sable-web = pkgs.callPackage ./common/sable.nix {}; swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix {}; musicpresence = pkgs.callPackage ./linux/musicpresence.nix {}; From f3a26325e4ec392ba2ebd7bdc2a190f3e5ba020a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 11 Aug 2026 14:27:08 -0400 Subject: [PATCH 05/10] add: caitsith discord bot input --- flake.nix | 2 ++ pkgs/default.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a1e594b..90ab536 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git"; + caitsith.url = "git+https://scm.wyattjmiller.com/wymiller/caitsith.git"; }; outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, darwin, ... }: @@ -32,6 +33,7 @@ # packages that are already built with Nix go here hildibrand = inputs.hildibrand.packages.${system}.default; + caitsith = inputs.caitsith.packages.${system}.default; } ); diff --git a/pkgs/default.nix b/pkgs/default.nix index 1d85c77..6611160 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,12 @@ -{ pkgs, hildibrand }: +{ + pkgs, + hildibrand ? null, + caitsith ? null +}: { # any packages that are added to pkgs and are inputs, we inherit them here inherit hildibrand; + inherit caitsith; # any packages that build instructions are in this repo, they go here # sable-web = pkgs.callPackage ./common/sable.nix {}; From c101b7c7e662faab3df1fd6fcda60d37521e52ce Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 26 Aug 2026 14:04:12 -0400 Subject: [PATCH 06/10] chore: update flake lock --- flake.lock | 144 +++++++++++++++++++++++++++++++++-------------------- flake.nix | 7 ++- 2 files changed, 93 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 5f02025..e5e6066 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "caitsith": { + "inputs": { + "flake-schemas": "flake-schemas", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1787710235, + "narHash": "sha256-uWDHHB5Z9m3cXQNjfdWWqp2S/SwosukkJv57ORljCvQ=", + "ref": "refs/heads/master", + "rev": "4afabd4956611ec9213dd8392755dece81688b67", + "revCount": 20, + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git" + }, + "original": { + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -7,11 +27,11 @@ ] }, "locked": { - "lastModified": 1779036909, - "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", + "lastModified": 1786845137, + "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "56c666e108467d87d13508936aade6d567f2a501", + "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48", "type": "github" }, "original": { @@ -21,6 +41,20 @@ } }, "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": 1780327564, "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=", @@ -34,29 +68,11 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "hildibrand": { "inputs": { - "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" + "flake-schemas": "flake-schemas_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1785717646, @@ -74,14 +90,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1779507042, - "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=", + "lastModified": 1787750582, + "narHash": "sha256-FfIAV44k33i+IjC1+new2KyjyVGUzGtV89VHVP4eK1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34", + "rev": "0a364342a66bcecfc8a00d2fc38c6c29eee7bc5e", "type": "github" }, "original": { @@ -91,6 +107,20 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1771574726, + "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", + "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", + "revCount": 908154, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.908154%2Brev-c217913993d6c6f6805c3b1a3bda5e639adfde6d/019c7ebe-d61d-7168-89bc-a2b6e142b1cd/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1784280462, "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", @@ -104,29 +134,29 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1787209939, + "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1780902259, - "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", + "lastModified": 1787640266, + "narHash": "sha256-MrkfE5hF5xx4L/0h5NyJ3xQkKVftwSuKSkFSrvlTxGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", + "rev": "f4f698677b11021a8f84f452e23ae9ef2427bec3", "type": "github" }, "original": { @@ -138,14 +168,35 @@ }, "root": { "inputs": { + "caitsith": "caitsith", "darwin": "darwin", - "flake-utils": "flake-utils", "hildibrand": "hildibrand", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "caitsith", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771729765, + "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "hildibrand", @@ -165,21 +216,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 90ab536..48f1c7a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; - flake-utils.url = "github:numtide/flake-utils"; home-manager.url = "github:nix-community/home-manager"; darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; @@ -11,14 +10,14 @@ caitsith.url = "git+https://scm.wyattjmiller.com/wymiller/caitsith.git"; }; - outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, darwin, ... }: + outputs = inputs@{ self, nixpkgs, home-manager, darwin, ... }: let - systems = [ + supportedSystems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; - forAllSystems = f: nixpkgs.lib.genAttrs systems f; + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems f; in { packages = forAllSystems (system: From 8a671235d9f42233485bef88c791138cbc15bb64 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 26 Aug 2026 14:06:23 -0400 Subject: [PATCH 07/10] mod: update ani-cli-rs to 0.9.4 from 0.9.3 --- pkgs/linux/ani-cli-rs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/linux/ani-cli-rs.nix b/pkgs/linux/ani-cli-rs.nix index 56e6ec6..f192dc7 100644 --- a/pkgs/linux/ani-cli-rs.nix +++ b/pkgs/linux/ani-cli-rs.nix @@ -1,7 +1,7 @@ { pkgs }: let pname = "ani-cli-rs"; - version = "0.9.3"; + version = "0.9.4"; src = pkgs.fetchFromGitHub { owner = "vorlie"; From c18ae03bd0aca35785138e0600d561bbadb04c46 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 26 Aug 2026 18:57:30 -0400 Subject: [PATCH 08/10] add: added scheduled flake update once a week, every sunday at 3AM --- .gitea/workflows/update-flake-lock.yaml | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .gitea/workflows/update-flake-lock.yaml diff --git a/.gitea/workflows/update-flake-lock.yaml b/.gitea/workflows/update-flake-lock.yaml new file mode 100644 index 0000000..5509aba --- /dev/null +++ b/.gitea/workflows/update-flake-lock.yaml @@ -0,0 +1,40 @@ +name: Update flake lock + +on: + schedule: + # Gitea cron schedules use UTC. 07:00 UTC is 03:00 EDT. + - cron: "0 7 * * 0" + workflow_dispatch: + +permissions: + contents: write + +jobs: + update-flake-lock: + runs-on: ubuntu-latest + + steps: + - name: Check out repository + uses: actions/checkout@v4 + + - name: Install upstream Nix + uses: cachix/install-nix-action@v31 + + - name: Update flake lock + run: nix flake update + + - name: Commit and push changes + shell: bash + run: | + set -euo pipefail + + if git diff --quiet -- flake.lock; then + echo "flake.lock is already up to date" + exit 0 + fi + + git config user.name "gitea-actions[bot]" + git config user.email "gitea-actions[bot]@noreply.localhost" + git add flake.lock + git commit -m "chore: update flake lock" + git push From d53fdf0d45ed2757fa4689d1d796de4db7307a6f Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 26 Aug 2026 19:12:29 -0400 Subject: [PATCH 09/10] mod: adjusted sha to match like i should've done in the first place --- pkgs/linux/ani-cli-rs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/linux/ani-cli-rs.nix b/pkgs/linux/ani-cli-rs.nix index 56e6ec6..28f1807 100644 --- a/pkgs/linux/ani-cli-rs.nix +++ b/pkgs/linux/ani-cli-rs.nix @@ -7,7 +7,7 @@ let owner = "vorlie"; repo = "ani-cli-rs"; rev = "${version}"; - sha256 = "sha256-4JjCe9dCggLtETmH8yWYyn1tkHimPYtTp0BLQML3NKY="; + sha256 = "sha256-19U/p583B5d/Kd0O1raYhREz6zYMeudyTH7dh9bi/jU="; }; in pkgs.rustPlatform.buildRustPackage { inherit pname version src; From 760ff1b1a412251bc8b5f22b62d39582c5cfd74e Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 26 Aug 2026 19:36:40 -0400 Subject: [PATCH 10/10] chore: make sure all inputs are following nixpkgs --- flake.lock | 58 ++++++++++-------------------------------------------- flake.nix | 3 +++ 2 files changed, 13 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index e5e6066..1907232 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "caitsith": { "inputs": { "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -71,7 +73,9 @@ "hildibrand": { "inputs": { "flake-schemas": "flake-schemas_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay_2" }, "locked": { @@ -90,7 +94,9 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1787750582, @@ -107,50 +113,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1771574726, - "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", - "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", - "revCount": 908154, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.908154%2Brev-c217913993d6c6f6805c3b1a3bda5e639adfde6d/019c7ebe-d61d-7168-89bc-a2b6e142b1cd/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1784280462, - "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", - "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f", - "revCount": 1009740, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1787209939, - "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1787640266, "narHash": "sha256-MrkfE5hF5xx4L/0h5NyJ3xQkKVftwSuKSkFSrvlTxGY=", @@ -172,7 +134,7 @@ "darwin": "darwin", "hildibrand": "hildibrand", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index 48f1c7a..8105409 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,13 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git"; + hildibrand.inputs.nixpkgs.follows = "nixpkgs"; caitsith.url = "git+https://scm.wyattjmiller.com/wymiller/caitsith.git"; + caitsith.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ self, nixpkgs, home-manager, darwin, ... }: