Add wakatime and replace spaces with tabs
This commit is contained in:
parent
5c253a7a65
commit
4b98cab3cd
GPG key ID:
13AD60C237A28DFE
6 changed files with 143 additions and 134 deletions
|
|
@ -3,35 +3,38 @@ set packpath+=~/.config/vim
|
|||
|
||||
" Plug plugins using VimPlug
|
||||
call plug#begin('~/.config/vim/plugged')
|
||||
" Tools
|
||||
Plug 'editorconfig/editorconfig-vim'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'samoshkin/vim-mergetool'
|
||||
Plug 'fidian/hexmode'
|
||||
Plug 'scrooloose/nerdtree'
|
||||
Plug 'vim-scripts/DoxygenToolkit.vim'
|
||||
Plug 'drmikehenry/vim-headerguard'
|
||||
"Emmet is a plugin which greatly improves HTML & CSS workflow
|
||||
Plug 'mattn/emmet-vim'
|
||||
Plug 'easymotion/vim-easymotion'
|
||||
" Tools
|
||||
Plug 'editorconfig/editorconfig-vim'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'samoshkin/vim-mergetool'
|
||||
Plug 'fidian/hexmode'
|
||||
Plug 'scrooloose/nerdtree'
|
||||
Plug 'vim-scripts/DoxygenToolkit.vim'
|
||||
Plug 'drmikehenry/vim-headerguard'
|
||||
"Emmet is a plugin which greatly improves HTML & CSS workflow
|
||||
Plug 'mattn/emmet-vim'
|
||||
Plug 'easymotion/vim-easymotion'
|
||||
|
||||
" Eye-Candy
|
||||
Plug 'machakann/vim-highlightedyank'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
"Plug 'nanotech/jellybeans.vim'
|
||||
Plug 'dracula/vim', { 'as': 'dracula' }
|
||||
Plug 'scrooloose/syntastic'
|
||||
Plug 'Yggdroot/indentLine'
|
||||
" Eye-Candy
|
||||
Plug 'machakann/vim-highlightedyank'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
"Plug 'nanotech/jellybeans.vim'
|
||||
Plug 'dracula/vim', { 'as': 'dracula' }
|
||||
Plug 'scrooloose/syntastic'
|
||||
Plug 'Yggdroot/indentLine'
|
||||
|
||||
" Commands
|
||||
Plug 'machakann/vim-swap'
|
||||
Plug 'matze/vim-move'
|
||||
" Commands
|
||||
Plug 'machakann/vim-swap'
|
||||
Plug 'matze/vim-move'
|
||||
|
||||
" Syntax highlighting
|
||||
Plug 'baskerville/vim-sxhkdrc'
|
||||
Plug 'sirtaj/vim-openscad'
|
||||
Plug 'lervag/vimtex'
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
" Syntax highlighting
|
||||
Plug 'baskerville/vim-sxhkdrc'
|
||||
Plug 'sirtaj/vim-openscad'
|
||||
Plug 'lervag/vimtex'
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
|
||||
" Misc
|
||||
Plug 'wakatime/vim-wakatime'
|
||||
call plug#end()
|
||||
|
||||
|
||||
|
|
@ -45,9 +48,9 @@ set splitbelow splitright
|
|||
let mapleader = " "
|
||||
|
||||
augroup numbertoggle
|
||||
autocmd!
|
||||
autocmd WinEnter * set relativenumber
|
||||
autocmd WinLeave * set norelativenumber
|
||||
autocmd!
|
||||
autocmd WinEnter * set relativenumber
|
||||
autocmd WinLeave * set norelativenumber
|
||||
augroup END
|
||||
|
||||
syntax on
|
||||
|
|
@ -69,11 +72,11 @@ set nowrap
|
|||
set nocompatible
|
||||
|
||||
if has('nvim')
|
||||
" Neovim specific commands
|
||||
set viminfo+=n~/.cache/nviminfo
|
||||
" Neovim specific commands
|
||||
set viminfo+=n~/.cache/nviminfo
|
||||
else
|
||||
" Standard vim specific commands
|
||||
set viminfo+=n~/.cache/viminfo
|
||||
" Standard vim specific commands
|
||||
set viminfo+=n~/.cache/viminfo
|
||||
endif
|
||||
|
||||
set wildmode=longest,list,full
|
||||
|
|
@ -84,15 +87,15 @@ runtime ftplugin/man.vim
|
|||
set keywordprg=:Man
|
||||
|
||||
if has("autocmd")
|
||||
" Save cursor position. I don't understand this part
|
||||
au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
|
||||
" Save cursor position. I don't understand this part
|
||||
au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
|
||||
|
||||
au BufNewFile,BufRead neomutt-* setf mail
|
||||
au BufNewFile,BufRead neomutt-* setf mail
|
||||
|
||||
au FileType yaml setlocal ai tabstop=2 shiftwidth=2 expandtab cuc nu
|
||||
au FileType yaml setlocal ai tabstop=2 shiftwidth=2 expandtab cuc nu
|
||||
|
||||
au FileType lilypond au BufWritePost * !lilypond %
|
||||
au FileType dot au BufWritePost * !dot -Tpng -O %
|
||||
au FileType lilypond au BufWritePost * !lilypond %
|
||||
au FileType dot au BufWritePost * !dot -Tpng -O %
|
||||
endif
|
||||
|
||||
|
||||
|
|
@ -107,60 +110,60 @@ nnoremap <CR> :noh<CR><CR>
|
|||
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
|
||||
|
||||
let g:lightline = {
|
||||
\ 'active': {
|
||||
\ 'left': [
|
||||
\ [ 'mode', 'paste' ],
|
||||
\ [ 'readonly', 'filename', 'modified', 'gitbranch' ]
|
||||
\ ],
|
||||
\ 'right': [
|
||||
\ [ 'bufnum', 'percent', 'lineinfo' ],
|
||||
\ [ 'fileformat', 'fileencoding', 'filetype', 'synthastic' ],
|
||||
\ [ 'charvaluehex' ]
|
||||
\ ]
|
||||
\ },
|
||||
\ 'inactive': {
|
||||
\ 'left': [
|
||||
\ [ 'filename' ]
|
||||
\ ],
|
||||
\ 'right': [
|
||||
\ [ 'lineinfo' ],
|
||||
\ [ 'bufnum' ]
|
||||
\ ]
|
||||
\ },
|
||||
\ 'component': {
|
||||
\ 'charvaluehex': '0x%B',
|
||||
\ 'bufnum': '%n'
|
||||
\ },
|
||||
\ 'component_function': {
|
||||
\ 'synthastic': 'SyntasticStatuslineFlag',
|
||||
\ 'gitbranch': 'fugitive#head'
|
||||
\ },
|
||||
\ }
|
||||
\ 'active': {
|
||||
\ 'left': [
|
||||
\ [ 'mode', 'paste' ],
|
||||
\ [ 'readonly', 'filename', 'modified', 'gitbranch' ]
|
||||
\ ],
|
||||
\ 'right': [
|
||||
\ [ 'bufnum', 'percent', 'lineinfo' ],
|
||||
\ [ 'fileformat', 'fileencoding', 'filetype', 'synthastic' ],
|
||||
\ [ 'charvaluehex' ]
|
||||
\ ]
|
||||
\ },
|
||||
\ 'inactive': {
|
||||
\ 'left': [
|
||||
\ [ 'filename' ]
|
||||
\ ],
|
||||
\ 'right': [
|
||||
\ [ 'lineinfo' ],
|
||||
\ [ 'bufnum' ]
|
||||
\ ]
|
||||
\ },
|
||||
\ 'component': {
|
||||
\ 'charvaluehex': '0x%B',
|
||||
\ 'bufnum': '%n'
|
||||
\ },
|
||||
\ 'component_function': {
|
||||
\ 'synthastic': 'SyntasticStatuslineFlag',
|
||||
\ 'gitbranch': 'fugitive#head'
|
||||
\ },
|
||||
\ }
|
||||
|
||||
if has('termguicolors') && &termguicolors
|
||||
let g:jellybeans_overrides['background']['guibg'] = 'none'
|
||||
let g:jellybeans_overrides['background']['guibg'] = 'none'
|
||||
endif
|
||||
let g:jellybeans_overrides = {
|
||||
\ 'Todo': {
|
||||
\ 'guifg': '303030',
|
||||
\ 'guibg': 'f0f000',
|
||||
\ 'ctermfg': 'Black',
|
||||
\ 'ctermbg': 'Yellow',
|
||||
\ 'attr': 'bold'
|
||||
\ },
|
||||
\ 'Comment': { 'guifg': 'cccccc' },
|
||||
\ 'LineNr': { 'guifg': 'aaaaaa' },
|
||||
\ 'background': {
|
||||
\ 'ctermbg': 'none',
|
||||
\ '256ctermbg': 'none'
|
||||
\ },
|
||||
\ }
|
||||
\ 'Todo': {
|
||||
\ 'guifg': '303030',
|
||||
\ 'guibg': 'f0f000',
|
||||
\ 'ctermfg': 'Black',
|
||||
\ 'ctermbg': 'Yellow',
|
||||
\ 'attr': 'bold'
|
||||
\ },
|
||||
\ 'Comment': { 'guifg': 'cccccc' },
|
||||
\ 'LineNr': { 'guifg': 'aaaaaa' },
|
||||
\ 'background': {
|
||||
\ 'ctermbg': 'none',
|
||||
\ '256ctermbg': 'none'
|
||||
\ },
|
||||
\ }
|
||||
|
||||
try
|
||||
packadd! dracula_pro
|
||||
colorscheme dracula_pro
|
||||
packadd! dracula_pro
|
||||
colorscheme dracula_pro
|
||||
catch
|
||||
colorscheme dracula
|
||||
colorscheme dracula
|
||||
endtry
|
||||
|
||||
let g:dracula_colorterm = 0
|
||||
|
|
@ -178,8 +181,8 @@ let g:syntastic_c_config_file = '.syntastic_cc_config'
|
|||
|
||||
let g:tex_flavor = 'latex'
|
||||
let g:vimtex_compiler_latexmk = {
|
||||
\ 'build_dir': 'latexmk_output'
|
||||
\}
|
||||
\ 'build_dir': 'latexmk_output'
|
||||
\}
|
||||
|
||||
let g:move_key_modifier = 'C'
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue