diff --git a/modules/common/git.nix b/modules/common/git.nix
index 6fe5b3e..a5e2571 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -15,7 +15,9 @@ in {
 
         userName = "TheGeneralist";
         userEmail = "180094941+thegeneralist01@users.noreply.github.com";
-        lfs.enable = true;
+        lfs = {
+          enable = true;
+        };
 
         extraConfig = {
           commit.gpgSign = true;
diff --git a/modules/common/shell/0_nushell.nu b/modules/common/shell/0_nushell.nu
index 755e37f..b49b6d5 100644
--- a/modules/common/shell/0_nushell.nu
+++ b/modules/common/shell/0_nushell.nu
@@ -461,6 +461,4 @@ def --wrapped jc [...arguments: string@"nu-complete jc"]: [any -> table, any ->
   }
 }
 
-if $nu.is-interactive {
-  greeting
-}
+greeting
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index 86f5cf2..eafb5da 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -69,9 +69,7 @@ in
         config' = homeArgs.config;
         nuExecCondition =
           if config.isDarwin then
-            ''
-              [[ $- == *i* ]] && [ -z "$skip" ] && [ -t 1 ]
-            ''
+            ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ]''
           else
             ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ] && [ -z "$SSH_TTY" ]'';
       in
@@ -81,15 +79,12 @@ 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
-            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
-        '';
+            if ${nuExecCondition}; then
+              SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL"
+            fi
+          '';
       }
     )
+
   ];
 }
diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix
index 55e7724..f27fe93 100644
--- a/modules/linux/xserver.nix
+++ b/modules/linux/xserver.nix
@@ -101,11 +101,6 @@
               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" ];
@@ -116,10 +111,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";
@@ -396,14 +391,11 @@
     package = pkgs.niri;
   };
 
-  environment.systemPackages = with pkgs; [
-    fuzzel
-    xfce.thunar
-    playerctl
-    wireplumber
-    yaziPlugins.wl-clipboard
-    wl-clipboard-x11
-    wl-clipboard-rs
+  environment.systemPackages = [
+    pkgs.fuzzel
+    pkgs.xfce.thunar
+    pkgs.playerctl
+    pkgs.wireplumber
   ];
 
   services.xserver = {