diff --git a/config/home-manager/home.nix b/config/home-manager/home.nix
index 87c4275..73a57d5 100644
--- a/config/home-manager/home.nix
+++ b/config/home-manager/home.nix
@@ -61,25 +61,31 @@
 
   programs.vim = {
     enable = true;
+    # Let's not grab _all_ of Vim.
+    packageConfigurable = pkgs.vim;
     plugins = with pkgs; [
       pkgs.vimPlugins.vim-airline
       pkgs.vimPlugins.vim-airline-themes
       pkgs.vimPlugins.vim-go
     ];
+
     settings = {
       number = true;
 
       # Two-spaced tabs
+      shiftwidth = 2;
       tabstop = 2;
-      expandtab = false;
+      expandtab = true;
     };
     extraConfig = ''
-      set nocompatible
-      filetype off
       syntax on
       filetype plugin indent on
       set backspace=indent,eol,start
 
+      " assistance with space-oriented tabs
+      set softtabstop=2
+      set smarttab
+
       " custom filetypes
       autocmd BufNewFile,BufRead *.plist set syntax=xml