A release! (#34)

* cask is already included with homebrew, and pip3 required to run on my machine (#9)

* Macos catalina (#10)

* add alias for git log --graph

* change glog format

* add more mac os catalina fixes

* update .profile

* remove hub alias, add pyenv eval to profile instead of zshrc

* add pre-commit support (#12)

* add pre-commit support (#13)

* add easy align plugin to vim (#14)

* updates to support already installed enterprise apps (#16)

* updates to support already installed enterprise apps

* remove pyenv local version

Co-authored-by: Dave <dave.benedic@insight.com>

* add support for WSL, lint cleanup, README updates (#17)

Co-authored-by: Dave <dave.benedic@insight.com>

* WSL Fixes #1` (#18)

* fix gh gpg, update fonts and zsh tasks

* fix perms on git-credential-manager bin

* update zsh to exec via bash_profile (#19)

* set gh cli editor to vim (#21)

* add direnv to misc role (#22)

Co-authored-by: Dave Benedic <dave.benedic@insight.com>

* move direnv into zsh role, make zsh exec idempotent (#23)

Co-authored-by: Dave <dave.benedic@insight.com>

* change vimrc to templated file, add WSL keybinding maps (#24)

Co-authored-by: Dave <dave.benedic@insight.com>

* add syntax settings for .hcl files (#25)

Co-authored-by: Dave <dave.benedic@insight.com>

* bug/homebrew dir (#27)

* add privs, add gh cli

* fix mac bugs, remove old software, add wsl defaults

Co-authored-by: Dave <dave.benedic@insight.com>

* add explicit pip3 on powerline install

* feature/regular changes and fixes (#30)

* change vim theme, working through ~/.profile issues in bootstrap

* mac updates

* Feature/regular changes and fixes (#31)

* change vim theme, working through ~/.profile issues in bootstrap

* mac updates

Co-authored-by: Dave <dave.benedic@insight.com>

* Feature/mac updates (#32)

* fix pyenv on mac, add coreutils to bootstrap

* ignore privs app check errors

* re-add k9s, fix some weirdness, update gitconfig to include pull block

Co-authored-by: Dave <dave.benedic@insight.com>

* fix pyenv on mac, add coreutils to bootstrap (#33)

Co-authored-by: Dave <dave.benedic@insight.com>

Co-authored-by: Michael Meadows <michaelmeadows@gmail.com>
Co-authored-by: Dave <dave.benedic@insight.com>
Co-authored-by: Dave Benedic <59837728+dbenedic-insight@users.noreply.github.com>

Author: 3 people

roles/bootstrap/tasks/darwin.yml

@@ -36,6 +36,39 @@
         path: /usr/local/homebrew
       register: homebrew
 
+    - name: rm -rf /usr/local/homebrew
+      file:
+        path: /usr/local/homebrew
+        state: absent
+      when: homebrew.stat.exists
+      become: yes
+
+    - name: ensure homebrew dir exists
+      file:
+        path: /usr/local/homebrew
+        state: directory
+        mode: 0755
+        owner: "{{ ansible_user_id }}"
+        group: "{{ ansible_user_gid }}"
+      become: yes
+
+    - shell: cd /usr/local/src && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C /usr/local/homebrew
+
+    - shell: sudo chown -R $(whoami) /usr/local/share/man/man8
+
+    - name: check if man8 file exists
+      stat:
+        path: /usr/local/share/man/man8
+      register: man8
+      ignore_errors: yes
+
+    - name: change ownership on man8
+      file:
+        path: /usr/local/share/man/man8
+        owner: "{{ ansible_user_id }}"
+      when: man8.stat.exists
+      become: yes
+
     - shell: rm -rf /usr/local/homebrew
       when: homebrew.stat.exists
       become: yes
@@ -54,12 +87,16 @@
 - name: add homebrew binaries to path
   copy:
     dest: "/Users/{{ ansible_user_id }}/.profile"
-    content: PATH=$PATH:/usr/local/homebrew/bin
+    content: export PATH=$PATH:/usr/local/homebrew/bin
 
 - name: update homebrew
   homebrew:
     update_homebrew: yes
-    upgrade_all: yes
+
+- name: install coreutils
+  homebrew:
+    name: coreutils
+    state: latest
 
 - name: install jq
   homebrew:

roles/git/tasks/darwin.yml

@@ -15,3 +15,20 @@
   homebrew:
     name: pre-commit
     state: latest
+
+# http://pre-commit.com
+- name: install pre-commit for git
+  homebrew:
+    name: pre-commit
+    state: latest
+
+# Manages HTTPS-based credentials (required for many SSO orgs)
+- name: install microsoft's git-credential-manager-core
+  block:
+    - name: tap microsoft git homebrew
+      homebrew_tap:
+        name: microsoft/git
+
+    - name: install cask
+      homebrew_cask:
+        name: git-credential-manager-core

roles/git/templates/gitconfig.j2

@@ -3,6 +3,11 @@
   helper = manager
   useHttpPath = true
 {% endif %}
+{% if ansible_system == "Darwin" %}
+[credential]
+  helper = manager-core
+  useHttpPath = true
+{% endif %}
 [user]
   name = {{ git_user }}
   email = {{ git_email }}
@@ -30,3 +35,5 @@
   pager = cat
 [push]
   default = upstream
+[pull]
+  rebase = false

roles/misc/tasks/darwin.yml

@@ -24,7 +24,7 @@
 
 - name: install k9s
   homebrew:
-    name: derailed/k9s/k9s
+    name: k9s
     state: latest
 
 - name: install kubectx
@@ -45,9 +45,10 @@
 - name: check if privileges cli app is installed (corporate nanny)
   command: /Applications/Privileges.app/Contents/Resources/PrivilegesCLI --help
   register: privs_install_check
+  ignore_errors: yes
 
 - name: add privileges app alias
   lineinfile:
     dest: "~/.zshrc"
     line : alias privs=/Applications/Privileges.app/Contents/Resources/PrivilegesCLI
-  when: privs_install_check.rc == 1
+  when: privs_install_check.rc == 0

roles/python/tasks/darwin.yml

@@ -1,9 +1,4 @@
 ---
-- name: install pyenv
-  homebrew:
-    name: pyenv
-    state: latest
-
 - name: shim pyenv into ~/.profile
   lineinfile:
     path: "/Users/{{ ansible_user_id }}/.profile"

roles/term/tasks/darwin.yml

@@ -1,8 +1,4 @@
 ---
-- name: install iterm2
-  shell: brew cask install iterm2
-  ignore_errors: yes
-
 - name: install zsh syntax highlighting
   homebrew:
     name: zsh-syntax-highlighting

roles/vim/tasks/main.yml

@@ -72,3 +72,8 @@
     repo: https://github.com/inkarkat/vim-ShowTrailingWhitespace
     dest: ~/.vim/bundle/vim-ShowTrailingWhitespace
     version: "stable"
+
+- name: clone colorscheme to ~/.vim/bundle/
+  git:
+    repo: https://github.com/morhetz/gruvbox.git
+    dest: ~/.vim/bundle/gruvbox

roles/vim/templates/vimrc.j2

@@ -5,7 +5,7 @@ filetype plugin indent on
 
 " editor settings
 set nu
-set ts=2 sts=2 sw=2 expandtab 
+set ts=2 sts=2 sw=2 expandtab
 autocmd vimenter * NERDTree
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif
@@ -21,6 +21,21 @@ endfunction
 call NERDTreeHighlightFile('yml', 'yellow', 'none', 'yellow', '#151515')
 let g:NERDTreeNodeDelimiter = "\u00a0"
 
+:set guicursor=n-v-c:blinkon0-block-Cursor/lCursor
+
+" Use a line cursor within insert mode and a block cursor everywhere else.
+"
+" Reference chart of values:
+"   Ps = 0  -> blinking block.
+"   Ps = 1  -> blinking block (default).
+"   Ps = 2  -> steady block.
+"   Ps = 3  -> blinking underline.
+"   Ps = 4  -> steady underline.
+"   Ps = 5  -> blinking bar (xterm).
+"   Ps = 6  -> steady bar (xterm).
+let &t_SI = "\e[6 q"
+let &t_EI = "\e[2 q"
+
 " filetype settings
 
 " plugins
@@ -62,3 +77,6 @@ highlight ShowTrailingWhitespace ctermbg=Red guibg=Red
 " WSL/Windows keybinding overrides
 :imap <silent> <C-v> <C-ALT-v>
 {% endif %}
+
+" gruvbox
+autocmd vimenter * ++nested colorscheme gruvbox

roles/zsh/tasks/main.yml

@@ -28,6 +28,12 @@
     line: 'source ~/.profile'
     state: present
 
+- name: Download theme
+  get_url:
+    url: "{{ zsh_theme_url }}"
+    dest: "{{ local_omz_repo }}/themes/"
+  when: zsh_theme_url != ""
+
 - name: Set zsh theme
   lineinfile:
     dest: "~/.zshrc"

roles/zsh/vars/main.yml

@@ -1,4 +1,5 @@
 ---
 omz_repo: 'https://github.com/robbyrussell/oh-my-zsh.git'
 local_omz_repo: "~/.oh-my-zsh"
-zsh_theme: 'agnoster'
+zsh_theme: 'minimal_improved'
+zsh_theme_url: 'https://raw.githubusercontent.com/gdsrosa/minimal_improved/master/minimal_improved.zsh-theme'