Merge branch 'master' into cliamp-upgrade

mod: cliamp upgrade
Merge pull request '⬆️ sable upgrade' (#30 ) from sable-upgrade into master
2026-10-21 12:12:22 -05:00 · 2026-10-20 20:42:21 -04:00 · 2026-10-18 12:29:37 -05:00 · 2026-10-18 13:26:38 -04:00 · 2026-10-18 11:21:42 -05:00 · 2026-10-18 12:06:36 -04:00
16 changed files with 377 additions and 104 deletions
@@ -67,9 +67,14 @@ 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}.lazygitLatest" \
+            ".#packages.${system}.ghDashLatest" \
+            ".#packages.${system}.diffNavLatest" \
+            ".#packages.${system}.k9sLatest" \
+            ".#packages.${system}.sable-web" \
            ".#packages.${system}.musicpresence" \
            ".#packages.${system}.vintage-story" \
            ".#packages.${system}.swaytreesave" \
@@ -9,11 +9,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1787797120,
-        "narHash": "sha256-88Di5b78X0LI0BkGehewOIbA9wrnNf6PD1VTz+gv910=",
+        "lastModified": 1791702392,
+        "narHash": "sha256-8uWZP3UiJBtYzBzazI18WvlshKYHxPb+8aqm02OxL5M=",
        "ref": "refs/heads/master",
-        "rev": "707867341ac6f89193da112b42f05534016aa325",
-        "revCount": 21,
+        "rev": "ee2a27ad749d6d774e26c2be5de5f3a5ecd4a93f",
+        "revCount": 28,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
      },
@@ -42,14 +42,30 @@
        "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,
+        "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.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -70,6 +86,68 @@
        "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"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "go-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "go-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "git-hooks": "git-hooks",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792166485,
