update dotfiles

group_vars/local

@@ -8,18 +8,18 @@ dotfiles_user_home: "{{ '~' | expanduser }}"
 dotfiles_home: "{{dotfiles_user_home}}/dotfiles"
 
 # Name used in commit messages
-full_name: Steven Loria
+full_name: First Last
 # Git
 # Github username
-git_user: sloria
+git_user: username
 # If you use github, this should be the same as the email
 #  used on Github
-git_email: sloria1@gmail.com
+git_email: user@example.com
 
 # Vim
 
 # Only applies to OSX. Ignored on other platforms.
-vim_install_macvim: yes
+vim_install_macvim: no
 # Whether to install plugins automatically. If not, just run
 # :PlugInstall while in vim.
 vim_install_plugins: no
@@ -33,29 +33,30 @@ osx_homebrew_packages:
 
 # Mac Apps to be installed with homebrew-cask
 osx_cask_packages:
+  # QuickLook
+  - qlcolorcode
+  - qlstephen
+  - qlmarkdown
+  - quicklook-json
+  - qlprettypatch
+  - quicklook-csv
+  - betterzipql
+  - qlimagesize
+  - webpquicklook
+  - suspicious-package
   # Browsers
   - firefox
   - google-chrome
   # Utilities
   - bettertouchtool
   - iterm2
-  - caffeine
-  - flux
   # Vagrant/Virtualbox
   - vagrant
   - virtualbox
   # chat
   - limechat
-  - flowdock
-  # Password manager
-  - 1password
   # Backup/storage
-  - crashplan
-  - dropbox
-  # Music
-  - spotify
-  # Notetaking
-  - evernote
+  # - crashplan
 
 # Node utilities
 npm_global_packages:
@@ -64,4 +65,3 @@ npm_global_packages:
   - coffee-script
   - bower
   - jsxhint
-  - webpack

group_vars/remote

@@ -1,16 +1,16 @@
 # vi: set ft=yaml :
 
 # Home directory on remote machines
-dotfiles_user_home: /home/sloria
+dotfiles_user_home: "{{ '~' | expanduser }}"
 # Where your dotfiles live. Probably don't need to change this.
 dotfiles_home: "{{dotfiles_user_home}}/dotfiles"
 
 # Git
 # Name used in commit messages
-full_name: Steven Loria
-git_user: sloria
+full_name: First Last
+git_user: username
 # If you use github, this should be the same as the email
 #  used on Github
-git_email: sloria1@gmail.com
+git_email: user@example.com
 
 tmux_install_tmuxinator: false

local_env.yml

@@ -11,10 +11,10 @@
     - vim
     - python
     - npm
-    - hub
+    # - hub
     - autoenv
     - ag
     - tmux
     - git-flow
     - {role: osx, when: ansible_os_family == "Darwin"}
-
+    - {role: hammerspoon, when: ansible_os_family == "Darwin"}

remote_env.yml

@@ -10,7 +10,7 @@
     # and symlinks are present
     - name: Clone dotfiles repo
       git:
-        repo: https://github.com/sloria/dotfiles.git
+        repo: "https://github.com/{{git_user}}/dotfiles.git"
         dest: "{{dotfiles_user_home}}/dotfiles"
 
 - name: Set up remote development environments (roles)

roles/git/files/gitignore_global.link

@@ -1,28 +1,69 @@
-########## Generated by gig 0.2.0 ###########
+# Created by https://www.gitignore.io
 
 ### OSX ###
 .DS_Store
 .AppleDouble
 .LSOverride
+
+# Icon must end with two \r
 Icon
 
 
 # Thumbnails
 ._*
 
-# Files that might appear on external disk
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
 .Spotlight-V100
+.TemporaryItems
 .Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Windows ###
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+.ipynb_checkpoints/
+
+
+### Vagrant ###
+.vagrant/
+
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+*.iml
+.idea/
+
 
 ### SublimeText ###
-# SublimeText project files
-*.sublime-workspace
+# cache files for sublime text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
 
-## autoenv ##
-.env
-.ropeproject
+# workspace files are user-specific
+*.sublime-workspace
 
-# Sandbox for notes, throwaway scripts, etc.
-_sandbox
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
 
-.ipynb_checkpoints

roles/git/templates/gitconfig.j2

@@ -18,6 +18,7 @@
         noff = merge --no-ff
         amend = commit --amend
         br = branch
+        d = diff
         df = diff
         dfs = diff --staged
         pl = pull
@@ -59,11 +60,24 @@
         status = auto
         branch = auto
         ui = true
+[color "branch"]
+        current = yellow reverse
+        local = yellow
+        remote = green
+[color "diff"]
+        meta = yellow bold
+        frag = magenta bold
+        old = red bold
+        new = green bold
+[color "status"]
+        added = yellow
+        changed = green
+        untracked = cyan
 [core]
         excludesfile = ~/.gitignore_global
         editor = vim
 [apply]
-        whitespace = nowarn
+        whitespace = warn
 [mergetool]
         keepBackup = false
 [difftool]