diff --git a/home/programs/editors/neovim.nix b/home/programs/editors/neovim.nix
index c80e4d6..dc23e41 100644
--- a/home/programs/editors/neovim.nix
+++ b/home/programs/editors/neovim.nix
@@ -1,5 +1,6 @@
 {
   inputs,
+  lib,
   pkgs,
   ...
 }: {
@@ -12,9 +13,11 @@
       vimAlias = true;
       enableLuaLoader = true;
       preventJunkFiles = true;
-      options.tabstop = 4;
-      autoIndent = false;
       useSystemClipboard = true;
+      options = {
+        tabstop = 4;
+        autoindent = false;
+      };
 
       luaConfigPost = ''
         vim.opt.formatoptions:remove('c')
@@ -34,7 +37,7 @@
           };
         };
       };
-      theme = {
+      theme = lib.mkDefault {
         enable = true;
         name = "catppuccin";
         style = "macchiato";
diff --git a/modules/theme/default.nix b/modules/theme/default.nix
index 85570dc..6146cec 100644
--- a/modules/theme/default.nix
+++ b/modules/theme/default.nix
@@ -6,7 +6,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkOption mkIf attrNames;
+  inherit (lib) mkDefault mkEnableOption mkOption mkIf attrNames;
   inherit (lib.types) path package enum;
   inherit (lib') generateGtkColors;
   cfg = config.theme;
@@ -273,6 +273,12 @@ in {
               palette = builtins.attrValues (builtins.mapAttrs (_: color: "#${color}") scheme.palette);
             };
           };
+
+          nvf.settings.vim.theme = {
+            enable = true;
+            name = "base16";
+            base16-colors = scheme.palette;
+          };
         };
       };
     };