updates

gitconfig

@@ -3,10 +3,13 @@
 	email = [email protected]
 [credential]
         helper = osxkeychain
+
 [core]
         editor = /usr/local/bin/nvim
 	excludesfile = ~/.dotfiles/gitignore_global
 	autocrlf = input
+	fsmonitor = true
+
 [format]
         signoff = true
 

my-config/iterm.settings/com.googlecode.iterm2.plist

@@ -5674,7 +5674,7 @@
 			<key>ASCII Anti Aliased</key>
 			<true/>
 			<key>ASCII Ligatures</key>
-			<false/>
+			<true/>
 			<key>Allow Title Reporting</key>
 			<true/>
 			<key>Ambiguous Double Width</key>
@@ -6226,13 +6226,13 @@
 			<key>Name</key>
 			<string>Default</string>
 			<key>Non Ascii Font</key>
-			<string>DroidSansMonoNerdFontComplete- 11</string>
+			<string>DroidSansMonoNerdFontCompleteM-Regular 11</string>
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Non-ASCII Ligatures</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>FiraCode-Regular 12</string>
+			<string>DroidSansMonoNerdFontComplete-Regular 12</string>
 			<key>Option Key Sends</key>
 			<integer>2</integer>
 			<key>Prompt Before Closing 2</key>
@@ -7242,10 +7242,11 @@
 	<integer>10</integer>
 	<key>ToolbeltTools</key>
 	<array>
-		<string>Jobs</string>
 		<string>Notes</string>
 		<string>Paste History</string>
-		<string>Profiles</string>
+		<string>Jobs</string>
+		<string>Snippets</string>
+		<string>Actions</string>
 	</array>
 	<key>TripleClickSelectsFullWrappedLines</key>
 	<false/>

nvimrc

@@ -555,13 +555,6 @@ endfun
 
 " = Plugins setup = {{{
 " =====================
-let g:nvim_tree_show_icons = {
-    \ 'git': 1,
-    \ 'folders': 1,
-    \ 'files': 1,
-    \ 'folder_arrows': 1,
-    \ }
-
 lua << EOF
   require('nvim-web-devicons').setup()
   require('telescope').setup()
@@ -722,7 +715,8 @@ lua << EOF
     vim.cmd [[ command! Format execute 'lua vim.lsp.buf.formatting()' ]]
   end
 