+        "narHash": "sha256-TL2RJ56FbBQNi6vsCXAn7QhZECh5DPbvzfiX6v+4r1A=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "5971ffb6c5de960d37f3b85c53cb5a30387cd05a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "type": "github"
+      }
+    },
    "hildibrand": {
      "inputs": {
        "flake-schemas": "flake-schemas_2",
@@ -79,11 +157,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1785717646,
-        "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
+        "lastModified": 1791702441,
+        "narHash": "sha256-qHf8tVIYu6OE1PKcthmpBgblg27u3bU7v4TVqy0B3jg=",
        "ref": "refs/heads/master",
-        "rev": "9588520925513ed0e47711a5798c6e9958143a0a",
-        "revCount": 5,
+        "rev": "2c2e99f6347e9be744a72f7df6043015989d6cd7",
+        "revCount": 17,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
      },
@@ -99,11 +177,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1787797243,
-        "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
+        "lastModified": 1792098797,
+        "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
+        "rev": "640725978b99076e18e069f6e7d2959124584f8f",
        "type": "github"
      },
      "original": {
@@ -114,11 +192,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1787962033,
-        "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=",
+        "lastModified": 1792030654,
+        "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb",
+        "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8",
        "type": "github"
      },
      "original": {
@@ -132,6 +210,7 @@
      "inputs": {
        "caitsith": "caitsith",
        "darwin": "darwin",
+        "go-overlay": "go-overlay",
        "hildibrand": "hildibrand",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs",
@@ -146,11 +225,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1771729765,
-        "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=",
+        "lastModified": 1791620365,
+        "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c",
+        "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
        "type": "github"
      },
      "original": {
@@ -167,11 +246,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1784438913,
-        "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
+        "lastModified": 1791620365,
+        "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
+        "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
        "type": "github"
      },
      "original": {
@@ -187,11 +266,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788077403,
-        "narHash": "sha256-c20YZQKzQ27qC6Wh729fWRTpI7oV4+7Ur4icKssD4Wc=",
+        "lastModified": 1792219666,
+        "narHash": "sha256-RMO08tKD+hFIL5ryWi85VY4aHE5oIpdV1h4kVFctOkw=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "89e26eeaafa88a2ede4778734acc794ff0299beb",
+        "rev": "a110337465cfb76e3806b81b9db3094c3e6e770a",
        "type": "github"
      },
      "original": {
@@ -199,6 +278,21 @@
        "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",
@@ -11,6 +11,10 @@
      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";
@@ -18,7 +22,7 @@
    caitsith.inputs.nixpkgs.follows = "nixpkgs";
  };

-  outputs = inputs@{ self, nixpkgs, home-manager, darwin, rust-overlay, ... }:
+  outputs = inputs@{ self, nixpkgs, home-manager, darwin, rust-overlay, go-overlay, ... }:
    let
      supportedSystems = [
        "x86_64-linux"
@@ -61,6 +65,7 @@

      overlays.default = nixpkgs.lib.composeManyExtensions [
        rust-overlay.overlays.default
+        go-overlay.overlays.default
        (import ./overlays)
      ];
      homeManagerModules = import ./modules/home-manager self;
@@ -1,15 +1,15 @@
-final: prev: {
-  cliampLatest = prev.cliamp.overrideAttrs (oldAttrs: rec {
-    version = "2.0.1";
+_: prev: {
+  cliampLatest = prev.cliamp.overrideAttrs (_: rec {
+    version = "2.3.0";

    src = prev.fetchFromGitHub {
      owner = "bjarneo";
      repo = "cliamp";
      tag = "v${version}";
-      sha256 = "sha256-r7MrrcVt+/f+iPozn9jaczJmpPv431wAoW8LvHKBtB8=";
+      sha256 = "sha256-+q3/AfxHtEYH/gzaiimn0gDx98vlytVsJFfYnq04U9Y=";
    };

-    vendorHash = "sha256-rtwUWbft5XGEbuBCn0OMCn4TS5Ul+UXJNIqNOzXfU+M=";
+    vendorHash = "sha256-cythuV9J/Iu+ibRVza8dQ6RHjYKa0hVllc2t6dh3hhs=";

    buildInputs = with prev; [
      libogg
@@ -1,10 +1,10 @@
-final: prev: {
-  containerLatest = prev.container.overrideAttrs (oldAttrs: rec {
-    version = "1.3.1";
+_: prev: {
+  containerLatest = prev.container.overrideAttrs (_: rec {
+    version = "1.4.1";

    src = prev.fetchurl {
      url = "https://github.com/apple/container/releases/download/${version}/container-${version}-installer-signed.pkg";
-      hash = "sha256-p8G515J9MIdfL2x70dDLBsLapspXzp6QpRROiY/fVKg=";
+      hash = "sha256-wNJxav77sZTJP65mLpyufMGGvLz3RoFmCOxnPdZIpqQ=";
    };
  });
 }
@@ -3,4 +3,8 @@ 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-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU=";
+    };
+
+    vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk=";
+    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,60 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  pnpm_10,
-  fetchPnpmDeps,
-  pnpmConfigHook,
-  nodejs_24,
-  fetchFromGitHub,
-}:
-buildNpmPackage (finalAttrs:
-let
-  pnpm = pnpm_10.override {
-    nodejs = nodejs_24;
-  };
-in {
-  pname = "sable-unwrapped";
-  version = "1.14.0";
-
-  src = fetchFromGitHub {
-    owner = "SableClient";
-    repo = "Sable";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-zoGKs0pm9m42JrTNAdU33LP139JlVz3RZnkTyY0aiqY=";
-  };
-
-  nodejs = nodejs_24;
-
-  nativeBuildInputs = [ pnpm ];
-  npmConfigHook = pnpmConfigHook;
-
-  npmDeps = finalAttrs.pnpmDeps;
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-2GwUz0jsuVKQZyeidM0F4rDzijm9AFcAxN7x/m/b3Is=";
-  };
-
-  npmInstallFlags = [
-    "--ignore-scripts"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r dist $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "An almost stable Matrix client";
-    homepage = "https://app.sable.moe/";
-    maintainers = with lib.maintainers; [
-      wymillerlinux
-    ];
-    license = lib.licenses.agpl3Only;
-    platforms = lib.platforms.all;
-  };
-})
@@ -0,0 +1,31 @@
+diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
+index acdeab967..d64f32c53 100644
+--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
+@@ -86,8 +86,6 @@ function ClientRootLoading() {
+   const activeSessionId = useAtomValue(activeSessionIdAtom);
+   const setSessions = useSetAtom(sessionsAtom);
+ 
+-  const [showEasterEggs] = useSetting(settingsAtom, 'showEasterEggs');
+-  const [animalKind] = useSetting(settingsAtom, 'animalKind');
+ 
+   const activeSession: Session | undefined =
+     sessions.find((session) => session.userId === activeSessionId) ?? sessions[0];
+@@ -108,14 +106,15 @@ function ClientRootLoading() {
+     window.location.reload();
+   };
+ 
+-  const loadingAnimal = showEasterEggs && animalKind ? animalKind : 'cats';
+  const races = ["Petting Miqo’te", "Hugging Roegadyn", "Punting Lalafell", "Climbing Elezen", "Booping Viera"];
+  const result = races[Math.floor(Math.random() * races.length)];
+ 
+   return (
+     <SplashScreen>
+       <Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="400">
+         <Spinner variant="Secondary" size="600" />
+ 
+-        <Text>{`Petting ${loadingAnimal}`}</Text>
+        <Text>{`${result}`}</Text>
+ 
+         {activeSession && (
+           <Text
@@ -0,0 +1,93 @@
+{
+  lib,
+  buildNpmPackage,
+  pnpm_10_latest,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  nodejs_24,
+  fetchFromGitHub,
+}:
+buildNpmPackage (
+  finalAttrs:
+  let
+    pnpm = pnpm_10_latest.override {
+      nodejs-slim = nodejs_24;
+    };
+    matrixrtcSrc = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "matrix-rtc";
+      rev = "519fe6b863cfac78700f4e2b1748649103bb8a8d";
+      hash = "sha256-n5f7529RdRxY8/a43Xkgrhg4yRz5aNgfoZqWrB7kvak=";
+    };
+    livekitMobileSrc = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "tauri-plugin-livekit-mobile";
+      rev = "c6f0d02ab3da1174535bc1dc8e598a2e6873f977";
+      hash = "sha256-ZPx6Ic+Gkvzg9LXYP9BaQALzOrvLCcQHOms8U3VfnU0=";
+    };
+  in
+  {
+    pname = "sable-unwrapped";
+    version = "1.22.11";
+
+    src = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "Sable";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-RwYKaJ4k2lqXjVSPN/o0Qw8GIGnXfb6acCpva36qQoM=";
+    };
+
+    nodejs = nodejs_24;
+
+    nativeBuildInputs = [ pnpm ];
+    npmConfigHook = pnpmConfigHook;
+
+    npmDeps = finalAttrs.pnpmDeps;
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      inherit pnpm;
+      fetcherVersion = 3;
+      hash = "sha256-sI0tE73l+yKS8186tUHrNAJmGD26XEe7828ohvvc+1o=";
+    };
+
+    npmInstallFlags = [
+      "--ignore-scripts"
+    ];
+
+    preBuild = ''
+      cp -r --no-preserve=mode ${matrixrtcSrc}/. node_modules/@sableclient/matrixrtc/
+      pnpm exec tsc \
+        -p node_modules/@sableclient/matrixrtc/tsconfig.build.json \
+        --rootDir node_modules/@sableclient/matrixrtc/src
+      cp -r --no-preserve=mode ${livekitMobileSrc}/. node_modules/@sableclient/tauri-plugin-livekit-mobile/
+      pnpm exec tsc \
+        -p node_modules/@sableclient/tauri-plugin-livekit-mobile/tsconfig.json \
+        --noEmit false \
+        --declaration \
+        --rootDir node_modules/@sableclient/tauri-plugin-livekit-mobile/guest-js \
+        --outDir node_modules/@sableclient/tauri-plugin-livekit-mobile/dist-js
+    '';
+
+    patches = [
+      ./0001-races-patch.patch
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      cp -r dist $out
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "An almost stable Matrix client";
+      homepage = "https://app.sable.moe/";
+      maintainers = with lib.maintainers; [
+        (wymillerlinux or) "wymillerlinux"
+      ];
+      license = lib.licenses.agpl3Only;
+      platforms = lib.platforms.all;
+    };
+  }
+)
@@ -8,13 +8,17 @@
  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 {};
+  sable-web = pkgs.callPackage ./common/sable/sable.nix { };
  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
  musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
  vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };
@@ -1,11 +1,11 @@
 { pkgs }:
 let
  pname = "archon";
-  version = "9.5.8";
+  version = "9.6.94";

  src = pkgs.fetchurl {
    url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v${version}/${pname}-v${version}.AppImage";
-    hash = "sha256-tEMfDK0BCBvNWFlA78FKWcOvU1wzIorBM4ZmLQ+6hzU=";
+    hash = "sha256-l38nmbxLDdi/yMtoamG+hPqT22y32CfvdGtFitqIiZk=";
  };

  appimageContents = pkgs.appimageTools.extract {
@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;

 stdenv.mkDerivation (finalAttrs: {
  pname = "vintagestory";
-  version = "1.22.6";
+  version = "1.22.7";

  src = fetchurl {
    url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
-    hash = "sha256-xJPyaYklEq2BeUX9+7hNPI6WC6ibcQDS+sKeqKYSh3A=";
+    hash = "sha256-SDzGgnpQwIxcQczQJixvEiPBBOVMpxNcRmBSeNifXeE=";
  };

  __structuredAttrs = true;
Author	SHA1	Message	Date
wymiller	3d85ca85da	Merge branch 'master' into cliamp-upgrade	2026-10-21 12:12:22 -05:00
wymiller	95843630d8	mod: cliamp upgrade	2026-10-20 20:42:21 -04:00
wymiller	2debafc632	Merge pull request '⬆️ `sable` upgrade' (#30 ) from sable-upgrade into master Publish packages to Attic / publish (push) Successful in 33m46s Details Reviewed-on: #30	2026-10-18 12:29:37 -05:00
wymiller	9cb94b1839	mod: upgrade sable, upgrade pnpm	2026-10-18 13:26:38 -04:00
wymiller	eb088e9ff0	Merge pull request '⬆️ `vintagestory` upgrade' (#29 ) from vintagestory-upgrade into master Publish packages to Attic / publish (push) Failing after 2m43s Details Reviewed-on: #29	2026-10-18 11:21:42 -05:00
wymiller	e6e653e1f1	mod: update vintage story	2026-10-18 12:06:36 -04:00
gitea-actions[bot]	e51b36ce21	chore: update flake lock	2026-10-18 07:02:04 +00:00
gitea-actions[bot]	90ca3862cc	chore: update flake lock	2026-10-11 07:08:55 +00:00
gitea-actions[bot]	55e8c40fbc	chore: update flake lock	2026-10-04 07:06:01 +00:00
wymiller	095f3786fd	Merge pull request '⬆️ `archon` upgrade' (#26 ) from archon-upgrade into master Publish packages to Attic / publish (push) Failing after 29m46s Details Reviewed-on: #26	2026-09-28 13:02:06 -05:00
wymiller	7053471c36	mod: update hash	2026-09-28 14:05:49 -04:00
wymiller	cc82aa4a6a	mod: archon version upgrade	2026-09-27 22:14:13 -04:00
gitea-actions[bot]	b1f009b0b5	chore: update flake lock	2026-09-27 07:05:43 +00:00
wymiller	7f27a8fde1	mod: fix sable patch Publish packages to Attic / publish (push) Successful in 11m33s Details	2026-09-23 18:44:51 -04:00
wymiller	9c8d1f8612	Merge pull request '⬆️ `sable-web` upgrade' (#24 ) from sable-upgrade into master Publish packages to Attic / publish (push) Successful in 22m31s Details Reviewed-on: #24	2026-09-20 18:33:37 -05:00
wymiller	54f60733fb	mod: upgrade sable to latest release additionally added patch	2026-09-20 19:34:58 -04:00
gitea-actions[bot]	39c33599b1	chore: update flake lock	2026-09-20 07:06:19 +00:00
wymiller	72685361c6	Merge pull request '⬆️ `sable-web` upgrade' (#22 ) from sable-upgrade into master Publish packages to Attic / publish (push) Successful in 8m30s Details Reviewed-on: #22	2026-09-19 18:16:42 -05:00
wymiller	e19f331808	mod: upgraded sable-web to 1.22.3	2026-09-19 12:11:18 -04:00
gitea-actions[bot]	024df8e385	chore: update flake lock	2026-09-13 07:05:27 +00:00
wymiller	ed1d454163	Merge pull request '⬆️ `container` overlay upgrade' (#18 ) from container-overlay-upgrade into master Publish packages to Attic / publish (push) Successful in 8m35s Details Reviewed-on: #18	2026-09-12 19:58:26 -05:00
wymiller	62b17f88e6	Merge branch 'master' into container-overlay-upgrade	2026-09-11 09:50:37 -05:00
wymiller	43ff79c2ff	Merge pull request '⬆️ `cliamp` overlay upgrade' (#19 ) from cliamp-overlay-upgrade into master Publish packages to Attic / publish (push) Successful in 12m51s Details Reviewed-on: #19	2026-09-11 09:50:28 -05:00
wymiller	b13f942c8b	Merge branch 'master' into cliamp-overlay-upgrade	2026-09-11 09:50:16 -05:00
wymiller	cf9821e0fc	mod: updated sha256/hash attrs	2026-09-11 10:53:49 -04:00
wymiller	4e89501bee	mod: updated sha256 attr	2026-09-11 10:46:20 -04:00
wymiller	d144133ed8	mod: container overlay upgrade	2026-09-11 10:36:23 -04:00
wymiller	72e244f599	mod: cliamp overlay upgrade	2026-09-11 10:35:04 -04:00
wymiller	49a7431945	Merge pull request '⬆️ Sable upgrade' (#15 ) from sable-upgrade into master Publish packages to Attic / publish (push) Successful in 8m27s Details Reviewed-on: #15	2026-09-07 15:24:04 -05:00
wymiller	99fccdc256	mod: upgrade sable-web from 1.14 to 1.21	2026-09-06 16:15:49 -04:00
wymiller	47f9558533	mod: fix gh-dash overlay Publish packages to Attic / publish (push) Successful in 26m58s Details	2026-09-06 15:20:04 -04:00
wymiller	ac949bcb77	mod: update publish workflow Publish packages to Attic / publish (push) Failing after 8m50s Details	2026-09-06 15:09:03 -04:00
wymiller	1500f50bd5	Merge pull request '📦 Add `lazygit`, `diffnav`, `gh-dash`, and `k9s` overlays' (#13 ) from import-overlays-from-config into master Publish packages to Attic / publish (push) Successful in 8m12s Details Reviewed-on: #13	2026-09-06 13:55:30 -05:00
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