diff --git a/ansible/roles/osx/files/DefaultKeyBinding.dict b/ansible/roles/osx/files/DefaultKeyBinding.dict
new file mode 100644
index 00000000..f9a28a1e
--- /dev/null
+++ b/ansible/roles/osx/files/DefaultKeyBinding.dict
@@ -0,0 +1,4 @@
+{
+  "^w" = "deleteWordBackward:";
+  "^u" = "deleteToBeginningOfLine:";
+}
diff --git a/ansible/roles/osx/tasks/homebrew.yml b/ansible/roles/osx/tasks/homebrew.yml
index 8ce07cf4..a6773ca1 100644
--- a/ansible/roles/osx/tasks/homebrew.yml
+++ b/ansible/roles/osx/tasks/homebrew.yml
@@ -1,5 +1,5 @@
 ---
-- homebrew: name={{ item }} state=upgraded
+- homebrew: name={{ item }}
   with_items: formulae
 - homebrew: name=macvim install_options=override-system-vim state=upgraded
 - command: brew linkapps
diff --git a/ansible/roles/osx/tasks/main.yml b/ansible/roles/osx/tasks/main.yml
index f44e57c6..1d19f252 100644
--- a/ansible/roles/osx/tasks/main.yml
+++ b/ansible/roles/osx/tasks/main.yml
@@ -3,3 +3,5 @@
 - include: homebrew.yml
 - include: casks.yml
 - include: fonts.yml
+- file: path=~/Library/KeyBindings state=directory
+- copy: src=DefaultKeyBinding.dict dest=~/Library/KeyBindings/DefaultKeyBinding.dict
diff --git a/ansible/roles/osx/vars/main.yml b/ansible/roles/osx/vars/main.yml
index 2bc7e136..493ed11c 100644
--- a/ansible/roles/osx/vars/main.yml
+++ b/ansible/roles/osx/vars/main.yml
@@ -10,6 +10,7 @@ formulae:
   - the_silver_searcher
   - tmux
   - youtube-dl
+  - zsh
 casks:
   - adium
   - dropbox
diff --git a/ansible/server.yml b/ansible/server.yml
new file mode 100644
index 00000000..b16cdf15
--- /dev/null
+++ b/ansible/server.yml
@@ -0,0 +1,13 @@
+---
+- sudo: True
+  tasks:
+  - name: update and upgrade packages
+    apt: update_cache=yes upgrade=yes
+  - name: install packages
+    apt: pkg={{ item }} state=present
+    with_items:
+      - git
+      - golang
+      - nginx
+      - stow
+      - tmux
diff --git a/ansible/setup.yml b/ansible/setup.yml
new file mode 100644
index 00000000..4d723eee
--- /dev/null
+++ b/ansible/setup.yml
@@ -0,0 +1,5 @@
+- hosts: test
+  sudo: True
+  tasks:
+  - name: apt-get update
+    apt: update_cache=yes
diff --git a/ansible/sudo.yml b/ansible/sudo.yml
new file mode 100644
index 00000000..28177bb3
--- /dev/null
+++ b/ansible/sudo.yml
@@ -0,0 +1,16 @@
+- hosts: prgmr
+  tasks:
+  - name: setup sudo
+    apt: pkg=sudo state=latest
+  - name: add users to sudo group
+    user: name={{ item }} append=yes groups=sudo state=present
+    with_items:
+      - alpha
+  - name: copy sudoers file
+    command: cp -f /etc/sudoers /tmp/sudoers
+  - name: backup sudoers file
+    command: cp -f /tmp/sudoers /tmp/sudoers.bak
+  - name: don't require a password for sudo group in /tmp/sudoers
+    lineinfile: "dest=/tmp/sudoers state=present regexp='^%sudo' line='%sudo  ALL=(ALL:ALL) NOPASSWD: ALL'"
+  - name: check /tmp/sudoers and update /etc/sudoers
+    shell: visudo -qcf /tmp/sudoers && cp -f /tmp/sudoers /etc/sudoers