diff --git a/home/base/server/helix/README.md b/home/base/desktop/editors/helix/README.md
similarity index 100%
rename from home/base/server/helix/README.md
rename to home/base/desktop/editors/helix/README.md
diff --git a/home/base/server/helix/default.nix b/home/base/desktop/editors/helix/default.nix
similarity index 100%
rename from home/base/server/helix/default.nix
rename to home/base/desktop/editors/helix/default.nix
diff --git a/home/base/server/editors/default.nix b/home/base/server/editors/default.nix
new file mode 100644
index 00000000..eeb48a40
--- /dev/null
+++ b/home/base/server/editors/default.nix
@@ -0,0 +1,3 @@
+{mylib, ...}: {
+  imports = mylib.scanPaths ./.;
+}
diff --git a/home/base/server/editors/helix/default.nix b/home/base/server/editors/helix/default.nix
new file mode 100644
index 00000000..d344a163
--- /dev/null
+++ b/home/base/server/editors/helix/default.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  programs.helix = {
+    enable = true;
+    package = pkgs.helix;
+  };
+}
diff --git a/home/base/server/editors/neovim/default.nix b/home/base/server/editors/neovim/default.nix
new file mode 100644
index 00000000..0f2c4dc2
--- /dev/null
+++ b/home/base/server/editors/neovim/default.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  programs = {
+    neovim = {
+      enable = true;
+      package = pkgs.neovim;
+
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+    };
+  };
+}