chore: update flake lock

Merge pull request '📦 Add Caitsith package' (#8 ) from caitsith into master
Reviewed-on: #8
2026-08-26 14:04:12 -04:00 · 2026-08-11 18:45:21 -05:00 · 2026-08-11 14:27:08 -04:00 · 2026-08-09 14:40:54 -05:00 · 2026-08-09 14:40:44 -05:00 · 2026-08-09 14:40:33 -05:00
8 changed files with 203 additions and 134 deletions
@@ -63,11 +63,11 @@ jobs:
          system="$(nix eval --impure --raw --expr builtins.currentSystem)"

          NIXPKGS_ALLOW_UNFREE=1 nix build --impure --accept-flake-config --no-link --print-out-paths -L \
-            ".#packages.${system}.atuinLatest" \
            ".#packages.${system}.musicpresence" \
            ".#packages.${system}.vintage-story" \
            ".#packages.${system}.swaytreesave" \
            ".#packages.${system}.archon" \
+            ".#packages.${system}.ani-cli-rs" \
            | tee built-paths.txt

      - name: Push packages to Attic
@@ -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": {
@@ -20,34 +40,64 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
+    "flake-schemas": {
      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
+        "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": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
+      }
+    },
+    "flake-schemas_2": {
+      "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"
+      }
+    },
+    "hildibrand": {
+      "inputs": {
+        "flake-schemas": "flake-schemas_2",
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay_2"
+      },
+      "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_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": {
@@ -58,27 +108,55 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
-        "type": "github"
+        "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": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1780902259,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "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": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1787640266,
+        "narHash": "sha256-MrkfE5hF5xx4L/0h5NyJ3xQkKVftwSuKSkFSrvlTxGY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f4f698677b11021a8f84f452e23ae9ef2427bec3",
        "type": "github"
      },
      "original": {
@@ -90,25 +168,26 @@
    },
    "root": {
      "inputs": {
+        "caitsith": "caitsith",
        "darwin": "darwin",
-        "flake-utils": "flake-utils",
+        "hildibrand": "hildibrand",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay"
+        "nixpkgs": "nixpkgs_4"
      }
    },
    "rust-overlay": {
      "inputs": {
        "nixpkgs": [
+          "caitsith",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1786247265,
-        "narHash": "sha256-cVTcTqAhzSNMOVddtBhFpuv+Vx6/SgrhgZWJiI61H24=",
+        "lastModified": 1771729765,
+        "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "6df7076ea0f5697e3242719a4c71211f00411cf5",
+        "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c",
        "type": "github"
      },
      "original": {
@@ -117,18 +196,24 @@
        "type": "github"
      }
    },
-    "systems": {
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hildibrand",
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "lastModified": 1784438913,
+        "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
        "type": "github"
      },
      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
        "type": "github"
      }
    }
@@ -3,51 +3,41 @@

  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";
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      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,
-      rust-overlay,
-      ...
-    }:
+  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:
+      packages = forAllSystems (system:
        let
          pkgs = import nixpkgs {
            inherit system;
            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;
+          caitsith = inputs.caitsith.packages.${system}.default;
+        }
      );

