From 80646994da3f67fbc2d6b19a5de94e9983c4cfc4 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Thu, 6 Apr 2023 10:00:23 +0200
Subject: [PATCH] Zoxide and Starship modules now have nushell integration

---
 home-manager/modules/nushell/config.nu   | 2 +-
 home-manager/modules/nushell/default.nix | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/home-manager/modules/nushell/config.nu b/home-manager/modules/nushell/config.nu
index 9895d25..490be07 100644
--- a/home-manager/modules/nushell/config.nu
+++ b/home-manager/modules/nushell/config.nu
@@ -448,7 +448,7 @@ let-env config = {
       keycode: char_.
       mode: emacs
       event: [
-        { edit: InsertString, value: "!$" }
+        { edit: InsertString, value: " !$" }
         { send: Enter }
       ]
     }
diff --git a/home-manager/modules/nushell/default.nix b/home-manager/modules/nushell/default.nix
index eef3751..08bb270 100644
--- a/home-manager/modules/nushell/default.nix
+++ b/home-manager/modules/nushell/default.nix
@@ -2,8 +2,6 @@
 with lib;
 let
   cfg = config.eboskma.programs.nushell;
-  starship-nu = pkgs.runCommand "starship-nu" { } ''${pkgs.starship}/bin/starship init nu > $out'';
-  zoxide-nu = pkgs.runCommand "zoxide-nu" { } ''${pkgs.zoxide}/bin/zoxide init nushell > $out'';
 in
 {
   options.eboskma.programs.nushell = { enable = mkEnableOption "nu shell"; };
@@ -13,11 +11,6 @@ in
       enable = true;
       configFile.source = ./config.nu;
       envFile.source = ./env.nu;
-
-      extraConfig = ''
-        source ${starship-nu}
-        source ${zoxide-nu}
-      '';
     };
 
     home.packages = [ pkgs.carapace ];