diff --git a/configuration.nix b/configuration.nix
index a9a8cd1e..9eeebbc4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -51,9 +51,9 @@ isMaximal: {
       # Languages that will be supported in default and maximal configurations.
       nix = {
         enable = true;
-        tabstop = 20;
-        softtabstop = 20;
-        shiftwidth = 20;
+        tabstop = 8;
+        softtabstop = 8;
+        shiftwidth = 8;
       };
       markdown.enable = true;
 
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index 71cc6580..33624668 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -110,7 +110,7 @@ in {
 
     tabstop = mkOption {
       description = "Sets the tabstop size in spaces for .nix files";
-      type = nullOr null;
+      type = nullOr int;
       default = null;
     };