feature/regular changes and fixes (#30)

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

* mac updates

Author: dbenedic-insight

roles/bootstrap/tasks/darwin.yml

@@ -54,12 +54,11 @@
 - 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 jq
   homebrew:

roles/git/tasks/darwin.yml

@@ -15,3 +15,14 @@
   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 }}

roles/misc/tasks/darwin.yml

@@ -22,10 +22,10 @@
     name: kubernetes-cli
     state: latest
 
-- name: install k9s
-  homebrew:
-    name: derailed/k9s/k9s
-    state: latest
+      #- name: install k9s
+      #  homebrew:
+      #    name: derailed/k9s/k9s
+      #    state: latest
 
 - name: install kubectx
   homebrew:
@@ -50,4 +50,4 @@
   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,19 +1,14 @@
 ---
-- name: install pyenv
-  homebrew:
-    name: pyenv
-    state: latest
-
-- name: shim pyenv into ~/.profile
-  lineinfile:
-    path: "/Users/{{ ansible_user_id }}/.profile"
-    line: "export PATH=${PATH}:$(pyenv root)/shims"
-    regexp: "^export PATH=${PATH}"
-
-- name: Add pyenv to .profile
-  lineinfile:
-    dest: "/Users/{{ ansible_user_id }}/.profile"
-    line: 'eval "$(pyenv init -)"'
+#- name: shim pyenv into ~/.profile
+#  lineinfile:
+#    path: "/Users/{{ ansible_user_id }}/.profile"
+#    line: "export PATH=${PATH}:$(pyenv root)/shims"
+#    regexp: "^export PATH=${PATH}"
+#
+#- name: Add pyenv to .profile
+#  lineinfile:
+#    dest: "/Users/{{ ansible_user_id }}/.profile"
+#    line: 'eval "$(pyenv init -)"'
 
 # NOTE: CFLAGS="-I$(xcrun --show-sdk-path)/usr/include" pyenv install 3.7.3
 # If you're getting compilation errors caused by xcode cli tools

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'