diff --git a/common/fish/vars.fish b/common/fish/vars.fish
index 0913826..56e4f51 100644
--- a/common/fish/vars.fish
+++ b/common/fish/vars.fish
@@ -14,12 +14,12 @@ set --export --universal MANPAGER "less"
 
 set --universal fish_cursor_insert line
 
-if command --search --quiet helix
-	set --export --universal EDITOR helix
-	set --export --universal VISUAL helix
-else if command --search --quiet hx
+if command --search --quiet hx
 	set --export --universal EDITOR hx
 	set --export --universal VISUAL hx
+else if command --search --quiet helix
+	set --export --universal EDITOR helix
+	set --export --universal VISUAL helix
 else if command --search --quiet nvim
 	set --export --universal EDITOR nvim
 	set --export --universal VISUAL nvim
diff --git a/common/helix/languages.toml b/common/helix/languages.toml
index 002055e..8c55694 100644
--- a/common/helix/languages.toml
+++ b/common/helix/languages.toml
@@ -33,3 +33,18 @@ auto-format = true
 [[language]]
 name = "elixir"
 auto-format = true
+
+[[language]]
+name = "nim"
+scope = "source.nim"
+injection-regex = "nim"
+file-types = ["nim","nims"]
+shebangs = ["nim"]
+roots = []
+comment-token = "#"
+language-server = { command = "nimlangserver" }
+indent = { tab-width = 2, unit = " " }
+
+[[grammar]]
+name = "nim"
+source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "8ce3627827e45a5835004391ff5ffcfe029ae6cf" }
\ No newline at end of file