Merge branch 'master' into import-overlays-from-config

mod: updated fetcher and vendor hashes
add: make sable great again
2026-09-06 13:55:13 -05:00 · 2026-09-06 14:58:27 -04:00 · 2026-09-06 14:02:14 -04:00 · 2026-09-06 12:41:35 -05:00 · 2026-09-06 07:05:17 +00:00 · 2026-09-05 20:29:50 -05:00
18 changed files with 591 additions and 56 deletions
@@ -4,6 +4,11 @@ on:
  push:
    branches:
      - master
+  workflow_run:
+    workflows:
+      - Update flake lock
+    types:
+      - completed
  workflow_dispatch:

 jobs:
@@ -62,12 +67,15 @@ 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 \
+          NIXPKGS_ALLOW_UNFREE=1 nix build --impure --sandbox --no-sandbox-fallback --accept-flake-config --no-link --print-out-paths -L \
+            ".#packages.${system}.atuinLatest" \
+            ".#packages.${system}.cliampLatest" \
            ".#packages.${system}.musicpresence" \
            ".#packages.${system}.vintage-story" \
            ".#packages.${system}.swaytreesave" \
            ".#packages.${system}.archon" \
            ".#packages.${system}.ani-cli-rs" \
+            ".#packages.${system}.opengoal" \
            | tee built-paths.txt

      - name: Push packages to Attic
@@ -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
@@ -1,5 +1,27 @@
 {
  "nodes": {
+    "caitsith": {
+      "inputs": {
+        "flake-schemas": "flake-schemas",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1788133146,
+        "narHash": "sha256-rjxs1D9duSUWf/lnJV6JZXqdpTEbJ1ntX1hZyYHOuK4=",
+        "ref": "refs/heads/master",
+        "rev": "427757654f013e316b3e267dd345c3ab780da7b6",
+        "revCount": 22,
+        "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 +29,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,6 +42,50 @@
        "type": "github"
      }
    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "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": 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,16 +104,107 @@
        "type": "github"
      }
    },
-    "home-manager": {
+    "git-hooks": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "go-overlay",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1779507042,
-        "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "go-overlay",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "go-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "git-hooks": "git-hooks",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788301927,
+        "narHash": "sha256-Zmcvt5yW//YLT3HYe3bWN1Sf2txYrnBpa5jLULVokc0=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "fe48ae4f56981f9f7c2bf03d4951fb0aa6e2095b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "type": "github"
+      }
+    },
+    "hildibrand": {
+      "inputs": {
+        "flake-schemas": "flake-schemas_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1788130254,
+        "narHash": "sha256-LR+73+2a51LOUKVTkEsP/XMVSZXm2P4hlgb7/KxdQ30=",
+        "ref": "refs/heads/master",
+        "rev": "f2049db9c29bf3ab0beff7cf0a990735d5571446",
+        "revCount": 6,
+        "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"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788651960,
+        "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
+        "rev": "2c0350c759688177331b8f5242311fae8877bdb3",
        "type": "github"
      },
      "original": {
@@ -58,27 +215,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "lastModified": 1788584326,
+        "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1780902259,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "rev": "6713828a351efa628b025a1adf7f43cbf8597513",
        "type": "github"
      },
      "original": {
@@ -90,10 +231,75 @@
    },
    "root": {
      "inputs": {
+        "caitsith": "caitsith",
        "darwin": "darwin",
-        "flake-utils": "flake-utils",
+        "go-overlay": "go-overlay",
+        "hildibrand": "hildibrand",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay_3"
+      }
+    },
+    "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",
+          "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"
+      }
+    },
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788678114,
+        "narHash": "sha256-pcqbpV4ZI79al6KAlr+WJjaEo/PYfgctRlG43D5BSJM=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "4748ec2f5ed4a881474ed4c98aa71a5308cdac8d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
      }
    },
    "systems": {
@@ -3,44 +3,71 @@

  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
-    flake-utils.url = "github:numtide/flake-utils";
    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";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    go-overlay = {
+      url = "github:purpleclay/go-overlay";
+      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, flake-utils, home-manager, darwin, ... }:
+  outputs = inputs@{ self, nixpkgs, home-manager, darwin, rust-overlay, go-overlay, ... }:
    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; [ 
-              nixfmt-rfc-style 
+            packages = with pkgs; [
+              nixfmt-rfc-style
            ];
          };
        }
      );

-      overlays.default = import ./overlays;
+      overlays.default = nixpkgs.lib.composeManyExtensions [
+        rust-overlay.overlays.default
+        go-overlay.overlays.default
+        (import ./overlays)
+      ];
      homeManagerModules = import ./modules/home-manager self;
      nixosModules.default = import ./modules/nixos;
      darwinModules.default = import ./modules/darwin;
