From 22fff3f6832a98062a6c183a5d9ec54b031cbd3f Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 11 Jan 2024 16:50:16 +0100
Subject: [PATCH 1/2] feat(nvim): map jj/jk to escape

---
 home-manager/neovim/default.nix | 3 +++
 home-manager/neovim/keymaps.lua | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index 390e874..f679253 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -52,6 +52,9 @@
         project-nvim
         auto-session
 
+        # escape handling 
+        better-escape-nvim
+
         nvim-treesitter.withAllGrammars
         markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" })
         toggleterm-nvim
diff --git a/home-manager/neovim/keymaps.lua b/home-manager/neovim/keymaps.lua
index 31b23cc..721631d 100644
--- a/home-manager/neovim/keymaps.lua
+++ b/home-manager/neovim/keymaps.lua
@@ -64,3 +64,6 @@ nnoremap("gq", ":Bdelete<CR>")
 
 -- toggle search highlighting
 vim.cmd('nnoremap <expr> * v:hlsearch ? ":nohlsearch<cr>" : "*"')
+
+-- insert-map jj/jk to escape
+require("better_escape").setup()

From 22bb8c4e70a3e6deb3ef8bc25915730056b738d3 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 11 Jan 2024 16:52:43 +0100
Subject: [PATCH 2/2] feat: remove nushell

---
 home-manager/carapace.nix         |  1 -
 home-manager/direnv.nix           |  1 -
 home-manager/neovim/lspconfig.lua |  1 -
 home-manager/nushell.nix          | 36 -------------------------------
 home-manager/zoxide.nix           |  1 -
 home-mandlm.nix                   |  1 -
 users.nix                         |  2 +-
 7 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 home-manager/nushell.nix

diff --git a/home-manager/carapace.nix b/home-manager/carapace.nix
index 92f2b3d..30b178c 100644
--- a/home-manager/carapace.nix
+++ b/home-manager/carapace.nix
@@ -3,7 +3,6 @@
   programs.carapace = {
     enable = true;
     enableZshIntegration = true;
-    enableNushellIntegration = true;
   };
 }
 
diff --git a/home-manager/direnv.nix b/home-manager/direnv.nix
index 1dd2ed5..1061719 100644
--- a/home-manager/direnv.nix
+++ b/home-manager/direnv.nix
@@ -5,7 +5,6 @@
     direnv = {
       enable = true;
       enableZshIntegration = true;
-      enableNushellIntegration = true;
       nix-direnv.enable = true;
     };
   };
diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index e767caf..af04c58 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -90,7 +90,6 @@ local servers = {
         },
     },
     ["marksman"] = {},
-    ["nushell"] = {},
     ["pylsp"] = {
         pylsp = {
             plugins = {
diff --git a/home-manager/nushell.nix b/home-manager/nushell.nix
deleted file mode 100644
index 88abfc1..0000000
--- a/home-manager/nushell.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, user, theme, ... }:
-{
-  programs.nushell = {
-    enable = true;
-    extraConfig = ''
-      let carapace_completer = {|spans|
-      carapace $spans.0 nushell $spans | from json
-      }
-      $env.config = {
-       show_banner: false,
-       edit_mode: vi 
-       shell_integration: true
-       use_kitty_protocol: true 
-       completions: {
-       case_sensitive: false # case-sensitive completions
-       quick: true    # set to false to prevent auto-selecting completions
-       partial: true    # set to false to prevent partial filling of the prompt
-       algorithm: "fuzzy"    # prefix or fuzzy
-       external: {
-       # set to false to prevent nushell looking into $env.PATH to find more suggestions
-           enable: true 
-       # set to lower can improve completion performance at the cost of omitting some options
-           max_results: 100 
-           completer: $carapace_completer # check 'carapace_completer' 
-         }
-       }
-      } 
-      $env.PATH = ($env.PATH | 
-      split row (char esep) |
-      prepend /home/myuser/.apps |
-      append /usr/bin/env
-      )
-    '';
-  };
-}
-
diff --git a/home-manager/zoxide.nix b/home-manager/zoxide.nix
index 47c1207..87d74ba 100644
--- a/home-manager/zoxide.nix
+++ b/home-manager/zoxide.nix
@@ -3,7 +3,6 @@
 {
   programs.zoxide = {
     enable = true;
-    enableNushellIntegration = true;
     enableZshIntegration = true;
   };
 }
diff --git a/home-mandlm.nix b/home-mandlm.nix
index d57ee53..ec0f99c 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -49,7 +49,6 @@
     ./home-manager/gpg
     ./home-manager/carapace.nix
     ./home-manager/zsh.nix
-    ./home-manager/nushell.nix
     ./home-manager/starship.nix
     ./home-manager/sway
     ./home-manager/direnv.nix
diff --git a/users.nix b/users.nix
index fbc8c2f..9f879ea 100644
--- a/users.nix
+++ b/users.nix
@@ -8,7 +8,7 @@
       isNormalUser = true;
       uid = 1000;
       home = "/home/mandlm";
-      shell = pkgs.nushell;
+      shell = pkgs.zsh;
       extraGroups = [
         "wheel"
         "networkmanager"