From 8eaea782abefb0df056836e9c8e75584422366b0 Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Fri, 27 Mar 2026 14:04:27 +0100
Subject: [PATCH 1/2] shell stuff for zed

---
 modules/common/shell/0_nushell.nu |  4 +++-
 modules/common/shell/default.nix  | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/common/shell/0_nushell.nu b/modules/common/shell/0_nushell.nu
index b49b6d5..755e37f 100644
--- a/modules/common/shell/0_nushell.nu
+++ b/modules/common/shell/0_nushell.nu
@@ -461,4 +461,6 @@ def --wrapped jc [...arguments: string@"nu-complete jc"]: [any -> table, any ->
   }
 }
 
-greeting
+if $nu.is-interactive {
+  greeting
+}
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index eafb5da..86f5cf2 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -69,7 +69,9 @@ in
         config' = homeArgs.config;
         nuExecCondition =
           if config.isDarwin then
-            ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ]''
+            ''
+              [[ $- == *i* ]] && [ -z "$skip" ] && [ -t 1 ]
+            ''
           else
             ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ] && [ -z "$SSH_TTY" ]'';
       in
@@ -79,12 +81,15 @@ in
             export PATH="$HOME/.local/bin:/run/wrappers/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/etc/profiles/per-user/$USER/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin''${PATH:+:}''${PATH}"
             source ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
 
-            if ${nuExecCondition}; then
-              SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL"
-            fi
-          '';
+          if ${nuExecCondition}; then
+            parent_cmd="$(ps -o command= -p "$PPID" 2>/dev/null || true)"
+            case "$parent_cmd" in
+              *"/Applications/Zed.app/Contents/MacOS/zed --printenv"*) return ;;
+            esac
+            SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL"
+          fi
+        '';
       }
     )
-
   ];
 }

From bb4804dfc10f6bee92c4fece3d4186db89b78f7d Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Fri, 27 Mar 2026 14:05:15 +0100
Subject: [PATCH 2/2] minor changes

---
 modules/common/git.nix    |  4 +---
 modules/linux/xserver.nix | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/modules/common/git.nix b/modules/common/git.nix
index a5e2571..6fe5b3e 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -15,9 +15,7 @@ in {
 
         userName = "TheGeneralist";
         userEmail = "180094941+thegeneralist01@users.noreply.github.com";
-        lfs = {
-          enable = true;
-        };
+        lfs.enable = true;
 
         extraConfig = {
           commit.gpgSign = true;
diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix
index f27fe93..55e7724 100644
--- a/modules/linux/xserver.nix
+++ b/modules/linux/xserver.nix
@@ -101,6 +101,11 @@
               action.spawn = [ "ghostty" ];
             };
 
+            "Mod+G" = {
+              hotkey-overlay.title = "Open Terminal: ghostty";
+              action.spawn = [ "ghostty" ];
+            };
+
             "Mod+B" = {
               hotkey-overlay.title = "Open Browser: helium";
               action.spawn = [ "helium" ];
@@ -111,10 +116,10 @@
               action.spawn = [ "sh" "-" "firefox" ];
             };
 
-            "Mod+Shift+Q" = {
-              hotkey-overlay.title = "Lock Screen: gtklock";
-              action.spawn = [ "gtklock" ];
-            };
+            # "Mod+Shift+Q" = {
+            #   hotkey-overlay.title = "Lock Screen: gtklock";
+            #   action.spawn = [ "gtklock" ];
+            # };
 
             "Mod+D" = {
               hotkey-overlay.title = "Open App Launcher: fuzzel";
@@ -391,11 +396,14 @@
     package = pkgs.niri;
   };
 
-  environment.systemPackages = [
-    pkgs.fuzzel
-    pkgs.xfce.thunar
-    pkgs.playerctl
-    pkgs.wireplumber
+  environment.systemPackages = with pkgs; [
+    fuzzel
+    xfce.thunar
+    playerctl
+    wireplumber
+    yaziPlugins.wl-clipboard
+    wl-clipboard-x11
+    wl-clipboard-rs
   ];
 
   services.xserver = {