From 0cebe649234405566d480c740f23e83e0a532e74 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Mon, 15 Jun 2020 00:35:53 -0400
Subject: [PATCH] fix some busted settings

---
 vim/vimrc     | 20 +++++++++++---------
 vim/vimrc.min |  7 +------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 1fe1661..00319cd 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -66,10 +66,15 @@ function! SetPluginSettings()
 
     "ale
     if exists(':ALEToggle')
+        let g:ale_linters = {
+        \   'javascript': ['eslint'],
+        \   'markdown': ['mdl', 'write-good'],
+        \}
         let g:ale_fixers = {
-                    \   '*': ['remove_trailing_lines', 'trim_whitespace'],
-                    \   'javascript': ['eslint'],
-                    \}
+        \   '*': ['remove_trailing_lines', 'trim_whitespace'],
+        \   'javascript': ['prettier'],
+        \   'markdown': ['prettier'],
+        \}
         let g:ale_sign_error = '->'
         let g:ale_sign_warning = '--'
     endif
@@ -79,6 +84,7 @@ function! SetPluginSettings()
     "colorscheme gruvbox
     "colorscheme jellybeans
     "colorscheme molokai
+    colorscheme monokai-phoenix
     "colorscheme Benokai
     "colorscheme Monokai
     "colorscheme badwolf
@@ -103,6 +109,7 @@ set number
 set wrap
 set showbreak=↪\
 set listchars=tab:→\ ,extends:›,precedes:‹,nbsp:·,trail:·,eol:¬
+set list
 set foldmethod=marker
 set lazyredraw
 set regexpengine=1
@@ -283,15 +290,10 @@ if has("autocmd")
     "language/filetype
     augroup languages
         autocmd!
-        "shell
         autocmd BufNewFile,BufRead *bash* set syntax=sh
-        "python
         autocmd FileType python xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
-        "go
-        autocmd FileType go set expandtab! "go uses real tabs
-        "html
+        autocmd FileType go set noexpandtab
         autocmd FileType html :syntax sync fromstart
-        "filestypes where tabs should = 2 spaces
         autocmd FileType html,javascript,css,json,yaml,sh
                     \ setlocal ts=2 sts=2 sw=2 expandtab
     augroup END
diff --git a/vim/vimrc.min b/vim/vimrc.min
index 6a205d6..d9c68c7 100644
--- a/vim/vimrc.min
+++ b/vim/vimrc.min
@@ -54,15 +54,10 @@ augroup END
 
 augroup languages
     autocmd!
-    "shell
     autocmd BufNewFile,BufRead *bash* set syntax=sh
-    "python
     autocmd FileType python xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
-    "go
-    autocmd FileType go set expandtab! "go uses real tabs
-    "html
+    autocmd FileType go set noexpandtab
     autocmd FileType html :syntax sync fromstart
-    "filestypes where tabs should = 2 spaces
     autocmd FileType html,javascript,css,json,yaml,sh
                 \ setlocal ts=2 sts=2 sw=2 expandtab
 augroup END