diff --git a/apps/nogui/nushell/zoxide.nu b/apps/nogui/nushell/zoxide.nu index 2382c52071db0d34d0954de517f6d3bc29072f9b..ea59b14b60245d9e4df332ec1ff98d452007a563 100644 --- a/apps/nogui/nushell/zoxide.nu +++ b/apps/nogui/nushell/zoxide.nu @@ -23,7 +23,7 @@ # When using zoxide with --no-cmd, alias these internal functions as desired. # # Jump to a directory using only keywords. -def --env __zoxide_z [...rest:string] { +def-env __zoxide_z [...rest:string] { let arg0 = ($rest | append '~').0 let path = if (($rest | length) <= 1) and ($arg0 == '-' or ($arg0 | path expand | path type) == dir) { $arg0 @@ -34,7 +34,7 @@ cd $path } # Jump to a directory using interactive search. -def --env __zoxide_zi [...rest:string] { +def-env __zoxide_zi [...rest:string] { cd $'(zoxide query --interactive -- $rest | str trim -r -c "\n")' } diff --git a/apps/nogui/zoxide.nix b/apps/nogui/zoxide.nix index 12861330e18d3fc6e925eda72c06dab7c7aa1f04..1d60a23bda80b25c83aef3c82bbc6acb2213082a 100644 --- a/apps/nogui/zoxide.nix +++ b/apps/nogui/zoxide.nix @@ -1,7 +1 @@ -{ - programs.zoxide = { - enable = true; - # TODO remove once zoxide is updated for new nushell def --env syntax - enableNushellIntegration = false; - }; -} +{programs.zoxide.enable = true;} diff --git a/flake.lock b/flake.lock index cb1d9150c083c96a7e4ce8b10ab7296f4ecafe88..b6cdf24a8d20def8d93dc417a992aa7f829df484 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1700444282, - "narHash": "sha256-s/+tgT+Iz0LZO+nBvSms+xsMqvHt2LqYniG9r+CYyJc=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f21a22b5aafefa1845dec6f4a378a8f53d8681c", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix index 4213d9c4e643154cddec34a588e8df0f169ce90c..197f396dfabb1701d8c2045609418bf6f1d6e266 100644 --- a/machines/common/nogui/default.nix +++ b/machines/common/nogui/default.nix @@ -64,5 +64,5 @@ environment = { systemPackages = with pkgs; [podman podman-compose podman-tui]; }; - fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "Hack"];}) monaspace]; + fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono"];})]; }