making ghostty cleaner

modules/home-manager/default.nix

@@ -1,6 +1,3 @@
 {
   ghostty = import ./programs/ghostty.nix;
-  # imports = [
-  #   ./programs/ghostty.nix
-  # ];
 }

users/thomas/cli/shell-aliases.nix

@@ -2,6 +2,8 @@
   "..." = "cd ../..";
   "...." = "cd ../../..";
 
+  la = "ls -la";
+
   # Git stuff
   g = "git";
   gco = "git checkout ";

users/thomas/default.nix

@@ -6,7 +6,6 @@ in
 {
   imports = [
     outputs.modules.global.nix-config
-    outputs.modules.home-manager.ghostty
 
     ./cli
   ];
@@ -18,7 +17,6 @@ in
     username = lib.mkDefault "thomas";
     homeDirectory = lib.mkDefault "${homeLocation}/${config.home.username}";
     sessionVariables = {
-      EDITOR = "${pkgs.neovim}/bin/nvim";
       SHELL = "${pkgs.nushell}/bin/nu";
     };
     stateVersion = lib.mkDefault "24.11";

users/thomas/desktop/ghostty.nix

@@ -1,9 +1,15 @@
-{ pkgs, config, ... }:
+{ pkgs, config, outputs, ... }:
 {
+  imports = [
+    outputs.modules.home-manager.ghostty
+  ];
+
   programs.ghostty-darwin = {
     enable = true;
 
+    # installBatSyntax = true;
     # installVimSyntax = true;
+
     enableBashIntegration = true;
     enableZshIntegration = true;
     enableFishIntegration = true;

users/thomas/nvim/default.nix

@@ -5,7 +5,11 @@ let
 
   # Merge all plugin configurations directly from imports
   nixvim = recursiveUpdateMany [
-    ({ enable = true; })
+    ({ 
+      enable = true;
+      defaultEditor = true;
+      vimdiffAlias = true;
+    })
     (import ./colorschemes.nix)
     (import ./keymaps.nix)
     (import ./options.nix)