Merge pull request '⬆️ Sable upgrade' (#15 ) from sable-upgrade into master

Reviewed-on: #15
mod: upgrade sable-web from 1.14 to 1.21
2026-09-07 15:24:04 -05:00 · 2026-09-06 16:15:49 -04:00 · 2026-09-06 15:20:04 -04:00 · 2026-09-06 15:09:03 -04:00 · 2026-09-06 13:55:30 -05:00 · 2026-09-06 13:55:13 -05:00
10 changed files with 325 additions and 66 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": 1788133146,
+        "narHash": "sha256-rjxs1D9duSUWf/lnJV6JZXqdpTEbJ1ntX1hZyYHOuK4=",
        "ref": "refs/heads/master",
-        "rev": "707867341ac6f89193da112b42f05534016aa325",
-        "revCount": 21,
+        "rev": "427757654f013e316b3e267dd345c3ab780da7b6",
+        "revCount": 22,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
      },
@@ -42,6 +42,22 @@
        "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,
@@ -70,6 +86,91 @@
        "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",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "go-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "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",
@@ -79,11 +180,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1785717646,
-        "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
+        "lastModified": 1788130254,
+        "narHash": "sha256-LR+73+2a51LOUKVTkEsP/XMVSZXm2P4hlgb7/KxdQ30=",
        "ref": "refs/heads/master",
-        "rev": "9588520925513ed0e47711a5798c6e9958143a0a",
-        "revCount": 5,
+        "rev": "f2049db9c29bf3ab0beff7cf0a990735d5571446",
+        "revCount": 6,
        "type": "git",
        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
      },
@@ -99,11 +200,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1787797243,
-        "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
+        "lastModified": 1788651960,
+        "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
+        "rev": "2c0350c759688177331b8f5242311fae8877bdb3",
        "type": "github"
      },
      "original": {
@@ -114,11 +215,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1787962033,
-        "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=",
+        "lastModified": 1788584326,
+        "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb",
+        "rev": "6713828a351efa628b025a1adf7f43cbf8597513",
        "type": "github"
      },
      "original": {
@@ -132,6 +233,7 @@
      "inputs": {
        "caitsith": "caitsith",
        "darwin": "darwin",
+        "go-overlay": "go-overlay",
        "hildibrand": "hildibrand",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs",
@@ -187,11 +289,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788077403,
-        "narHash": "sha256-c20YZQKzQ27qC6Wh729fWRTpI7oV4+7Ur4icKssD4Wc=",
+        "lastModified": 1788678114,
+        "narHash": "sha256-pcqbpV4ZI79al6KAlr+WJjaEo/PYfgctRlG43D5BSJM=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "89e26eeaafa88a2ede4778734acc794ff0299beb",
+        "rev": "4748ec2f5ed4a881474ed4c98aa71a5308cdac8d",
        "type": "github"
      },
      "original": {
@@ -199,6 +301,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;
@@ -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"
+    ];
+  });
+}
@@ -7,20 +7,34 @@
  nodejs_24,
  fetchFromGitHub,
 }:
-buildNpmPackage (finalAttrs:
-let
+buildNpmPackage (
+  finalAttrs:
+  let
    pnpm = pnpm_10.override {
      nodejs = nodejs_24;
    };
-in {
+    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.14.0";
+    version = "1.21.0";

    src = fetchFromGitHub {
      owner = "SableClient";
      repo = "Sable";
      tag = "v${finalAttrs.version}";
-    hash = "sha256-zoGKs0pm9m42JrTNAdU33LP139JlVz3RZnkTyY0aiqY=";
+      hash = "sha256-vYoKNflV4vdJpgYVxYCxAQhvqDh1Qf+7qgIFHxriTTU=";
    };

    nodejs = nodejs_24;
@@ -33,13 +47,25 @@ in {
      inherit (finalAttrs) pname version src;
      inherit pnpm;
      fetcherVersion = 3;
-    hash = "sha256-2GwUz0jsuVKQZyeidM0F4rDzijm9AFcAxN7x/m/b3Is=";
+      hash = "sha256-tzIU/5DQ4SpLABKOt6/Z2aD2d6nVt+MJvY7vHHnO4No=";
    };

    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
+      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
+    '';
+
    installPhase = ''
      runHook preInstall

@@ -57,4 +83,5 @@ in {
      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.nix { };
  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
  musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
  vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };
Author	SHA1	Message	Date
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