diff --git a/modules/homelab/default.nix b/modules/homelab/default.nix
index b563b2c..16c4b2e 100644
--- a/modules/homelab/default.nix
+++ b/modules/homelab/default.nix
@@ -7,8 +7,8 @@
     ./nfs.nix
   ];
 
-  modules.homelab.zfs.enable = lib.mkDefault true;
-  modules.homelab.smb.enable = lib.mkDefault true;
-  modules.homelab.nfs.enable = lib.mkDefault true;
+  modules.homelab.zfs.enable = lib.mkDefault false;
+  modules.homelab.smb.enable = lib.mkDefault false;
+  modules.homelab.nfs.enable = lib.mkDefault false;
 
 }
diff --git a/modules/homelab/nfs.nix b/modules/homelab/nfs.nix
index d758303..9d987e0 100644
--- a/modules/homelab/nfs.nix
+++ b/modules/homelab/nfs.nix
@@ -2,17 +2,18 @@
 
 # define nfs exports
 let
+  cfg = config.modules.homelab.nfs;
   nfs_exports = ''
     /holocron/vault *(rw,sync,no_subtree_check,no_root_squash)
     /holocron/media *(ro,sync,no_subtree_check)
   '';
 in
 {
-  options = {
-    modules.homelab.nfs.enable = lib.mkEnableOption "enables nfs";
+  options.modules.homelab.nfs = {
+    enable = lib.mkEnableOption "enables nfs";
   };
 
-  config = lib.mkIf config.modules.homelab.nfs.enable {
+  config = lib.mkIf cfg.enable {
     # enable nfs with all exports
     services.nfs = {
       server = {
diff --git a/modules/homelab/smb.nix b/modules/homelab/smb.nix
index 59635db..1eed22d 100644
--- a/modules/homelab/smb.nix
+++ b/modules/homelab/smb.nix
@@ -2,6 +2,7 @@
 
 # define smb shares
 let
+  cfg = config.modules.homelab.smb;
   smb_shares = {
     vault = {
       path = "/holocron/vault";
@@ -18,11 +19,11 @@ let
   };
 in
 {
-  options = {
-    modules.homelab.smb.enable = lib.mkEnableOption "enables smb";
+  options.modules.homelab.smb = {
+    enable = lib.mkEnableOption "enables smb";
   };
 
-  config = lib.mkIf config.modules.homelab.smb.enable {
+  config = lib.mkIf cfg.enable {
     # enable smb with all shares
     services.samba = {
       enable = true;
diff --git a/modules/homelab/zfs.nix b/modules/homelab/zfs.nix
index b5d665e..b229cf5 100644
--- a/modules/homelab/zfs.nix
+++ b/modules/homelab/zfs.nix
@@ -1,12 +1,14 @@
 { pkgs, config, lib, ... }:
 
+let
+  cfg = config.modules.homelab.zfs;
+in
 {
-
-  options = {
-    modules.homelab.zfs.enable = lib.mkEnableOption "enables zfs";
+  options.modules.homelab.zfs = {
+    enable = lib.mkEnableOption "enables zfs";
   };
 
-  config = lib.mkIf config.modules.homelab.zfs.enable {
+  config = lib.mkIf cfg.enable {
     # set network host id
     networking.hostId = "3e6e7055";
 
diff --git a/modules/system/default.nix b/modules/system/default.nix
index f40ce95..28b9350 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -12,9 +12,9 @@
 
   modules.system.ssh.enable = lib.mkDefault true;
   modules.system.sops.enable = lib.mkDefault true;
-  modules.system.docker.enable = lib.mkDefault true;
+  modules.system.docker.enable = lib.mkDefault false;
   modules.system.tailscale.enable = lib.mkDefault true;
-  modules.system.syncthing.enable = lib.mkDefault true;
+  modules.system.syncthing.enable = lib.mkDefault false;
   modules.system.nvidia.enable = lib.mkDefault false;
 
 }
diff --git a/modules/system/docker.nix b/modules/system/docker.nix
index 43ff798..fad4241 100644
--- a/modules/system/docker.nix
+++ b/modules/system/docker.nix
@@ -1,11 +1,14 @@
 { pkgs, config, lib, ... }:
 
+let
+  cfg = config.modules.system.docker;
+in
 {
-  options = {
-    modules.system.docker.enable = lib.mkEnableOption "enables docker";
+  options.modules.system.docker = {
+    enable = lib.mkEnableOption "enables docker";
   };
 
-  config = lib.mkIf config.modules.system.docker.enable {
+  config = lib.mkIf cfg.enable {
     virtualisation.docker = {
       enable = true;
       daemon.settings = {
diff --git a/modules/system/nvidia.nix b/modules/system/nvidia.nix
index 0423ef6..08d0b1f 100644
--- a/modules/system/nvidia.nix
+++ b/modules/system/nvidia.nix
@@ -1,11 +1,14 @@
 { pkgs, config, lib, ... }:
 
+let
+  cfg = config.modules.system.nvidia;
+in
 {
-  options = {
-    modules.system.nvidia.enable = lib.mkEnableOption "enables nvidia";
+  options.modules.system.nvidia = {
+    enable = lib.mkEnableOption "enables nvidia";
   };
 
-  config = lib.mkIf config.modules.system.nvidia.enable {
+  config = lib.mkIf cfg.enable {
     # enable nvidia proprietary driver
     hardware.nvidia = {
       modesetting.enable = true;  # required
diff --git a/modules/system/sops.nix b/modules/system/sops.nix
index 83b42a6..180d176 100644
--- a/modules/system/sops.nix
+++ b/modules/system/sops.nix
@@ -1,13 +1,16 @@
 { pkgs, config, lib, inputs, ... }:
 
+let
+  cfg = config.modules.system.sops;
+in
 {
   imports = [ inputs.sops-nix.nixosModules.sops ];
 
-  options = {
-    modules.system.sops.enable = lib.mkEnableOption "enables ssh";
+  options.modules.system.sops = {
+    enable = lib.mkEnableOption "enables sops";
   };
 
-  config = lib.mkIf config.modules.system.sops.enable {
+  config = lib.mkIf cfg.enable {
     # enable and configure sops for secrets
     sops.defaultSopsFile = ../../secrets/secrets.yaml;
     sops.defaultSopsFormat = "yaml";
diff --git a/modules/system/ssh.nix b/modules/system/ssh.nix
index fbb6c8c..c832fb4 100644
--- a/modules/system/ssh.nix
+++ b/modules/system/ssh.nix
@@ -1,11 +1,14 @@
 { pkgs, config, lib, ... }:
 
+let
+  cfg = config.modules.system.ssh;
+in
 {
-  options = {
-    modules.system.ssh.enable = lib.mkEnableOption "enables ssh";
+  options.modules.system.ssh = {
+    enable = lib.mkEnableOption "enables ssh";
   };
 
-  config = lib.mkIf config.modules.system.ssh.enable {
+  config = lib.mkIf cfg.enable {
     # enable and configure openssh
     services.openssh = {
       enable = true;
diff --git a/modules/system/syncthing.nix b/modules/system/syncthing.nix
index dc1fdc9..a2012c6 100644
--- a/modules/system/syncthing.nix
+++ b/modules/system/syncthing.nix
@@ -1,11 +1,14 @@
 { pkgs, config, lib, ... }:
 
+let
+  cfg = config.modules.system.syncthing;
+in
 {
-  options = {
-    modules.system.syncthing.enable = lib.mkEnableOption "enables syncthing";
+  options.modules.system.syncthing = {
+    enable = lib.mkEnableOption "enables syncthing";
   };
 
-  config = lib.mkIf config.modules.system.syncthing.enable {
+  config = lib.mkIf cfg.enable {
     services.syncthing = {
       enable = true;
       user = "blake";
diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix
index 8e4dcf0..d02170e 100644
--- a/modules/system/tailscale.nix
+++ b/modules/system/tailscale.nix
@@ -1,15 +1,19 @@
 { pkgs, config, lib, ... }:
 
+let
+  cfg = config.modules.system.tailscale;
+  authkey_file = "/run/secrets/tailscale_authkey";
+in
 {
-  options = {
-    modules.system.tailscale.enable = lib.mkEnableOption "enables tailscale";
+  options.modules.system.tailscale = {
+    enable = lib.mkEnableOption "enables tailscale";
   };
 
-  config = lib.mkIf config.modules.system.tailscale.enable {
+  config = lib.mkIf cfg.enable {
     services.tailscale = {
       enable = true;
       useRoutingFeatures = "both";
-      authKeyFile = "/run/secrets/tailscale_authkey";
+      authKeyFile = authkey_file;
     };
   };
 }
diff --git a/users/blake/dotfiles/nvim/lua/base/base.lua b/users/blake/dotfiles/nvim/lua/base/base.lua
index 7d45280..0245b19 100644
--- a/users/blake/dotfiles/nvim/lua/base/base.lua
+++ b/users/blake/dotfiles/nvim/lua/base/base.lua
@@ -23,8 +23,8 @@ o.relativenumber = true
 vim.cmd('highlight LineNr ctermfg=054')
 
 -- tabs
-o.tabstop = 4
-o.shiftwidth = 4
+o.tabstop = 2
+o.shiftwidth = 2
 o.softtabstop = -1 -- if negative uses shift width
 o.expandtab = true
 o.smarttab = true