From 906de36bbc4f848c8745488b9d1b06668a374568 Mon Sep 17 00:00:00 2001
From: mitchell <mitchelljfsimon@gmail.com>
Date: Thu, 13 Feb 2020 08:25:24 -0500
Subject: [PATCH] Change prompt git check; Remove vim ctrl-w alias and vimwiki
 index remap

---
 .config/fish/functions/fish_prompt.fish | 2 +-
 .gitmodules                             | 3 +++
 .vim/bundle/vim-terraform               | 1 +
 .vimrc                                  | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 160000 .vim/bundle/vim-terraform

diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
index 2e11e93..349cb18 100644
--- a/.config/fish/functions/fish_prompt.fish
+++ b/.config/fish/functions/fish_prompt.fish
@@ -61,7 +61,7 @@ function fish_prompt --description 'Write out the prompt'
     if test -n "$SSH_CLIENT"; set user_prefix $USER @ (prompt_hostname) ' '; end
 
     # Show current git branch, based on git commands only.
-    if test -e ./.git; and command -sq git
+    if git status > /dev/null 2>&1
         set -l branch_color green
         set -l git_status (git status)
 
diff --git a/.gitmodules b/.gitmodules
index 4db6fa5..f8d2149 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,3 +76,6 @@
 [submodule ".vim/bundle/vim-fsharp"]
 	path = .vim/bundle/vim-fsharp
 	url = https://github.com/fsharp/vim-fsharp.git
+[submodule ".vim/bundle/vim-terraform"]
+	path = .vim/bundle/vim-terraform
+	url = https://github.com/hashivim/vim-terraform.git
diff --git a/.vim/bundle/vim-terraform b/.vim/bundle/vim-terraform
new file mode 160000
index 0000000..c8c9bbd
--- /dev/null
+++ b/.vim/bundle/vim-terraform
@@ -0,0 +1 @@
+Subproject commit c8c9bbd70da65e2c0bcba2947c4061a7c3e24e69
diff --git a/.vimrc b/.vimrc
index f69f6f5..e269f2d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -44,7 +44,6 @@ inoremap <leader>j <Esc>
 
 let mapleader = ','
 nnoremap <leader>n :NERDTree<cr>
-nnoremap <leader>w <C-w>
 nnoremap <leader>p :FZF<cr>
 nnoremap <leader>g :ALEGoToDefinition<cr>
 nnoremap <leader>r :ALEFindReferences<cr>
@@ -52,7 +51,6 @@ nnoremap <leader>d :ALEDetail<cr>
 nnoremap <leader>h :ALEHover<cr>
 nnoremap <leader>a :Ack<cr>
 nnoremap <leader>we :VimwikiAll2HTML<cr>
-nmap <leader>wk <Plug>VimwikiIndex
 
 " next line is necessary to prevent background rendering bug with kitty term
 let &t_ut=''
@@ -78,6 +76,7 @@ let g:ale_linters = {
 \   'vim': ['vint'],
 \   'elixir': ['credo', 'elixir-ls'],
 \   'cs': ['OmniSharp'],
+\   'terraform': ['terraform', 'tflint'],
 \}
 
 
@@ -93,6 +92,7 @@ let g:ale_fixers = {
 \   'html': ['prettier'],
 \   'make': ['remove_trailing_lines', 'trim_whitespace'],
 \   'elixir': ['mix_format'],
+\   'terraform': ['terraform'],
 \}
 
 let g:ale_fix_on_save = 1