From 5ab19d093a1af6e39f79d3793b438111dae29d8e Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 21 Oct 2025 08:33:25 -0400 Subject: [PATCH 1/4] testing --- flake.nix | 2 ++ home/lazygit.nix | 13 ++++++++++++- modules/common/default.nix | 7 ++----- modules/common/overlays.nix | 5 +++++ 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 modules/common/overlays.nix diff --git a/flake.nix b/flake.nix index 9b6f461..909e0e7 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,9 @@ extraSpecialArgs = { inherit userName userEmail ghostty; }; + in { + meta = import ./meta; # Primary laptop - MacBook Pro (2023, M3) diff --git a/home/lazygit.nix b/home/lazygit.nix index 35ea71c..6ce2a73 100644 --- a/home/lazygit.nix +++ b/home/lazygit.nix @@ -1,6 +1,17 @@ -{...}: { +{ pkgs, ... }: let +in { programs.lazygit = { enable = true; + package = pkgs.lazygit.overrideAttrs (oldAttrs: rec { + version = "0.55.1"; + + src = pkgs.fetchFromGitHub { + owner = "jesseduffield"; + repo = "lazygit"; + rev = "v${version}"; + hash = pkgs.lib.fakeHash; + }; + }); settings = { gui.theme = { diff --git a/modules/common/default.nix b/modules/common/default.nix index 27bcede..94037f9 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,12 +1,9 @@ -{ - pkgs, - lib, - ... -}: { +{ ... }: { imports = [ ./core.nix ./environment.nix ./fonts.nix + # ./overlays.nix ./users.nix ]; } diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix new file mode 100644 index 0000000..c075c0f --- /dev/null +++ b/modules/common/overlays.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: let + +in { + +} From 5a59f98ebccac2d604179a693d58fd7476df9d80 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 22 Oct 2025 08:19:52 -0400 Subject: [PATCH 2/4] working overlay to get latest version of lazygit --- flake.nix | 14 +++++++++++++- home/default.nix | 1 + home/lazygit.nix | 14 ++------------ home/packages/common.nix | 2 -- modules/common/overlays.nix | 26 +++++++++++++++++++++++--- 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 909e0e7..266aebb 100644 --- a/flake.nix +++ b/flake.nix @@ -29,10 +29,18 @@ inherit userName userEmail ghostty; }; + myOverlays = { ... }: { + nixpkgs.overlays = [ + self.common.overlays + ]; + }; in { - meta = import ./meta; + common = { + overlays = import ./modules/common/overlays.nix; + }; + # Primary laptop - MacBook Pro (2023, M3) darwinConfigurations."sephiroth" = darwin.lib.darwinSystem { system = "aarch64-darwin"; @@ -42,6 +50,7 @@ role = "devel"; }; modules = [ + myOverlays ./modules/common ./modules/machine/sephiroth @@ -64,6 +73,7 @@ role = "devel"; }; modules = [ + myOverlays nix-flatpak.nixosModules.nix-flatpak ./modules/common ./modules/machine/cloud @@ -89,6 +99,7 @@ role = "server"; }; modules = [ + myOverlays ./modules/common ./modules/machine/valefor @@ -113,6 +124,7 @@ role = "server"; }; # modules = [ + # myOverlays # nix-flatpak.nixosModules.nix-flatpak # nix-ld.nixosModules.nix-ld # ./modules/nixos/hardware-configuration.nix diff --git a/home/default.nix b/home/default.nix index c463789..19219a2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -27,6 +27,7 @@ in { ./browser.nix ./zellij.nix ./bat.nix + ./lazygit.nix ]; # Home Manager needs a bit of information about you and the diff --git a/home/lazygit.nix b/home/lazygit.nix index 6ce2a73..2e7691e 100644 --- a/home/lazygit.nix +++ b/home/lazygit.nix @@ -1,17 +1,7 @@ -{ pkgs, ... }: let -in { +{ pkgs, ... }: { programs.lazygit = { enable = true; - package = pkgs.lazygit.overrideAttrs (oldAttrs: rec { - version = "0.55.1"; - - src = pkgs.fetchFromGitHub { - owner = "jesseduffield"; - repo = "lazygit"; - rev = "v${version}"; - hash = pkgs.lib.fakeHash; - }; - }); + package = pkgs.lazygitLatest; settings = { gui.theme = { diff --git a/home/packages/common.nix b/home/packages/common.nix index 03034f2..b43311a 100644 --- a/home/packages/common.nix +++ b/home/packages/common.nix @@ -1,5 +1,4 @@ { - lib, pkgs, ... }: { @@ -14,7 +13,6 @@ # utils tmux - lazygit bottom ripgrep jq diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index c075c0f..855d91f 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -1,5 +1,25 @@ -{ pkgs, ... }: let - -in { +_: prev: { + lazygitLatest = prev.lazygit.overrideAttrs (_: rec { + version = "0.55.1"; + src = prev.fetchFromGitHub { + owner = "jesseduffield"; + repo = "lazygit"; + rev = "v${version}"; + hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk="; + }; + }); + # atuin = prev.atuin.overrideAttrs (oldAttrs: rec { + # version = "18.10.0"; + # + # src = prev.fetchFromGitHub { + # owner = "atuinsh"; + # repo = "atuin"; + # rev = "v${version}"; + # hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M="; + # }; + # + # # cargoDeps = null; + # cargoHash = prev.lib.fakeSha256; + # }); } From ecf728bc112c30d0b12a0754fb25386b3b715942 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 22 Oct 2025 19:45:10 -0400 Subject: [PATCH 3/4] working rust package override plus flake update :P --- flake.lock | 49 +++++++++++++++++++++++++++++++------ flake.nix | 7 ++++++ home/atuin.nix | 3 ++- modules/common/core.nix | 3 +++ modules/common/overlays.nix | 47 ++++++++++++++++++++++++----------- 5 files changed, 87 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 2d8040e..00a5eb6 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1760808459, - "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=", + "lastModified": 1761172581, + "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16", + "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760580664, - "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { @@ -156,13 +156,48 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "darwin": "darwin", "ghostty": "ghostty", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1761100675, + "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index 266aebb..453d977 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "github:ghostty-org/ghostty"; + rust-overlay.url = "github:oxalica/rust-overlay"; }; outputs = inputs @ { @@ -21,6 +22,7 @@ darwin, home-manager, ghostty, + rust-overlay, ... }: let userName = "wyatt"; @@ -31,6 +33,7 @@ myOverlays = { ... }: { nixpkgs.overlays = [ + rust-overlay.overlays.default self.common.overlays ]; }; @@ -59,6 +62,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = extraSpecialArgs; + home-manager.backupFileExtension = "bak"; home-manager.users.${userName} = import ./home; } ]; @@ -83,6 +87,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = extraSpecialArgs; + home-manager.backupFileExtension = "bak"; home-manager.users.${userName}.imports = [ ./home ]; @@ -108,6 +113,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = extraSpecialArgs; + home-manager.backupFileExtension = "bak"; home-manager.users.${userName}.imports = [ ./home ]; @@ -137,6 +143,7 @@ # home-manager.useGlobalPkgs = true; # home-manager.useUserPackages = true; # home-manager.extraSpecialArgs = extraSpecialArgs; + # home-manager.backupFileExtension = "bak"; # home-manager.users.${userName}.imports = [ # ./home # ]; diff --git a/home/atuin.nix b/home/atuin.nix index 56b0dc2..5d212cb 100644 --- a/home/atuin.nix +++ b/home/atuin.nix @@ -1,6 +1,7 @@ -{...}: { +{ pkgs, ...}: { programs.atuin = { enable = true; enableFishIntegration = true; + package = pkgs.atuinLatest; }; } diff --git a/modules/common/core.nix b/modules/common/core.nix index 1bd62c9..d330dce 100644 --- a/modules/common/core.nix +++ b/modules/common/core.nix @@ -8,6 +8,9 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "mbedtls-2.28.10" + ]; nix.package = pkgs.nix; diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index 855d91f..246bac6 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -1,4 +1,10 @@ -_: prev: { +final: prev: let + rust_1_90_0 = prev.rust-bin.stable."1.90.0".default; + myRustPlatform = prev.makeRustPlatform { + cargo = rust_1_90_0; + rustc = rust_1_90_0; + }; +in { lazygitLatest = prev.lazygit.overrideAttrs (_: rec { version = "0.55.1"; src = prev.fetchFromGitHub { @@ -9,17 +15,30 @@ _: prev: { }; }); - # atuin = prev.atuin.overrideAttrs (oldAttrs: rec { - # version = "18.10.0"; - # - # src = prev.fetchFromGitHub { - # owner = "atuinsh"; - # repo = "atuin"; - # rev = "v${version}"; - # hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M="; - # }; - # - # # cargoDeps = null; - # cargoHash = prev.lib.fakeSha256; - # }); + atuinLatest = (prev.atuin.override { + rustPlatform = myRustPlatform; + }).overrideAttrs (oldAttrs: rec { + version = "18.10.0"; + + src = prev.fetchFromGitHub { + owner = "atuinsh"; + repo = "atuin"; + rev = "v${version}"; + hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M="; + }; + + cargoDeps = myRustPlatform.fetchCargoVendor { + # name = "atuin-${version}-vendor.tar.gz"; + inherit src; + hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M="; + }; + + 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" + ''; + }); } From 0572cacd2859782627e5d54efa5e1f8510633eb3 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 23 Oct 2025 10:36:27 -0400 Subject: [PATCH 4/4] added ldflags to lazygit override --- modules/common/overlays.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index 246bac6..75b0748 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -13,6 +13,12 @@ in { rev = "v${version}"; hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk="; }; + vendorHash = null; + subPackages = [ "." ]; + ldflags = [ + "-X main.version=${version}" + "-X main.buildSource=nix" + ]; }); atuinLatest = (prev.atuin.override {