diff --git a/nixos/flake.nix b/nixos/flake.nix
index cc39971..5e389b7 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -35,7 +35,7 @@
             pkgs = nixpkgs.legacyPackages.x86_64-linux;
             extraSpecialArgs = { inherit inputs; };
             modules = [
-                ./home.nix
+                ./home
                 (import ./overlays)
             ];
         };
diff --git a/nixos/home.nix b/nixos/home/base.nix
similarity index 98%
rename from nixos/home.nix
rename to nixos/home/base.nix
index cfa0e83..0138ac1 100644
--- a/nixos/home.nix
+++ b/nixos/home/base.nix
@@ -121,11 +121,14 @@
             vimAlias = true;
             plugins = with pkgs.vimPlugins; [
                 vim-just
+                vim-sleuth
                 vim-wakatime
             ];
             extraLuaConfig = ''
-                vim.opt["tabstop"] = 4
-                vim.opt["shiftwidth"] = 4
+                vim.opt.tabstop = 4
+                vim.opt.softtabstop = 4
+                vim.opt.shiftwidth = 4
+                vim.expandtab = true
             '';
         };
     };
diff --git a/nixos/home/default.nix b/nixos/home/default.nix
new file mode 100644
index 0000000..cbcb54f
--- /dev/null
+++ b/nixos/home/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+    imports = [
+        ./base.nix
+    ];
+}