From d129635a2e68a07531fd0d54af2bdafce380a289 Mon Sep 17 00:00:00 2001 From: 0xrsydn Date: Tue, 30 Dec 2025 11:47:50 +0700 Subject: [PATCH] chore: nix fmt --- flake.lock | 61 ++++++++++++++++++++++++++++++++++-------------------- flake.nix | 12 ++++++++++- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 73ccf82..a63edf0 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1766038392, - "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", + "lastModified": 1766784396, + "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", + "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1766101315, - "narHash": "sha256-FZLl2/ufs2l4XBNO5gelF9g0XmrAvyTiiHJ7GRTB0aI=", + "lastModified": 1766784567, + "narHash": "sha256-fpRgcNFEGRidNTDk3CVsvKxWIgB9Ph5EM+q5DGe6CI8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "fa0a982ff26ac851b6cb5d31717ad3deb037be9c", + "rev": "c00d7fc5c4dc28bfa14935a84c70591d7103c284", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1766850854, + "narHash": "sha256-asWZx7X5FRrna8ntfE0+vTBUIPLth8R8bckbOpfT3Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "2d36a6de2fee5cd232b0a28137d95541c21eb7f0", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766544540, - "narHash": "sha256-F3uv6W8C/bYlUy1DDUiP8CxsKHvKwFupuQ2Uimd4ugI=", + "lastModified": 1766844914, + "narHash": "sha256-SLTnaGUs8vvz82tWmlHECoH2diDdLin5AEv59XarZ1c=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "81bd9845d03effdfc1eea3966b1b7e600f8f702d", + "rev": "44846df99623b7be6118c3e12f1447d1c9e0490f", "type": "github" }, "original": { @@ -358,13 +358,29 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1766471942, - "narHash": "sha256-Wv+xrUNXgtxAXAMZE3EDzzeRgN1MEw+PnKr8zDozeLU=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc52a405c6e85462364651a8f11e28ae8065c91", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1766747458, + "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce", "type": "github" }, "original": { @@ -392,11 +408,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -415,6 +431,7 @@ "llm-agents": "llm-agents", "llm-agents-pinned": "llm-agents-pinned", "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "try": "try" } @@ -447,11 +464,11 @@ ] }, "locked": { - "lastModified": 1765836173, - "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", + "lastModified": 1766289575, + "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", + "rev": "9836912e37aef546029e48c8749834735a6b9dad", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 011609f..e411cc7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # Stable nixpkgs for pinning packages with bugs in unstable (e.g., git 2.51.x) + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; @@ -40,7 +42,15 @@ forEachSystem = f: genAttrs systems (system: f system); - overlaysList = [ ghostty.overlays.default chaotic.overlays.default ]; + # Overlay to pin git to stable version (avoids 2.51.x FamilyDisplayName warning on macOS) + gitOverlay = final: prev: { + git = (import inputs.nixpkgs-stable { + system = prev.stdenv.hostPlatform.system; + }).git; + }; + + overlaysList = + [ ghostty.overlays.default chaotic.overlays.default gitOverlay ]; mkPkgs = system: import nixpkgs {