summaryrefslogtreecommitdiff
path: root/general
diff options
context:
space:
mode:
authorChris <[email protected]>2020-08-07 23:20:01 -0400
committerChris <[email protected]>2020-08-07 23:20:01 -0400
commit8c7703d72e3b554a95f9f6a4e612a8a748f19bac (patch)
tree68d0427e2e33280910a673e15c1b60666ff4956e /general
parentbd4f49137e0808a1e71b7e8d8f4286b0f4d5f894 (diff)
cleanup
Diffstat (limited to 'general')
-rw-r--r--general/functions.vim2
-rw-r--r--general/settings.vim87
2 files changed, 44 insertions, 45 deletions
diff --git a/general/functions.vim b/general/functions.vim
index 47284f2e..0860b920 100644
--- a/general/functions.vim
+++ b/general/functions.vim
@@ -1,3 +1,5 @@
+" Random Useful Functions
+
" Turn spellcheck on for markdown files
augroup auto_spellcheck
autocmd BufNewFile,BufRead *.md setlocal spell
diff --git a/general/settings.vim b/general/settings.vim
index 3124eb75..b2910931 100644
--- a/general/settings.vim
+++ b/general/settings.vim
@@ -1,52 +1,49 @@
set iskeyword+=- " treat dash separated words as a word text object"
set formatoptions-=cro " Stop newline continution of comments
-if !exists('g:vscode')
- syntax enable " Enables syntax highlighing
- set hidden " Required to keep multiple buffers open multiple buffers
- set nowrap " Display long lines as just one line
- set encoding=utf-8 " The encoding displayed
- set pumheight=10 " Makes popup menu smaller
- set fileencoding=utf-8 " The encoding written to file
- set ruler " Show the cursor position all the time
- set cmdheight=2 " More space for displaying messages
- set mouse=a " Enable your mouse
- set splitbelow " Horizontal splits will automatically be below
- set splitright " Vertical splits will automatically be to the right
- set t_Co=256 " Support 256 colors
- set conceallevel=0 " So that I can see `` in markdown files
- set tabstop=2 " Insert 2 spaces for a tab
- set shiftwidth=2 " Change the number of space characters inserted for indentation
- set smarttab " Makes tabbing smarter will realize you have 2 vs 4
- set expandtab " Converts tabs to spaces
- set smartindent " Makes indenting smart
- set autoindent " Good auto indent
- set laststatus=2 " Always display the status line
- set number " Line numbers
- set cursorline " Enable highlighting of the current line
- set background=dark " tell vim what the background color looks like
- set showtabline=2 " Always show tabs
- set noshowmode " We don't need to see things like -- INSERT -- anymore
- set nobackup " This is recommended by coc
- set nowritebackup " This is recommended by coc
- set shortmess+=c " Don't pass messages to |ins-completion-menu|.
- set signcolumn=yes " Always show the signcolumn, otherwise it would shift the text each time
- set updatetime=300 " Faster completion
- set timeoutlen=100 " By default timeoutlen is 1000 ms
- set clipboard=unnamedplus " Copy paste between vim and everything else
- set incsearch
- set guifont=Fira\ Code\ Nerd\ Font
- " let $NVIM_TUI_ENABLE_TRUE_COLOR=1
- " set mmp=1300
- " set autochdir " Your working directory will always be the same as your working directory
- " set foldcolumn=2 " Folding abilities
+syntax enable " Enables syntax highlighing
+set hidden " Required to keep multiple buffers open multiple buffers
+set nowrap " Display long lines as just one line
+set encoding=utf-8 " The encoding displayed
+set pumheight=10 " Makes popup menu smaller
+set fileencoding=utf-8 " The encoding written to file
+set ruler " Show the cursor position all the time
+set cmdheight=2 " More space for displaying messages
+set mouse=a " Enable your mouse
+set splitbelow " Horizontal splits will automatically be below
+set splitright " Vertical splits will automatically be to the right
+set t_Co=256 " Support 256 colors
+set conceallevel=0 " So that I can see `` in markdown files
+set tabstop=2 " Insert 2 spaces for a tab
+set shiftwidth=2 " Change the number of space characters inserted for indentation
+set smarttab " Makes tabbing smarter will realize you have 2 vs 4
+set expandtab " Converts tabs to spaces
+set smartindent " Makes indenting smart
+set autoindent " Good auto indent
+set laststatus=2 " Always display the status line
+set number " Line numbers
+set cursorline " Enable highlighting of the current line
+set background=dark " tell vim what the background color looks like
+set showtabline=2 " Always show tabs
+set noshowmode " We don't need to see things like -- INSERT -- anymore
+set nobackup " This is recommended by coc
+set nowritebackup " This is recommended by coc
+set shortmess+=c " Don't pass messages to |ins-completion-menu|.
+set signcolumn=yes " Always show the signcolumn, otherwise it would shift the text each time
+set updatetime=300 " Faster completion
+set timeoutlen=100 " By default timeoutlen is 1000 ms
+set clipboard=unnamedplus " Copy paste between vim and everything else
+set incsearch
+set guifont=Fira\ Code\ Nerd\ Font
+" let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+" set mmp=1300
+" set autochdir " Your working directory will always be the same as your working directory
+" set foldcolumn=2 " Folding abilities
- " au! BufWritePost $MYVIMRC source % " auto source when writing to init.vm alternatively you can run :source $MYVIMRC
- autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
+" au! BufWritePost $MYVIMRC source % " auto source when writing to init.vm alternatively you can run :source $MYVIMRC
+autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
-
- " You can't stop me
- cmap w!! w !sudo tee %
-endif
+" You can't stop me
+cmap w!! w !sudo tee %