From 70faf05c86261ecb787c534a5c911c8512d0626a Mon Sep 17 00:00:00 2001
From: jolheiser <john.olheiser@gmail.com>
Date: Mon, 20 Nov 2023 20:08:08 -0600
Subject: [PATCH] chore: update nixpkgs

Signed-off-by: jolheiser <john.olheiser@gmail.com>
---
 apps/nogui/nushell/zoxide.nu      | 4 ++--
 apps/nogui/zoxide.nix             | 8 +++++++-
 flake.lock                        | 6 +++---
 machines/common/nogui/default.nix | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/nogui/nushell/zoxide.nu b/apps/nogui/nushell/zoxide.nu
index ea59b14..2382c52 100644
--- a/apps/nogui/nushell/zoxide.nu
+++ b/apps/nogui/nushell/zoxide.nu
@@ -23,7 +23,7 @@ if (not ($env | default false __zoxide_hooked | get __zoxide_hooked)) {
 #
 
 # 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 @@ def-env __zoxide_z [...rest:string] {
 }
 
 # 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 1d60a23..1286133 100644
--- a/apps/nogui/zoxide.nix
+++ b/apps/nogui/zoxide.nix
@@ -1 +1,7 @@
-{programs.zoxide.enable = true;}
+{
+  programs.zoxide = {
+    enable = true;
+    # TODO remove once zoxide is updated for new nushell def --env syntax
+    enableNushellIntegration = false;
+  };
+}
diff --git a/flake.lock b/flake.lock
index b6cdf24..cb1d915 100644
--- a/flake.lock
+++ b/flake.lock
@@ -173,11 +173,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699343069,
-        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
+        "lastModified": 1700444282,
+        "narHash": "sha256-s/+tgT+Iz0LZO+nBvSms+xsMqvHt2LqYniG9r+CYyJc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+        "rev": "3f21a22b5aafefa1845dec6f4a378a8f53d8681c",
         "type": "github"
       },
       "original": {
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index 197f396..4213d9c 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -64,5 +64,5 @@
     systemPackages = with pkgs; [podman podman-compose podman-tui];
   };
 
-  fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono"];})];
+  fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "Hack"];}) monaspace];
 }