From 887845a8f79e2fbb968b5aab65ff9a15732a3dd2 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 3 Sep 2026 13:32:14 -0400 Subject: [PATCH 1/2] 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 --- flake.lock | 117 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 7 ++- overlays/default.nix | 4 ++ overlays/diffnav.nix | 25 +++++++++ overlays/gh-dash.nix | 36 +++++++++++++ overlays/k9s.nix | 16 ++++++ overlays/lazygit.nix | 18 +++++++ pkgs/default.nix | 4 ++ 8 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 overlays/diffnav.nix create mode 100644 overlays/gh-dash.nix create mode 100644 overlays/k9s.nix create mode 100644 overlays/lazygit.nix diff --git a/flake.lock b/flake.lock index 6e6052f..91eaf72 100644 --- a/flake.lock +++ b/flake.lock @@ -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", @@ -132,6 +233,7 @@ "inputs": { "caitsith": "caitsith", "darwin": "darwin", + "go-overlay": "go-overlay", "hildibrand": "hildibrand", "home-manager": "home-manager", "nixpkgs": "nixpkgs", @@ -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", diff --git a/flake.nix b/flake.nix index c3234a0..03e1cfc 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/overlays/default.nix b/overlays/default.nix index c033d13..588e535 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -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 diff --git a/overlays/diffnav.nix b/overlays/diffnav.nix new file mode 100644 index 0000000..d423241 --- /dev/null +++ b/overlays/diffnav.nix @@ -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-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE="; + }; + + vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ="; + + ldflags = [ + "-s" + "-w" + ]; + }); +} \ No newline at end of file diff --git a/overlays/gh-dash.nix b/overlays/gh-dash.nix new file mode 100644 index 0000000..5ad5bbf --- /dev/null +++ b/overlays/gh-dash.nix @@ -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-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU="; + }; + + vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4="; + 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; }; + }; + }; + }); +} \ No newline at end of file diff --git a/overlays/k9s.nix b/overlays/k9s.nix new file mode 100644 index 0000000..ffb13ec --- /dev/null +++ b/overlays/k9s.nix @@ -0,0 +1,16 @@ +final: prev: { + k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec { + version = "0.51.0"; + src = prev.fetchFromGitHub { + owner = "derailed"; + repo = "k9s"; + rev = "v${version}"; + hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r"; + }; + + ldflags = [ + "-X github.com/derailed/k9s/version.Version=${version}" + "-X github.com/derailed/k9s/version.BuildSource=nix" + ]; + }); +} \ No newline at end of file diff --git a/overlays/lazygit.nix b/overlays/lazygit.nix new file mode 100644 index 0000000..c6293d2 --- /dev/null +++ b/overlays/lazygit.nix @@ -0,0 +1,18 @@ +final: prev: { + lazygitLatest = prev.lazygit.overrideAttrs (_: rec { + version = "0.64.1"; + src = prev.fetchFromGitHub { + owner = "jesseduffield"; + repo = "lazygit"; + rev = "v${version}"; + hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ="; + }; + + vendorHash = null; + subPackages = [ "." ]; + ldflags = [ + "-X main.version=${version}" + "-X main.buildSource=nix" + ]; + }); +} \ No newline at end of file diff --git a/pkgs/default.nix b/pkgs/default.nix index f396718..7dd1e0c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,6 +8,10 @@ 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; -- 2.54.0 From c59dc1252a9b88c838d75b7d40beb5c8bca54141 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 6 Sep 2026 14:58:27 -0400 Subject: [PATCH 2/2] mod: updated fetcher and vendor hashes --- overlays/diffnav.nix | 6 +++--- overlays/gh-dash.nix | 6 +++--- overlays/k9s.nix | 6 ++++-- overlays/lazygit.nix | 6 +++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/overlays/diffnav.nix b/overlays/diffnav.nix index d423241..3152c20 100644 --- a/overlays/diffnav.nix +++ b/overlays/diffnav.nix @@ -12,14 +12,14 @@ in { owner = "dlvhdr"; repo = "diffnav"; rev = "v${version}"; - hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE="; + hash = "sha256-DrEbo9YYg4FCXQXuIkbPxO5Z3ZOPZJYeGoLoP/vT0Y0="; }; - vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ="; + vendorHash = "sha256-2OzHyBPsylQVXhPlqk2owEhiibFi3H1UENvGGDdzGss"; ldflags = [ "-s" "-w" ]; }); -} \ No newline at end of file +} diff --git a/overlays/gh-dash.nix b/overlays/gh-dash.nix index 5ad5bbf..d14d3f8 100644 --- a/overlays/gh-dash.nix +++ b/overlays/gh-dash.nix @@ -12,10 +12,10 @@ in { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU="; + hash = "sha256-FUb4zrGT0L7S1O5EcOCop4n0zlx1ODsANzBcEl9bvOU="; }; - vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4="; + vendorHash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU="; doCheck = false; checkFlags = [ "-skip=TestFullOutput" @@ -33,4 +33,4 @@ in { }; }; }); -} \ No newline at end of file +} diff --git a/overlays/k9s.nix b/overlays/k9s.nix index ffb13ec..8db1a09 100644 --- a/overlays/k9s.nix +++ b/overlays/k9s.nix @@ -5,12 +5,14 @@ final: prev: { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r"; + 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" ]; }); -} \ No newline at end of file +} diff --git a/overlays/lazygit.nix b/overlays/lazygit.nix index c6293d2..eea5b5b 100644 --- a/overlays/lazygit.nix +++ b/overlays/lazygit.nix @@ -1,11 +1,11 @@ final: prev: { lazygitLatest = prev.lazygit.overrideAttrs (_: rec { - version = "0.64.1"; + version = "0.65.0"; src = prev.fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; rev = "v${version}"; - hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ="; + hash = "sha256-W/Z/BnA5L8tXYrKn3bnekNnx7bEaaJRoHSGAeygcK0E="; }; vendorHash = null; @@ -15,4 +15,4 @@ final: prev: { "-X main.buildSource=nix" ]; }); -} \ No newline at end of file +} -- 2.54.0