aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorTucker Evans <tuckerevans24@gmail.com>2018-03-07 20:55:00 -0500
committerTucker Evans <tuckerevans24@gmail.com>2018-03-07 20:55:00 -0500
commit9e3771d19c02892119be2140e7c8303ebd01041d (patch)
tree9695804c14701d8bd20646bab2fb9d0a4af1ac2d /vim
parent4f3b29401c7ff6b42a84b9aca53877783212ec5d (diff)
parentd2caf851eac8284d134f5a440b65a492dd08039f (diff)
Merge branch 'ursa_minor'
Diffstat (limited to 'vim')
-rw-r--r--vim/.vim/after/asm.vim1
-rw-r--r--vim/.vim/after/c.vim1
-rw-r--r--vim/.vim/after/ftplugin/asm.vim0
-rw-r--r--vim/.vim/after/ftplugin/by.vim (renamed from vim/.vim/after/by.vim)0
-rw-r--r--vim/.vim/after/ftplugin/c.vim2
-rw-r--r--vim/.vim/after/ftplugin/go.vim2
-rw-r--r--vim/.vim/after/ftplugin/java.vim2
-rw-r--r--vim/.vim/after/ftplugin/tex.vim (renamed from vim/.vim/after/tex.vim)0
-rw-r--r--vim/.vim/after/ftplugin/tr.vim (renamed from vim/.vim/after/tr.vim)0
-rw-r--r--vim/.vim/after/ftplugin/txt.vim (renamed from vim/.vim/after/txt.vim)1
-rw-r--r--vim/.vim/after/go.vim1
-rw-r--r--vim/.vim/after/java.vim1
m---------vim/.vim/pack/tje/start/wordCount.vim0
-rw-r--r--vim/.vimrc5
14 files changed, 10 insertions, 6 deletions
diff --git a/vim/.vim/after/asm.vim b/vim/.vim/after/asm.vim
deleted file mode 100644
index 3202f68..0000000
--- a/vim/.vim/after/asm.vim
+++ /dev/null
@@ -1 +0,0 @@
-set nospell
diff --git a/vim/.vim/after/c.vim b/vim/.vim/after/c.vim
deleted file mode 100644
index d1aafd8..0000000
--- a/vim/.vim/after/c.vim
+++ /dev/null
@@ -1 +0,0 @@
-set tw=0
diff --git a/vim/.vim/after/ftplugin/asm.vim b/vim/.vim/after/ftplugin/asm.vim
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/.vim/after/ftplugin/asm.vim
diff --git a/vim/.vim/after/by.vim b/vim/.vim/after/ftplugin/by.vim
index 7f2b61c..7f2b61c 100644
--- a/vim/.vim/after/by.vim
+++ b/vim/.vim/after/ftplugin/by.vim
diff --git a/vim/.vim/after/ftplugin/c.vim b/vim/.vim/after/ftplugin/c.vim
new file mode 100644
index 0000000..736e482
--- /dev/null
+++ b/vim/.vim/after/ftplugin/c.vim
@@ -0,0 +1,2 @@
+set tw=0
+set cindent
diff --git a/vim/.vim/after/ftplugin/go.vim b/vim/.vim/after/ftplugin/go.vim
new file mode 100644
index 0000000..736e482
--- /dev/null
+++ b/vim/.vim/after/ftplugin/go.vim
@@ -0,0 +1,2 @@
+set tw=0
+set cindent
diff --git a/vim/.vim/after/ftplugin/java.vim b/vim/.vim/after/ftplugin/java.vim
new file mode 100644
index 0000000..736e482
--- /dev/null
+++ b/vim/.vim/after/ftplugin/java.vim
@@ -0,0 +1,2 @@
+set tw=0
+set cindent
diff --git a/vim/.vim/after/tex.vim b/vim/.vim/after/ftplugin/tex.vim
index 87f4512..87f4512 100644
--- a/vim/.vim/after/tex.vim
+++ b/vim/.vim/after/ftplugin/tex.vim
diff --git a/vim/.vim/after/tr.vim b/vim/.vim/after/ftplugin/tr.vim
index 87f4512..87f4512 100644
--- a/vim/.vim/after/tr.vim
+++ b/vim/.vim/after/ftplugin/tr.vim
diff --git a/vim/.vim/after/txt.vim b/vim/.vim/after/ftplugin/txt.vim
index 87f4512..7dcafeb 100644
--- a/vim/.vim/after/txt.vim
+++ b/vim/.vim/after/ftplugin/txt.vim
@@ -1 +1,2 @@
set spell
+set tw=70
diff --git a/vim/.vim/after/go.vim b/vim/.vim/after/go.vim
deleted file mode 100644
index d1aafd8..0000000
--- a/vim/.vim/after/go.vim
+++ /dev/null
@@ -1 +0,0 @@
-set tw=0
diff --git a/vim/.vim/after/java.vim b/vim/.vim/after/java.vim
deleted file mode 100644
index d1aafd8..0000000
--- a/vim/.vim/after/java.vim
+++ /dev/null
@@ -1 +0,0 @@
-set tw=0
diff --git a/vim/.vim/pack/tje/start/wordCount.vim b/vim/.vim/pack/tje/start/wordCount.vim
new file mode 160000
+Subproject c8f8f3cc66270fe0dff7de738280d049632ceae
diff --git a/vim/.vimrc b/vim/.vimrc
index 29c7e9f..9077239 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,10 +6,9 @@ set lazyredraw
set incsearch
set hlsearch
set autoindent
-set cindent
set scrolloff=3
set spelllang=en
-"set spell
+set spell
set tw=70
set ruler
@@ -17,8 +16,10 @@ set list
set listchars=eol:\ ,tab:\|\ ,trail:~,extends:>,precedes:<,space:ยท
map K i<enter><esc>
+map W <esc>:WordCount<enter>
colorscheme default
au BufRead,BufNewFile *.go set filetype=go
+set statusline+=%{WordCount#WordCount()}