From f7b0d0b1ddda0afd49d43e210047cef9178debd8 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Fri, 18 Dec 2020 21:14:59 -0500
Subject: [PATCH] move after/ftplugins to autocmds

---
 files/vim/.vim/after/ftplugin/css.vim      |  0
 files/vim/.vim/after/ftplugin/go.vim       |  4 --
 files/vim/.vim/after/ftplugin/html.vim     |  2 -
 files/vim/.vim/after/ftplugin/markdown.vim |  2 -
 files/vim/.vim/after/ftplugin/python.vim   |  2 -
 files/vim/.vim/autocmds.vim                | 59 ++++++++++++++++++----
 6 files changed, 50 insertions(+), 19 deletions(-)
 delete mode 100644 files/vim/.vim/after/ftplugin/css.vim
 delete mode 100644 files/vim/.vim/after/ftplugin/go.vim
 delete mode 100644 files/vim/.vim/after/ftplugin/html.vim
 delete mode 100644 files/vim/.vim/after/ftplugin/markdown.vim
 delete mode 100644 files/vim/.vim/after/ftplugin/python.vim

diff --git a/files/vim/.vim/after/ftplugin/css.vim b/files/vim/.vim/after/ftplugin/css.vim
deleted file mode 100644
index e69de29..0000000
diff --git a/files/vim/.vim/after/ftplugin/go.vim b/files/vim/.vim/after/ftplugin/go.vim
deleted file mode 100644
index c436fc0..0000000
--- a/files/vim/.vim/after/ftplugin/go.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-"settings
-set noexpandtab
-let g:go_auto_type_info = 1
-let g:go_imports_autosave = 1
diff --git a/files/vim/.vim/after/ftplugin/html.vim b/files/vim/.vim/after/ftplugin/html.vim
deleted file mode 100644
index d04980e..0000000
--- a/files/vim/.vim/after/ftplugin/html.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-"syntax
-syntax sync fromstart
diff --git a/files/vim/.vim/after/ftplugin/markdown.vim b/files/vim/.vim/after/ftplugin/markdown.vim
deleted file mode 100644
index 3850c70..0000000
--- a/files/vim/.vim/after/ftplugin/markdown.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-"settings
-setlocal spell
diff --git a/files/vim/.vim/after/ftplugin/python.vim b/files/vim/.vim/after/ftplugin/python.vim
deleted file mode 100644
index 10951b7..0000000
--- a/files/vim/.vim/after/ftplugin/python.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-"keymaps
-xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
diff --git a/files/vim/.vim/autocmds.vim b/files/vim/.vim/autocmds.vim
index a649cab..8e8e66e 100644
--- a/files/vim/.vim/autocmds.vim
+++ b/files/vim/.vim/autocmds.vim
@@ -1,5 +1,38 @@
 if has("autocmd")
-    "global
+    "filetype functions
+    "------------------
+    function FT_halftab()
+        setlocal expandtab
+        setlocal tabstop=2
+        setlocal softtabstop=2
+        setlocal shiftwidth=2
+    endfunction
+
+    function FT_python()
+        setlocal autoindent
+        setlocal formatprg=yapf
+        iabbr false False
+        iabbr true True
+
+        xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
+    endfunction
+
+    function FT_go()
+        set noexpandtab
+        let g:go_auto_type_info = 1
+        let g:go_imports_autosave = 1
+    endfunction
+
+    function FT_html()
+        syntax sync fromstart
+    endfunction
+
+    function FT_markdown()
+        setlocal spell
+    endfunction
+
+    "global autocmds
+    "-----------------
     augroup global
         autocmd!
         "keep equal proportions when windows resized
@@ -9,18 +42,14 @@ if has("autocmd")
                     \ <= line("$") | exe "normal! g'\"" | endif
     augroup END
 
+    "general filetype autocmds
+    "-------------------------
     augroup emmet_group
         autocmd!
         autocmd FileType html,css EmmetInstall
     augroup END
 
-    augroup indent_group
-        autocmd!
-        autocmd FileType html,css,scss,javascript,json,toml,yaml
-                    \ setlocal ts=2 sts=2 sw=2 expandtab
-    augroup END
-
-    augroup format_group
+    augroup prettier_format_group
         autocmd!
         autocmd FileType javascript setlocal formatprg=prettier
         autocmd FileType typescript setlocal formatprg=prettier\ --parser\ typescript
@@ -31,7 +60,19 @@ if has("autocmd")
         autocmd FileType markdown setlocal formatprg=prettier\ --parser\ markdown
         autocmd FileType json setlocal formatprg=prettier\ --parser\ json
         autocmd FileType yaml setlocal formatprg=prettier\ --parser\ yaml
-        autocmd FileType python setlocal formatprg=yapf
     augroup END
 
+    augroup halftab_indent_group
+        autocmd!
+        autocmd FileType sh,bash,html,css,scss,javascript,json,toml,yaml call FT_halftab()
+    augroup END
+
+    "language specific autocmds
+    "--------------------------
+    augroup language_group
+        autocmd FileType python call FT_python()
+        autocmd FileType go call FT_go()
+        autocmd FileType html call FT_html()
+        autocmd FileType markdown call FT_markdown()
+    augroup END
 endif