diff --git a/modules/home-manager/nixvim.nix b/modules/home-manager/nixvim.nix
index 0525a89..b08bfc4 100644
--- a/modules/home-manager/nixvim.nix
+++ b/modules/home-manager/nixvim.nix
@@ -3,6 +3,42 @@
     enable = true;
     viAlias = true;
     vimAlias = true;
-    env = { EDITOR = "nvim"; };
+    vimdiffAlias = true;
+    defaultEditor = true;
+
+    colorscheme = "tokyonight";
+    colorschemes.tokyonight.enable = true;
+
+    opts = {
+      number = true;
+      relativenumber = true;
+      showmode = false;
+
+      breakindent = true;
+
+      undofile = true;
+
+      ignorecase = true;
+      smartcase = true;
+
+      signcolumn = "yes";
+
+      updatetime = 250;
+      timeoutlen = 300;
+
+      splitright = true;
+      splitbelow = true;
+
+      list = true;
+      listchars = { tab = "» "; trail = "·"; nbsp = "␣"; };
+
+      inccommand = "split";
+
+      cursorline = true;
+
+      scrolloff = 10;
+
+      confirm = true;
+    };
   };
 }