From 35078fc70db7f314b211d6a4ceb7ae6c9b819cca Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 5 Dec 2025 14:16:06 -0600
Subject: [PATCH] Make ghostty, zellij, and nvim work more nicely

---
 home/baseline/shell.nix |  2 +-
 home/baseline/tools.nix | 32 +++++++++++---------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/home/baseline/shell.nix b/home/baseline/shell.nix
index 28a99af..8781cb2 100644
--- a/home/baseline/shell.nix
+++ b/home/baseline/shell.nix
@@ -69,7 +69,7 @@
         window-save-state = "always";
 
         keybind = [
-          "ctrl+n=new_window"
+          #"ctrl+n=new_window"
 
           "ctrl+shift+h=goto_split:left"
           "ctrl+shift+j=goto_split:down"
diff --git a/home/baseline/tools.nix b/home/baseline/tools.nix
index d751a6f..c6ee754 100644
--- a/home/baseline/tools.nix
+++ b/home/baseline/tools.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   home.packages =
     with pkgs;
@@ -23,7 +23,8 @@
       enable = true;
       enableZshIntegration = pkgs.stdenv.hostPlatform.isDarwin;
       settings = {
-        default_shell = "xonsh";
+        #default_shell = "xonsh";
+        default_shell = lib.getExe config.programs.nushell.package;
         plugins = {
           autolock = {
             _props.location = "https://github.com/fresh2dev/zellij-autolock/releases/download/0.2.2/zellij-autolock.wasm";
@@ -60,26 +61,15 @@
                 ];
               };
             }
-            {
-              bind = {
-                _args = [ "Ctrl z" ];
-                _children = [
-                  {
-                    MessagePlugin = {
-                      _args = [ "autolock" ];
-                      _children = [
-                        {
-                          payload._args = [ "enable" ];
-                        }
-                      ];
-                    };
-                    SwitchToMode._args = [ "Locked" ];
-                  }
-                ];
-              };
-            }
           ]; # /normal
           locked._children = [
+            {
+              unbind = {
+                _args = [ "Ctrl g" ];
+              };
+            }
+          ];
+          shared._children = [
             {
               bind = {
                 _args = [ "Ctrl z" ];
@@ -89,7 +79,7 @@
                       _args = [ "autolock" ];
                       _children = [
                         {
-                          payload._args = [ "disable" ];
+                          payload._args = [ "toggle" ];
                         }
                       ];
                     };