@@ -0,0 +1,43 @@
+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"
+    '';
+  });
+}
@@ -0,0 +1,24 @@
+final: prev: {
+  cliampLatest = prev.cliamp.overrideAttrs (oldAttrs: rec {
+    version = "2.0.1";
+
+    src = prev.fetchFromGitHub {
+      owner = "bjarneo";
+      repo = "cliamp";
+      tag = "v${version}";
+      sha256 = "sha256-r7MrrcVt+/f+iPozn9jaczJmpPv431wAoW8LvHKBtB8=";
+    };
+
+    vendorHash = "sha256-rtwUWbft5XGEbuBCn0OMCn4TS5Ul+UXJNIqNOzXfU+M=";
+
+  buildInputs = with prev; [
+    libogg
+    libvorbis
+    flac
+    mpg123
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
+  });
+}
@@ -0,0 +1,10 @@
+final: prev: {
+  containerLatest = prev.container.overrideAttrs (oldAttrs: rec {
+    version = "1.3.1";
+
+    src = prev.fetchurl {
+      url = "https://github.com/apple/container/releases/download/${version}/container-${version}-installer-signed.pkg";
+      hash = "sha256-p8G515J9MIdfL2x70dDLBsLapspXzp6QpRROiY/fVKg=";
+    };
+  });
+}
@@ -1 +1,10 @@
-final: prev: { }
+final: prev:
+prev.lib.composeManyExtensions [
+  (import ./atuin.nix)
+  (import ./container.nix)
+  (import ./cliamp.nix)
+  (import ./diffnav.nix)
+  (import ./gh-dash.nix)
+  (import ./lazygit.nix)
+  (import ./k9s.nix)
+] final prev
@@ -0,0 +1,25 @@
+final: prev: let
+  golang_latest = prev.go-bin.latestStable;
+  buildGoModuleLatest = prev.buildGoModule.override {
+    go = golang_latest;
+  };
+in {
+   diffNavLatest = (prev.diffnav.override {
+    buildGoModule = buildGoModuleLatest;
+  }).overrideAttrs (_: rec {
+    version = "0.12.0";
+    src = prev.fetchFromGitHub {
+      owner = "dlvhdr";
+      repo = "diffnav";
+      rev = "v${version}";
+      hash = "sha256-DrEbo9YYg4FCXQXuIkbPxO5Z3ZOPZJYeGoLoP/vT0Y0=";
+    };
+
+    vendorHash = "sha256-2OzHyBPsylQVXhPlqk2owEhiibFi3H1UENvGGDdzGss";
+
+    ldflags = [
+      "-s"
+      "-w"
+    ];
+  }); 
+}
@@ -0,0 +1,36 @@
+final: prev: let
+  golang_latest = prev.go-bin.latestStable;
+  buildGoModuleLatest = prev.buildGoModule.override {
+    go = golang_latest;
+  };
+in {
+ ghDashLatest = (prev.gh-dash.override {
+    buildGoModule = buildGoModuleLatest;
+  }).overrideAttrs (oldAttrs: rec {
+    version = "4.25.2";
+    src = prev.fetchFromGitHub {
+      owner = "dlvhdr";
+      repo = "gh-dash";
+      rev = "v${version}";
+      hash = "sha256-FUb4zrGT0L7S1O5EcOCop4n0zlx1ODsANzBcEl9bvOU=";
+    };
+
+    vendorHash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU=";
+    doCheck = false;
+    checkFlags = [
+      "-skip=TestFullOutput"
+    ];
+
+    ldflags = [
+      "-s"
+      "-w"
+      "-X github.com/dlvhdr/gh-dash/v4/cmd.Version=${version}"
+    ];
+
+    passthru = (oldAttrs.passthru or {}) // {
+      tests = {
+        version = oldAttrs.testers.testVersion { package = final.ghDashLatest; };
+      };
+    };
+  });
+}
@@ -0,0 +1,18 @@
+final: prev: {
+  k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
+    version = "0.51.0";
+    src = prev.fetchFromGitHub {
+      owner = "derailed";
+      repo = "k9s";
+      rev = "v${version}";
+      hash = "sha256-70Rfu1BVd/QnwWXRRpwIeZ2UJNWIGixpdiOHo4v7adA=";
+    };
+
+    vendorHash = "sha256-PkYDJK2oGl+siCG9p4R8shC0e5BhGFdJsc+ksL9J5zw=";
+
+    ldflags = [
+      "-X github.com/derailed/k9s/version.Version=${version}"
+      "-X github.com/derailed/k9s/version.BuildSource=nix"
+    ];
+  });
+}
@@ -0,0 +1,18 @@
+final: prev: {
+    lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
+    version = "0.65.0";
+    src = prev.fetchFromGitHub {
+      owner = "jesseduffield";
+      repo = "lazygit";
+      rev = "v${version}";
+      hash = "sha256-W/Z/BnA5L8tXYrKn3bnekNnx7bEaaJRoHSGAeygcK0E=";
+    };
+
+    vendorHash = null;
+    subPackages = [ "." ];
+    ldflags = [
+      "-X main.version=${version}"
+      "-X main.buildSource=nix"
+    ];
+  });
+}
@@ -1,10 +1,29 @@
-{ pkgs }:
 {
-  # 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 {};
+  pkgs,
+  hildibrand ? null,
+  caitsith ? null,
+}:
+{
+  # any overlays we define here
+  atuinLatest = pkgs.atuinLatest;
+  containerLatest = pkgs.containerLatest;
+  cliampLatest = pkgs.cliampLatest;
+  lazygitLatest = pkgs.lazygitLatest;
+  ghDashLatest = pkgs.ghDashLatest;
+  diffNavLatest = pkgs.diffNavLatest;
+  k9sLatest = pkgs.k9sLatest;
+
+  # 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 { };
  yubilock = pkgs.callPackage ./linux/yubilock/default.nix { };
  ani-cli-rs = pkgs.callPackage ./linux/ani-cli-rs.nix { };
+  opengoal = pkgs.callPackage ./linux/opengoal.nix { };
 }
