diff --git a/modules/packages/helix.nix b/modules/packages/helix.nix
new file mode 100644
index 00000000..aff91596
--- /dev/null
+++ b/modules/packages/helix.nix
@@ -0,0 +1,17 @@
+inputs:
+{
+  options.nixos.packages.helix = let inherit (inputs.lib) mkOption types; in mkOption
+    { type = types.nullOr (types.submodule {}); default = {}; };
+  config = let inherit (inputs.config.nixos.packages) helix; in inputs.lib.mkIf (helix != null)
+  {
+    nixos.user.sharedModules =
+    [{
+      config.programs.helix =
+      {
+        enable = true;
+        defaultEditor = true;
+        settings.theme = "catppuccin_latte";
+      };
+    }];
+  };
+}
diff --git a/modules/packages/vim.nix b/modules/packages/vim.nix
deleted file mode 100644
index 94c808b5..00000000
--- a/modules/packages/vim.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-inputs:
-{
-  options.nixos.packages.vim = let inherit (inputs.lib) mkOption types; in mkOption
-    { type = types.nullOr (types.submodule {}); default = {}; };
-  config = let inherit (inputs.config.nixos.packages) vim; in inputs.lib.mkIf (vim != null)
-  {
-    nixos.user.sharedModules =
-    [{
-      config.programs.vim =
-      {
-        enable = true;
-        defaultEditor = true;
-        packageConfigurable = inputs.config.programs.vim.package;
-        settings =
-        {
-          number = true;
-          expandtab = false;
-          shiftwidth = 2;
-          tabstop = 2;
-        };
-        extraConfig =
-        ''
-          set clipboard=unnamedplus
-          colorscheme evening
-        '';
-      };
-    }];
-    programs.vim.package = inputs.pkgs.vim-full;
-  };
-}
diff --git a/modules/user/chn/git.nix b/modules/user/chn/git.nix
index 8592686c..52a7e630 100644
--- a/modules/user/chn/git.nix
+++ b/modules/user/chn/git.nix
@@ -8,7 +8,7 @@ inputs:
       package = inputs.pkgs.gitFull;
       extraConfig =
       {
-        core.editor = if inputs.config.nixos.system.gui.preferred then "code --wait" else "vim";
+        core.editor = "hx";
         http.postBuffer = 624288000;
         advice.detachedHead = false;
         merge.conflictstyle = "diff3";