From 3671cc754dad1680c6f77f071f282a2d5855a65f Mon Sep 17 00:00:00 2001 From: 0xrsydn Date: Tue, 21 Oct 2025 10:45:59 +0700 Subject: [PATCH] fix: nushell path --- flake.lock | 232 ++++----------------------- modules/home/rsydn/shell/nushell.nix | 14 +- 2 files changed, 45 insertions(+), 201 deletions(-) diff --git a/flake.lock b/flake.lock index cdae2be..7c3eb0a 100644 --- a/flake.lock +++ b/flake.lock @@ -22,21 +22,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1753316655, - "narHash": "sha256-tzWa2kmTEN69OEMhxFy+J2oWSvZP5QhEgXp3TROOzl0=", - "owner": "ipetkov", - "repo": "crane", - "rev": "f35a3372d070c9e9ccb63ba7ce347f0634ddf3d2", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -44,11 +29,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1760338583, + "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", "type": "github" }, "original": { @@ -57,30 +42,6 @@ "type": "github" } }, - "fff": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nvim-bundle", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1758042756, - "narHash": "sha256-mCeEse1rY1T04TE6OqeOGP4Mlvk1aHc1N2q1njc93fI=", - "owner": "dmtrKovalenko", - "repo": "fff.nvim", - "rev": "3a803c40edf24dcb6b51ef40aeb4210d4c7a0dd3", - "type": "github" - }, - "original": { - "owner": "dmtrKovalenko", - "repo": "fff.nvim", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -98,22 +59,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -151,42 +96,6 @@ "inputs": { "systems": "systems_3" }, - "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" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -212,11 +121,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1759721782, - "narHash": "sha256-oEe9vZE35nqCRLkQLsv83hjqz3c4d5knRa/OS5q/If0=", + "lastModified": 1760308234, + "narHash": "sha256-TEH5/NSnMb3TF8gN+E6og21oHJ1PnYTQawv7oYgCUxU=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "86421c9e091df5972da3f374df2276e51022e7b9", + "rev": "97a5a59cc3edf86cb939ca563b3bb43afe43a79a", "type": "github" }, "original": { @@ -232,11 +141,11 @@ ] }, "locked": { - "lastModified": 1759711004, - "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -248,11 +157,11 @@ "neovim": { "flake": false, "locked": { - "lastModified": 1758080187, - "narHash": "sha256-J0WfqbIK1ftH3x/McoNTwBOZfuRtLvwq8r0xHNZyDwo=", + "lastModified": 1759803648, + "narHash": "sha256-huTBuxpjC7NoHfDI5TfroSghWjFyfUcSQWQznWu/J6c=", "owner": "neovim", "repo": "neovim", - "rev": "63ece2b151e3d051d9366452441f64430ae5b45e", + "rev": "a4006360f1d43211ec9abf5b869f49e082ab82e7", "type": "github" }, "original": { @@ -270,11 +179,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759718309, - "narHash": "sha256-ciD2siuGn9iI6Kp4eIWcFwy8neop39GNfzHMXPygsEA=", + "lastModified": 1760326183, + "narHash": "sha256-k3Q772kyFg0bsPTaGlMvGvRf6bjYIlxYgzSTxOX2Elk=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "11f67f2bd1c839ba5c907bb919508816879dab35", + "rev": "e3f67eaf9d587c9d7f101236b0ea7c7df72f4bd1", "type": "github" }, "original": { @@ -283,29 +192,6 @@ "type": "github" } }, - "nix-appimage": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nvim-bundle", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757920913, - "narHash": "sha256-jd0QwCVz4O1sHHkeaZILD/7D6oyalceEJ4EFnWCgm0k=", - "owner": "ralismark", - "repo": "nix-appimage", - "rev": "7946addbc0d97e358a6d7aefe5e82310f0fe6b18", - "type": "github" - }, - "original": { - "owner": "ralismark", - "repo": "nix-appimage", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1758360447, @@ -321,11 +207,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -337,19 +223,17 @@ }, "nvim-bundle": { "inputs": { - "fff": "fff", "neovim": "neovim", - "nix-appimage": "nix-appimage", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1759676760, - "narHash": "sha256-UX5iKxxIHWZQLJnms+V1EbxPtfyPw7nIioEPzNTag/o=", + "lastModified": 1760095651, + "narHash": "sha256-daoV2w+Fb4MeUmGleuSRl9SV3GTqxvIL7QJ17O4RwWI=", "owner": "jla2000", "repo": "nvim-bundle", - "rev": "d12c82249f59d847408af8c7e1e91a259afd64ab", + "rev": "22183d391ee0805d77f38d69cc4cbf7d377a3e06", "type": "github" }, "original": { @@ -370,28 +254,6 @@ "zig-overlay": "zig-overlay" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nvim-bundle", - "fff", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756866691, - "narHash": "sha256-YWJsM0HfdFLcaoP5OeyzjX6MjGnJ0Acm+bg1QN8MKjo=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "fb6dab6f320291a8edd31c1d67f078c6f7384a02", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -399,11 +261,11 @@ ] }, "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", + "lastModified": 1760240450, + "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", + "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", "type": "github" }, "original": { @@ -457,36 +319,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -495,11 +327,11 @@ ] }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1760120816, + "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "761ae7aff00907b607125b2f57338b74177697ed", "type": "github" }, "original": { @@ -539,18 +371,18 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1759710804, - "narHash": "sha256-SiKrrua7Q1em2ktEwCfcM+V+4v3XGP0ktPRWCSd9x+g=", + "lastModified": 1760098405, + "narHash": "sha256-NaK7pKt5Ks5X4C5IuMybUo2v6hkzpcv3sR4WwUsJka8=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "56308d6d742b2519e8d923c5895abe37ef39d82e", + "rev": "40b0e0277f241e768a9b230fd03cb3226dfd4d29", "type": "github" }, "original": { diff --git a/modules/home/rsydn/shell/nushell.nix b/modules/home/rsydn/shell/nushell.nix index f84b1d3..19188ef 100644 --- a/modules/home/rsydn/shell/nushell.nix +++ b/modules/home/rsydn/shell/nushell.nix @@ -16,6 +16,15 @@ let lib.unique [ homebrewBin homebrewSbin ] else [ ]; + # Add common macOS system paths that may contain user-installed CLIs + macosSystemPaths = if pkgs.stdenv.hostPlatform.isDarwin then [ + "/usr/local/bin" + "/usr/bin" + "/bin" + "/usr/sbin" + "/sbin" + ] else + [ ]; formatPathList = paths: lib.concatMapStrings (path: " \"${path}\"\n") paths; in { @@ -67,7 +76,10 @@ in { let homebrew_paths = [ ${formatPathList homebrewPaths} ] - let path_candidates = ($nix_paths | append $homebrew_paths | flatten) + let macos_system_paths = [ + ${formatPathList macosSystemPaths} ] + + let path_candidates = ($nix_paths | append $homebrew_paths | append $macos_system_paths | flatten) if ($env.PATH? == null) { $env.PATH = $path_candidates