Small adjustments

This commit is contained in:
Ellen Arvidsson 2021-03-07 13:08:39 +01:00
parent 959908970c
commit 92112c9d4d
2 changed files with 19 additions and 9 deletions

26
.vimrc
View file

@ -13,34 +13,34 @@ Plug 'scrooloose/nerdtree'
Plug 'jistr/vim-nerdtree-tabs'
" Snippet handler
Plug 'SirVer/ultisnips'
" Plug 'SirVer/ultisnips'
" snippets for ultisnips
Plug 'honza/vim-snippets'
" Plug 'honza/vim-snippets'
" supertab for completion
Plug 'ervandew/supertab'
" Plug 'ervandew/supertab'
" YouCompleteMe auto-completion
Plug 'Valloric/YouCompleteMe'
" Plug 'Valloric/YouCompleteMe'
" More clever matching for % key
Plug 'tmhedberg/matchit'
" JavaScript syntax highlighting
Plug 'pangloss/vim-javascript'
" Plug 'pangloss/vim-javascript'
" jsx syntax highlighting
Plug 'mxw/vim-jsx'
" Plug 'mxw/vim-jsx'
" Language server protocol linter
Plug 'w0rp/ale'
" Plug 'w0rp/ale'
" fugitive.vim git integration
Plug 'tpope/vim-fugitive'
" Clojure highlight
Plug 'guns/vim-clojure-static'
" Plug 'guns/vim-clojure-static'
" Surround
Plug 'tpope/vim-surround'
@ -80,6 +80,11 @@ set undolevels=1000
" highlight search results
set hlsearch
set list
set listchars=tab:··>,trail
hi SpecialKey ctermfg=darkgrey
" make delimitMate insert another line when
" closing curlys for example
let delimitMate_expand_cr = 1
@ -161,6 +166,11 @@ augroup json_macros " {
autocmd FileType json :nnoremap <localleader>fm :%!python -m json.tool<CR>
augroup END " }
augroup haskell_stuff
autocmd!
autocmd BufNewFile,BufRead *.hsc set ft=haskell
augroup END
" Function for toggling the relative line numbers
function ToggleRelative()
if &relativenumber==1

View file

@ -1 +1 @@
set softtabstop=4 shiftwidth=4 expandtab
"set softtabstop=4 shiftwidth=4 expandtab