diff --git a/flake.nix b/flake.nix
index 877dc2f..009ba20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
               extraSpecialArgs = args;
               # Add the users
               users.rafiq.imports = [
-                ./users/rafiq.nix
+                ./users/rafiq
               ];
             };
           }
diff --git a/users/modules/editor.nix b/users/modules/editor.nix
deleted file mode 100644
index 86e7c3f..0000000
--- a/users/modules/editor.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  home.sessionVariables.EDITOR = "nvim";
-  home.packages = with pkgs; [
-    neovim
-  ];
-}
diff --git a/users/rafiq/.config/nvim/init.lua b/users/rafiq/.config/nvim/init.lua
new file mode 100644
index 0000000..db8155c
--- /dev/null
+++ b/users/rafiq/.config/nvim/init.lua
@@ -0,0 +1,3 @@
+vim.opt.shiftwidth = 2;
+vim.opt.number = true;
+vim.opt.relativenumber = true;
diff --git a/users/rafiq.nix b/users/rafiq/default.nix
similarity index 92%
rename from users/rafiq.nix
rename to users/rafiq/default.nix
index c2e6e88..ebaaa69 100644
--- a/users/rafiq.nix
+++ b/users/rafiq/default.nix
@@ -3,7 +3,7 @@ _: {
     ./modules/git.nix # git specific configs
     ./modules/sh.nix # bash and other shell specific configs
     ./modules/wm.nix # window manager configs
-    ./modules/editor.nix # editor specific configs
+    ./modules/nvim.nix # nvim specific configs
     ./modules/terminal.nix # terminal emulator configs
     ./modules/utils.nix # miscellaneous utilities
   ];
diff --git a/users/modules/git.nix b/users/rafiq/modules/git.nix
similarity index 100%
rename from users/modules/git.nix
rename to users/rafiq/modules/git.nix
diff --git a/users/rafiq/modules/nvim.nix b/users/rafiq/modules/nvim.nix
new file mode 100644
index 0000000..e1987f6
--- /dev/null
+++ b/users/rafiq/modules/nvim.nix
@@ -0,0 +1,10 @@
+{ lib, ... }: {
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    extraLuaConfig = lib.fileContents ../.config/nvim/init.lua;
+  };
+}
diff --git a/users/modules/sh.nix b/users/rafiq/modules/sh.nix
similarity index 100%
rename from users/modules/sh.nix
rename to users/rafiq/modules/sh.nix
diff --git a/users/modules/terminal.nix b/users/rafiq/modules/terminal.nix
similarity index 100%
rename from users/modules/terminal.nix
rename to users/rafiq/modules/terminal.nix
diff --git a/users/modules/utils.nix b/users/rafiq/modules/utils.nix
similarity index 100%
rename from users/modules/utils.nix
rename to users/rafiq/modules/utils.nix
diff --git a/users/modules/wm.nix b/users/rafiq/modules/wm.nix
similarity index 100%
rename from users/modules/wm.nix
rename to users/rafiq/modules/wm.nix