-      devShells = forAllSystems (
-        system:
-        let
-          pkgs = import nixpkgs { inherit system; };
-        in
+      devShells = forAllSystems (system:
+        let pkgs = import nixpkgs { inherit system; }; in
        {
          default = pkgs.mkShell {
            packages = with pkgs; [ 
@@ -57,10 +47,7 @@
        }
      );

-      overlays.default = nixpkgs.lib.composeManyExtensions [
-        rust-overlay.overlays.default
-        (import ./overlays)
-      ];
+      overlays.default = import ./overlays;
      homeManagerModules = import ./modules/home-manager self;
      nixosModules.default = import ./modules/nixos;
      darwinModules.default = import ./modules/darwin;
@@ -1,43 +1 @@
-final: prev:
-let
-  rustLatest = prev.rust-bin.stable.latest.default;
-  rustPlatform = prev.makeRustPlatform {
-    cargo = rustLatest;
-    rustc = rustLatest;
-  };
-in
-{
-  atuinLatest = (prev.atuin.override { inherit rustPlatform; }).overrideAttrs (oldAttrs: rec {
-    version = "18.19.0";
-
-    src = prev.fetchFromGitHub {
-      owner = "atuinsh";
-      repo = "atuin";
-      rev = "v${version}";
-      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
-    };
-
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit src;
-      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
-    };
-
-    cargoBuildFeatures = [
-      "ai"
-      "client"
-      "clipboard"
-      "daemon"
-      "hex"
-      "sync"
-    ];
-    cargoCheckFeatures = cargoBuildFeatures;
-
-    preCheck = (oldAttrs.preCheck or "") + ''
-      export HOME="$TMPDIR"
-      export XDG_CONFIG_HOME="$TMPDIR/.config"
-      export XDG_DATA_HOME="$TMPDIR/.local/share"
-      export XDG_STATE_HOME="$TMPDIR/.local/state"
-      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
-    '';
-  });
-}
+final: prev: { }
@@ -1,10 +1,19 @@
-{ pkgs }:
 { 
-  atuinLatest = pkgs.atuinLatest;
+  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 {};
-  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
-  musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
-  vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };
-  archon = pkgs.callPackage ./linux/archon.nix { };
+  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix {};
+  musicpresence = pkgs.callPackage ./linux/musicpresence.nix {};
+  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 { };
 }
@@ -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}";
+  };
+}
@@ -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; {
@@ -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;
Author	SHA1	Message	Date
wymiller	c101b7c7e6	chore: update flake lock Publish packages to Attic / publish (push) Successful in 11m43s Details	2026-08-26 14:04:12 -04:00
wymiller	259bcff01c	Merge pull request '📦 Add Caitsith package' (#8 ) from caitsith into master Publish packages to Attic / publish (push) Successful in 8m3s Details Reviewed-on: #8	2026-08-11 18:45:21 -05:00
wymiller	f3a26325e4	add: caitsith discord bot input	2026-08-11 14:27:08 -04:00
wymiller	ea7094e4e3	Merge pull request '📦 Add Hildibrand package' (#7 ) from discord-bots into master Publish packages to Attic / publish (push) Successful in 7m31s Details Reviewed-on: #7	2026-08-09 14:40:54 -05:00
wymiller	d26bb0a0de	Merge branch 'master' into discord-bots	2026-08-09 14:40:44 -05:00
wymiller	17f4274d0a	Merge pull request '⬆️ Archon upgrade' (#5 ) from archon-upgrade into master Publish packages to Attic / publish (push) Successful in 8m12s Details Reviewed-on: #5	2026-08-09 14:40:33 -05:00
wymiller	e3296b9c9f	Merge branch 'master' into archon-upgrade	2026-08-09 14:40:24 -05:00
wymiller	71f2f4f199	Merge pull request '⬆️ Vintage Story upgrade' (#4 ) from vs-upgrade into master Publish packages to Attic / publish (push) Successful in 8m32s Details Reviewed-on: #4	2026-08-09 14:40:17 -05:00
wymiller	3c8c08ad5f	Merge branch 'master' into vs-upgrade	2026-08-09 14:40:08 -05:00
wymiller	60dcecb7aa	Merge pull request '📦 Add ani-cli-rs packge' (#3 ) from ani-cli-rs-package into master Publish packages to Attic / publish (push) Successful in 9m31s Details Reviewed-on: #3	2026-08-09 14:40:01 -05:00
wymiller	0ffb8f5493	add: add hildibrand input, package	2026-08-09 15:38:24 -04:00
wymiller	3207f9abec	add: ani-cli-rs package added package to publish to attic	2026-08-09 13:35:28 -04:00
wymiller	9c207d6ba8	mod: upgrade vintage story client, server	2026-08-09 13:12:39 -04:00
wymiller	2397ab4151	mod: upgrade archon version added archon to application chooser	2026-08-09 13:01:27 -04:00