diff --git a/.vimrc b/.vimrc
index 12def45..d4e67a1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -91,7 +91,6 @@ if !has("nvim")
 endif
 set virtualedit=block
 set noshowmode
-set textwidth=100
 
 function! RestoreCursor()
   let pos = line("'\"")
@@ -121,7 +120,7 @@ augroup end
 " GUI {{{
 
 if has("gui_running")
-  set background=light
+  " set background=light
 
   " causes flickering in the terminal for some reason
   set macligatures
diff --git a/ansible/roles/osx/vars/main.yml b/ansible/roles/osx/vars/main.yml
index d9dfe82..a91ece7 100644
--- a/ansible/roles/osx/vars/main.yml
+++ b/ansible/roles/osx/vars/main.yml
@@ -180,7 +180,28 @@ osx_defaults:
     type: int
     value: 1
 
+  # Other applications
   - domain: com.google.Chrome
     key: AppleEnableSwipeNavigateWithScrolls
     type: bool
     value: false
+
+  - domain: org.vim.MacVim
+    key: MMLastWindowClosedBehavior
+    type: int
+    value: 2
+
+  - domain: org.vim.MacVim
+    key: MMUntitledWindow
+    type: int
+    value: 1
+
+  - domain: org.vim.MacVim
+    key: SUCheckAtStartup
+    type: int
+    value: 1
+
+  - domain: org.vim.MacVim
+    key: SUEnableAutomaticChecks
+    type: int
+    value: 1