From fdeef473dc56b4216a2e73958e63f81bc9cccbba Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 15 Aug 2025 22:59:11 -0500
Subject: [PATCH] Tweak nushell configuration

---
 home/baseline/nushell.nix |  1 +
 home/baseline/shell.nix   | 15 ++++---
 home/baseline/tools.nix   | 89 ++++++++++++++++++++++-----------------
 3 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/home/baseline/nushell.nix b/home/baseline/nushell.nix
index 583cf7a..988d3d7 100644
--- a/home/baseline/nushell.nix
+++ b/home/baseline/nushell.nix
@@ -7,6 +7,7 @@
   programs = {
     nushell = {
       enable = true;
+      environmentVariables = config.home.sessionVariables;
       extraConfig = ''
         use std/util "path add"
         path add ${config.home.homeDirectory}/src/bin
diff --git a/home/baseline/shell.nix b/home/baseline/shell.nix
index e53d7a4..2e7ba55 100644
--- a/home/baseline/shell.nix
+++ b/home/baseline/shell.nix
@@ -1,14 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   home = {
-    file = lib.mkIf pkgs.hostPlatform.isDarwin {
-      #"Library/Application Support/com.mitchellh.ghostty/config".source = "${config.home.homeDirectory}/.config/ghostty/config";
-      "Library/Application Support/com.mitchellh.ghostty/config".source = config.xdg.configFile."ghostty/config".source;
-    };
     sessionVariables = {
       AWS_SHARED_CREDENTIALS_FILE = "/run/agenix/cache-credentials";
       CARAPACE_BRIDGES = "zsh,bash";
-      EDITOR = "nvim";
+      EDITOR = lib.getExe config.programs.neovim.package;
       GOPATH = "${config.home.homeDirectory}/src/go";
       GOBIN = "${config.home.homeDirectory}/src/bin";
       LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN = "1";
@@ -60,7 +61,7 @@
       enable = true;
       package = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.ghostty-bin else pkgs.ghostty;
       settings = {
-        command = lib.getExe pkgs.nushell;
+        command = lib.getExe config.programs.nushell.package;
         font-family = "Hacker";
         theme = "Dracula";
         scrollback-limit = "1000000";
diff --git a/home/baseline/tools.nix b/home/baseline/tools.nix
index a89614b..a653304 100644
--- a/home/baseline/tools.nix
+++ b/home/baseline/tools.nix
@@ -18,37 +18,43 @@
   programs = {
     zellij = {
       enable = true;
-      attachExistingSession = true;
       enableZshIntegration = pkgs.stdenv.hostPlatform.isDarwin;
       settings = {
         default_shell = "xonsh";
         plugins = {
           autolock = {
             _props.location = "https://github.com/fresh2dev/zellij-autolock/releases/download/0.2.2/zellij-autolock.wasm";
-            _children = [ {
-              is_enabled = true;
-            } {
-              triggers = "nvim|vim|git";
-            } {
-              reaction_seconds = "0.3";
-            } {
-              print_to_log = true;
-            } ];
+            _children = [
+              {
+                is_enabled = true;
+              }
+              {
+                triggers = "nvim|vim|git";
+              }
+              {
+                reaction_seconds = "0.3";
+              }
+              {
+                print_to_log = true;
+              }
+            ];
           };
         };
-        load_plugins.autolock = {};
+        load_plugins.autolock = { };
         keybinds = {
           normal._children = [
             {
               bind = {
                 _args = [ "Enter" ];
-                _children = [ {
-                  WriteChars = "\\u{000D}";
-                  MessagePlugin = {
-                    _args = [ "autolock" ];
-                    _children = [{}];
-                  };
-                } ];
+                _children = [
+                  {
+                    WriteChars = "\\u{000D}";
+                    MessagePlugin = {
+                      _args = [ "autolock" ];
+                      _children = [ { } ];
+                    };
+                  }
+                ];
               };
             }
             {
@@ -92,27 +98,32 @@
           ]; # /locked
           shared_except = {
             _args = [ "locked" ];
-            _children = [ {
-              bind = {
-                _args = [ "Ctrl h" ];
-                MoveFocusOrTab._args = [ "Left" ];
-              };
-            } {
-              bind = {
-                _args = [ "Ctrl j" ];
-                MoveFocus._args = [ "Down" ];
-              };
-            } {
-              bind = {
-                _args = [ "Ctrl k" ];
-                MoveFocus._args = [ "Up" ];
-              };
-            } {
-              bind = {
-                _args = [ "Ctrl l" ];
-                MoveFocusOrTab._args = [ "Right" ];
-              };
-            } ];
+            _children = [
+              {
+                bind = {
+                  _args = [ "Ctrl h" ];
+                  MoveFocusOrTab._args = [ "Left" ];
+                };
+              }
+              {
+                bind = {
+                  _args = [ "Ctrl j" ];
+                  MoveFocus._args = [ "Down" ];
+                };
+              }
+              {
+                bind = {
+                  _args = [ "Ctrl k" ];
+                  MoveFocus._args = [ "Up" ];
+                };
+              }
+              {
+                bind = {
+                  _args = [ "Ctrl l" ];
+                  MoveFocusOrTab._args = [ "Right" ];
+                };
+              }
+            ];
           }; # /shared_except
         }; # /keybinds
       }; # /settings