diff --git a/home.nix b/home.nix
index 757572e..3bab22b 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   pkgs-unstable,
+  lib,
   nixvim,
   river-shifttags,
   other-transcode,
@@ -107,6 +108,9 @@ in {
       alsa-utils
       # remote
       rustdesk
+      # other lsps
+      nixd
+      nil
     ];
 
     file = {
@@ -118,7 +122,7 @@ in {
     };
 
     sessionVariables = {
-      EDITOR = "nvim";
+      EDITOR = "hx";
     };
 
     inherit username;
@@ -135,8 +139,6 @@ in {
     userName = "Khaïs COLIN";
     # better diffs
     diff-so-fancy.enable = true;
-    # set editor
-    extraConfig.core.editor = "nvim";
     # always show diff in commits
     extraConfig.commit.verbose = true;
   };
@@ -156,7 +158,7 @@ in {
         key = "/home/khais/.ssh/id_ed25519.pub";
       };
       ui = {
-        editor = "emacsclient -a ''";
+        editor = "hx";
         default-command = "log";
         movement.edit = true;
         # do not page if output fits on one screen
@@ -200,8 +202,8 @@ in {
       gd = "git diff";
       gds = "git diff --staged";
 
-      vim = "nvim";
-      vi = "nvim";
+      vim = "hx";
+      vi = "hx";
 
       # progress cp
       # https://serverfault.com/questions/43014/copying-a-large-directory-tree-locally-cp-or-rsync
@@ -219,8 +221,8 @@ in {
   programs.fish = {
     enable = true;
     shellAliases = {
-      vim = "nvim";
-      vi = "nvim";
+      vim = "hx";
+      vi = "hx";
 
       # progress cp
       # https://serverfault.com/questions/43014/copying-a-large-directory-tree-locally-cp-or-rsync
@@ -396,4 +398,20 @@ in {
     enable = true;
     extraConfig = builtins.readFile ./afew.config;
   };
+
+  programs.helix = {
+    enable = true;
+    ignores = [".jj/"];
+    settings = {
+      theme = lib.mkForce "modus_vivendi";
+      editor = {
+        cursor-shape = {
+         insert = "bar";
+          normal = "block";
+          select = "underline";
+        };
+        end-of-line-diagnostics = "hint";
+      };
+    };
+  };
 }