-  local servers = { 'bashls', 'dockerls', 'jsonls', 'vimls', 'terraformls', 'jedi_language_server' }
+  local servers = { 'bashls', 'dockerls', 'jsonls', 'vimls', 'jedi_language_server', 'terraformls' }
+  -- removed 'terraformls',  as it makes the editor slow
   for _, lsp in ipairs(servers) do
     lspconfig[lsp].setup {
       on_attach = on_attach,
@@ -733,7 +727,7 @@ autocmd BufWritePre *.tf lua vim.lsp.buf.formatting_sync()
 
 " Indent Settings
 let g:indent_blankline_filetype_exclude = ['help', 'nerdtree', 'git', 'vim-plug', 'man', 'lspinfo', 'packer', 'checkhealth', 'NvimTree']
-
+let g:indent_blankline_use_treesitter_scope = v:true
 
 " Number Toggle
 let g:NumberToggleTrigger="<localleader>n"
@@ -823,8 +817,6 @@ if has('dontdoathis') " TODO: do I need this?
 " ----------------------------------------------------------
 " setup the projects: https://github.com/amiorin/vim-project
 " ----------------------------------------------------------
-" Enable Nerd treee
-let g:project_use_nerdtree = 1
 
 " Set my starting path
 call project#rc("~/work/")

setup-scripts/Brewfile

@@ -84,19 +84,19 @@ $(brew info fzf | grep /install)
 #brew install docker-clean
 brew install lazygit lazydocker skanehira/docui/docui gitui
 #brew install liamg/tfsec/tfsec
-#brew install tflint
-#brew install pre-commit
+brew install tflint
+brew install pre-commit
 #npm install -g markdown-link-check
 #kube-aws gimme-aws-creds awsume
 brew install tfenv
 brew install iam-policy-json-to-terraform
 brew install minamijoyo/tfupdate/tfupdate # a tool to update TF version constraints
 brew install hashicorp/tap/terraform-ls
+brew install thecasualcoder/stable/tf-summarize
 
 # TF tools to test:
 #https://github.com/flosell/iam-policy-json-to-terraform
 #https://github.com/minamijoyo/tfschema
-#https://github.com/minamijoyo/tfupdate
 #https://github.com/hieven/terraform-visual
 
 # Security Tools

setup-scripts/Nativefierfile

@@ -1,7 +1,7 @@
 # Create OSX icons: https://iconverticons.com/online/
 MY_APPS_DIR="$HOME/myapps"
-#mkdir $MY_APPS_DIR
-nativefier --name Gmail --show-menu-bar --user-agent firefox --internal-urls ".*?\.google\.*?" https://www.gmail.com "$MY_APPS_DIR"
+mkdir $MY_APPS_DIR
+nativefier --name Gmail --show-menu-bar --internal-urls ".*?\.google\.*?" "https://mail.google.com/" "$MY_APPS_DIR"
 #nativefier --name TweetDeck https://tweetdeck.twitter.com "$MY_APPS_DIR"
 nativefier --name "Google Calendar" --user-agent firefox --internal-urls ".*\.(okta|google)\..*" --show-menu-bar http://calendar.google.com/ "$MY_APPS_DIR"
 nativefier --name "Google Keep" --internal-urls ".*\.(okta|google)\..*" --show-menu-bar http://keep.google.com/ "$MY_APPS_DIR"

setup-scripts/Pipfile

@@ -1,4 +1,5 @@
-export PATH="/opt/homebrew/opt/[email protected]/libexec/bin:$PATH"
+export PATH="/usr/local/opt/python/libexec/bin/python:$PATH"
+#export PATH="/opt/homebrew/opt/[email protected]/libexec/bin:$PATH"
 # development
 pip install virtualenv
 pip install virtualenvwrapper

sshconfig

@@ -5,3 +5,6 @@ Host *
  UseKeychain yes
 Host github.com
  IdentityFile ~/.ssh/id_ed25519
+
+ host i-* mi-*
+  ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"

terraformrc

@@ -0,0 +1 @@
+plugin_cache_dir = "$HOME/.terraform.d/plugin-cache"

zshrc

@@ -174,6 +174,7 @@ gc() {
 
 alias gc-='git checkout -'
 alias gcd='git checkout develop'
+alias gcs='git checkout staging'
 alias gcm='git checkout master'
 alias gcp='git cherry-pick --signoff -x'
 alias git_commit_files="git diff-tree --no-commit-id --name-status -r"
@@ -357,7 +358,11 @@ ql () { qlmanage -p "$*" >& /dev/null & }
 # Terraform #
 #############
 alias tf-reset="find ~ -type d -name ".terraform" -exec rm -rf {} +"
-alias tfp="terraform plan -out plan.out && terraform show plan.out | less -R"
+tfp() {
+  terraform plan -parallelism=20 -out plan.out $* && terraform show plan.out | less -R
+}
+alias tfsummarize="terraform show -json plan.out | tf-summarize -tree"
+alias tfshow="terraform show plan.out | less -R"
 alias tfv="terraform validate"
 alias tfi="terraform init"
 alias tfc="terraform console"
@@ -466,6 +471,16 @@ aws-login() {
   aws-whoami
 }
 
+aws-change-account() {
+  if [[ "$1" != "" ]]; then
+    profile="$1"
+  else
+    profile="$(aws configure list-profiles | grep --color=none superadmi | fzf)"
+  fi
+
+  export AWS_PROFILE="$profile"
+}
+
 aws-logout() {
   aws sso logout
   unset AWS_PROFILE