@@ -1,13 +1,13 @@
 { pkgs }:
 let
  pname = "ani-cli-rs";
-  version = "0.9.3";
+  version = "0.9.4";

  src = pkgs.fetchFromGitHub {
    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;
@@ -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; {
@@ -0,0 +1,49 @@
+{ pkgs }:
+let
+  pname = "OpenGOAL-Launcher";
+  version = "2.10.4";
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/open-goal/launcher/releases/download/v${version}/${pname}_${version}_amd64.AppImage";
+    hash = "sha256-eikzjdOYNdJM9FM3O/HuCFDzf97Fm1nhbRedDyKZ1/s=";
+  };
+in
+pkgs.stdenvNoCC.mkDerivation {
+  inherit pname version src;
+
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  dontUnpack = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    cp "$src" "${pname}.AppImage"
+    chmod +x "${pname}.AppImage"
+    ./"${pname}.AppImage" --appimage-extract
+
+    mkdir -p "$out/opt"
+    cp -a AppDir "$out/opt/opengoal-launcher"
+    rm -f "$out/opt/opengoal-launcher/share/icons/hicolor/scalable/apps/byobu.svg"
+
+    makeWrapper "$out/opt/opengoal-launcher/AppRun" "$out/bin/${pname}"
+    install -Dm444 "AppDir/${pname}.desktop" \
+      "$out/share/applications/${pname}.desktop"
+    install -Dm444 "AppDir/${pname}.png" \
+      "$out/share/icons/hicolor/256x256/apps/${pname}.png"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = pkgs.nix-update-script { };
+
+  meta = with pkgs.lib; {
+    description = "Launcher for the OpenGOAL project";
+    homepage = "https://github.com/open-goal/launcher";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = pname;
+  };
+}
@@ -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	a4d6749411	Merge branch 'master' into import-overlays-from-config	2026-09-06 13:55:13 -05:00
wymiller	c59dc1252a	mod: updated fetcher and vendor hashes	2026-09-06 14:58:27 -04:00
wymiller	e1620950b6	add: make sable great again Publish packages to Attic / publish (push) Successful in 23m22s Details	2026-09-06 14:02:14 -04:00
wymiller	479ef575d8	Merge branch 'master' into import-overlays-from-config	2026-09-06 12:41:35 -05:00
gitea-actions[bot]	21037dae06	chore: update flake lock	2026-09-06 07:05:17 +00:00
wymiller	4f5ecae56b	Merge pull request '⚙️ Fix publish workflow' (#14 ) from publish-fix into master Publish packages to Attic / publish (push) Successful in 8m9s Details Reviewed-on: #14	2026-09-05 20:29:50 -05:00
wymiller	ff8dcd1587	chore: env variable fix	2026-09-05 20:28:25 -04:00
wymiller	a65b09f6cb	chore: fix publish workflow	2026-09-05 20:18:12 -04:00
wymiller	887845a8f7	add: diffnav, gh-dash, lazygit, k9s overrides these are all overlays that were part of my nix config before i created my nur. i am putting them here to reduce build time when building my nix config	2026-09-03 13:32:14 -04:00
wymiller	1b5df8dea8	Merge pull request '📦 Add `cliamp` package' (#12 ) from cliamp into master Publish packages to Attic / publish (push) Failing after 8m46s Details Reviewed-on: #12	2026-09-02 12:42:27 -05:00
wymiller	2fc67cffe3	Merge branch 'master' into cliamp	2026-09-02 12:42:18 -05:00
wymiller	c16695f5f4	mod: ci stuff	2026-09-02 13:42:59 -04:00
wymiller	2f16b8c56a	Merge pull request '📦 Add OpenGOAL package' (#11 ) from opengoal into master Publish packages to Attic / publish (push) Successful in 8m43s Details Reviewed-on: #11	2026-09-02 12:42:03 -05:00
wymiller	ecd0ec0c95	Merge branch 'opengoal' of ssh://scm.wyattjmiller.com:222/wymiller/nur into opengoal	2026-09-02 13:45:05 -04:00
wymiller	91c5fd7944	mod: ci stuff	2026-09-02 13:45:01 -04:00
wymiller	7dad6a62f0	add: cliamp build target	2026-09-02 13:41:37 -04:00
wymiller	c736d31570	Merge branch 'master' into opengoal	2026-09-02 12:21:48 -05:00
wymiller	563be1867c	Merge pull request '📦 Add `container` package' (#10 ) from container into master Publish packages to Attic / publish (push) Successful in 8m32s Details Reviewed-on: #10	2026-09-02 12:20:25 -05:00
wymiller	9b1238eb39	add: apple container build target	2026-09-02 13:21:30 -04:00
wymiller	b7c6087115	mod: add opengoal build target	2026-08-31 13:51:35 -04:00
gitea-actions[bot]	52e8bf19e0	chore: update flake lock	2026-08-30 19:14:39 +00:00
wymiller	af2ded56a4	Merge branch 'master' of ssh://scm.wyattjmiller.com:222/wymiller/nur Publish packages to Attic / publish (push) Canceled after 22s Details	2026-08-30 15:13:25 -04:00
wymiller	aa4d5e60bb	chore: run publish workflow after update flake workflow	2026-08-30 15:13:20 -04:00
gitea-actions[bot]	d9ad2edcb6	chore: update flake lock	2026-08-30 07:06:09 +00:00
wymiller	af5b631490	chore: modify license file Publish packages to Attic / publish (push) Successful in 7m20s Details	2026-08-26 22:19:45 -04:00
wymiller	cafc818f5d	Merge pull request '📦 Add atuin overlay' (#6 ) from overlay-atuin into master Publish packages to Attic / publish (push) Successful in 16m52s Details Reviewed-on: #6	2026-08-26 18:44:08 -05:00
wymiller	fab444b00e	chore: update flake	2026-08-26 19:47:21 -04:00
wymiller	b7c830d887	Merge remote-tracking branch 'origin' into overlay-atuin	2026-08-26 19:44:04 -04:00
wymiller	760ff1b1a4	chore: make sure all inputs are following nixpkgs Publish packages to Attic / publish (push) Successful in 7m4s Details	2026-08-26 19:36:40 -04:00
wymiller	cb05f0550b	Merge branch 'master' of ssh://scm.wyattjmiller.com:222/wymiller/nur Publish packages to Attic / publish (push) Successful in 9m46s Details	2026-08-26 19:12:35 -04:00
wymiller	d53fdf0d45	mod: adjusted sha to match like i should've done in the first place	2026-08-26 19:12:29 -04:00
wymiller	7d0154e227	Merge pull request '⬆️ `ani-cli-rs` upgrade' (#9 ) from ani-cli-rs-package into master Publish packages to Attic / publish (push) Failing after 6m1s Details Reviewed-on: #9	2026-08-26 18:05:27 -05:00
wymiller	fc6d702168	Merge branch 'master' into ani-cli-rs-package	2026-08-26 17:59:57 -05:00
wymiller	c18ae03bd0	add: added scheduled flake update Publish packages to Attic / publish (push) Successful in 7m24s Details once a week, every sunday at 3AM	2026-08-26 18:57:30 -04:00
wymiller	8a671235d9	mod: update ani-cli-rs to 0.9.4 from 0.9.3	2026-08-26 14:06:23 -04:00
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	0ffb8f5493	add: add hildibrand input, package	2026-08-09 15:38:24 -04:00
wymiller	d76f1d6453	add: added atuin overlay	2026-08-09 14:46:33 -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