update and additions
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
live_config_reload = true
|
||||
|
||||
[bell]
|
||||
animation = "EaseOutExpo"
|
||||
@@ -7,43 +6,37 @@ duration = 0
|
||||
[colors]
|
||||
draw_bold_text_with_bright_colors = true
|
||||
|
||||
[colors.bright]
|
||||
black = "0x303030"
|
||||
blue = "0x6484c7"
|
||||
cyan = "0x84c7c7"
|
||||
green = "0x64c784"
|
||||
magenta = "0x7355d7"
|
||||
red = "0xc76484"
|
||||
white = "0xd7d7d7"
|
||||
yellow = "0xc7c784"
|
||||
[colors.primary]
|
||||
foreground = "#e6edf3"
|
||||
background = "#202325"
|
||||
|
||||
[colors.cursor]
|
||||
cursor = "0xd1d4d2"
|
||||
text = "0x1d1f21"
|
||||
text = "#010409"
|
||||
cursor = "#e6edf3"
|
||||
|
||||
[colors.dim]
|
||||
black = "0x050505"
|
||||
blue = "0x6699cc"
|
||||
cyan = "0x66cccc"
|
||||
green = "0x99cc99"
|
||||
magenta = "0xcc99cc"
|
||||
red = "0xf2777a"
|
||||
white = "0xdddddd"
|
||||
yellow = "0xffcc66"
|
||||
[colors.selection]
|
||||
text = "#e6edf3"
|
||||
background = "#264f78"
|
||||
|
||||
[colors.normal]
|
||||
black = "0x1d1d1d"
|
||||
blue = "0x3555d7"
|
||||
cyan = "0x55b7b7"
|
||||
green = "0x35d755"
|
||||
magenta = "0xd755d7"
|
||||
red = "0xd73555"
|
||||
white = "0xe7e7e7"
|
||||
yellow = "0xd7d755"
|
||||
black = "#484f58"
|
||||
red = "#ff7b72"
|
||||
green = "#3fb950"
|
||||
yellow = "#d29922"
|
||||
blue = "#58a6ff"
|
||||
magenta = "#bc8cff"
|
||||
cyan = "#39c5cf"
|
||||
white = "#b1bac4"
|
||||
|
||||
[colors.primary]
|
||||
background = "0x1d1f21"
|
||||
foreground = "0xd1d4d2"
|
||||
[colors.bright]
|
||||
black = "#6e7681"
|
||||
red = "#ffa198"
|
||||
green = "#56d364"
|
||||
yellow = "#e3b341"
|
||||
blue = "#79c0ff"
|
||||
magenta = "#d2a8ff"
|
||||
cyan = "#56d4dd"
|
||||
white = "#ffffff"
|
||||
|
||||
[cursor]
|
||||
style = "Block"
|
||||
@@ -52,10 +45,10 @@ style = "Block"
|
||||
render_timer = false
|
||||
|
||||
[env]
|
||||
TERM = "xterm-256color"
|
||||
TERM = "xterm-direct"
|
||||
|
||||
[font]
|
||||
size = 12.0
|
||||
size = 14.0
|
||||
|
||||
[font.bold]
|
||||
family = "Terminus"
|
||||
@@ -565,7 +558,7 @@ key = "F12"
|
||||
mods = "Super"
|
||||
|
||||
[mouse]
|
||||
hide_when_typing = true
|
||||
hide_when_typing = false
|
||||
|
||||
[[mouse.bindings]]
|
||||
action = "PasteSelection"
|
||||
@@ -582,5 +575,8 @@ columns = 100
|
||||
lines = 40
|
||||
|
||||
[window.padding]
|
||||
x = 2
|
||||
x = 1
|
||||
y = 0
|
||||
|
||||
[general]
|
||||
live_config_reload = true
|
||||
|
||||
@@ -58,7 +58,6 @@ set mousehide " Hide mouse pointer on insert mode."
|
||||
"set iskeyword+=:
|
||||
|
||||
"MAPPINGS
|
||||
set pastetoggle=<F2>
|
||||
map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
|
||||
\. synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
|
||||
\. synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
|
||||
@@ -75,46 +74,17 @@ nnoremap <leader>l :bnext<CR>
|
||||
nnoremap <leader>h :bprevious<CR>
|
||||
nnoremap <leader>c :Bdelete<CR>
|
||||
nnoremap <leader>r :make<CR>
|
||||
nnoremap <leader>ad :ArduinoUploadAndSerial<CR>
|
||||
nnoremap <leader>as :ArduinoSerial<CR>
|
||||
nnoremap <leader>ab :ArduinoChooseBoard<CR>
|
||||
nnoremap <leader>ap :ArduinoChoosePort<CR>
|
||||
|
||||
nnoremap <Left> :bprev<CR>
|
||||
nnoremap <Right> :bnext<CR>
|
||||
|
||||
" Set working dir
|
||||
nnoremap <leader>. :lcd %:p:h<CR>
|
||||
" Session management
|
||||
nnoremap <leader>so :OpenSession<Space>
|
||||
nnoremap <leader>ss :SaveSession<Space>
|
||||
nnoremap <leader>sd :DeleteSession<CR>
|
||||
nnoremap <leader>sc :CloseSession<CR>
|
||||
"
|
||||
" GitGutter maps
|
||||
noremap \hn <Plug>GitGutterNextHunk
|
||||
noremap \hp <Plug>GitGutterPreviewHunk
|
||||
noremap \hs <Plug>GitGutterStageHunk
|
||||
noremap \hr <Plug>GitGutterUndoHunk
|
||||
|
||||
"Git maps
|
||||
noremap <Leader>gs :Gstatus<CR>
|
||||
noremap <Leader>ga :Gwrite<CR>
|
||||
noremap <Leader>gc :Gcommit<CR>
|
||||
noremap <Leader>gsh :Gpush<CR>
|
||||
noremap <Leader>gb :Gblame<CR>
|
||||
noremap <Leader>gr :Gremove<CR>
|
||||
noremap <Leader>gll :Gpull<CR>
|
||||
noremap <Leader>gd :Gvdiff<CR>
|
||||
" Split
|
||||
noremap <Leader>b :<C-u>split<CR>
|
||||
noremap <Leader>v :<C-u>vsplit<CR>
|
||||
|
||||
|
||||
"POLYGLOT
|
||||
let g:polyglot_disabled = ['css', 'html', 'javascript']
|
||||
let g:vue_disable_pre_processors=0
|
||||
|
||||
"Plugins
|
||||
filetype off
|
||||
call plug#begin('~/.config/nvim/bundle')
|
||||
@@ -122,8 +92,6 @@ call plug#begin('~/.config/nvim/bundle')
|
||||
"Interfaces
|
||||
Plug 'Shougo/unite.vim'
|
||||
Plug 'mhinz/vim-startify'
|
||||
"Arduino
|
||||
Plug 'z3t0/arduvim'
|
||||
|
||||
"Utilities
|
||||
Plug 'Shougo/vimfiler.vim'
|
||||
@@ -133,58 +101,31 @@ Plug 'tpope/vim-repeat'
|
||||
Plug 'tpope/vim-endwise'
|
||||
Plug 'alvan/vim-closetag'
|
||||
Plug 'moll/vim-bbye'
|
||||
Plug 'w0rp/ale'
|
||||
Plug 'Shougo/deoplete.nvim'
|
||||
Plug 'fishbullet/deoplete-ruby'
|
||||
Plug 'Shougo/deoplete-rct'
|
||||
Plug 'editorconfig/editorconfig-vim'
|
||||
Plug 'vim-latex/vim-latex'
|
||||
Plug 'noahfrederick/vim-laravel'
|
||||
Plug '1995parham/vim-spice'
|
||||
" Plug 'https://gitlab.com/code-stats/code-stats-vim.git'
|
||||
|
||||
|
||||
"GIT
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
|
||||
"Ruby and rails
|
||||
Plug 'tpope/vim-rails'
|
||||
|
||||
"Javascript
|
||||
|
||||
" EMMET - HTML autocompletions
|
||||
Plug 'mattn/emmet-vim'
|
||||
|
||||
"syntax, colorscheme, etc. (visuals)
|
||||
Plug 'chrisbra/Colorizer'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
Plug '1995parham/vim-spice'
|
||||
Plug 'mgee/lightline-bufferline'
|
||||
Plug 'ryanoasis/vim-devicons'
|
||||
Plug 'PotatoesMaster/i3-vim-syntax'
|
||||
Plug 'vim-scripts/octave.vim--'
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
Plug 'tristaan/vim-smooth'
|
||||
Plug 'vivien/vim-linux-coding-style'
|
||||
Plug 'projekt0n/github-nvim-theme', { 'branch': 'main' }
|
||||
Plug 'sirtaj/vim-openscad'
|
||||
call plug#end()
|
||||
|
||||
"CODESTATS
|
||||
let g:codestats_api_key = 'SFMyNTY.WW1scmIyNXFZVE16IyNORFUzTnc9PQ.ad9U5r6g8iyXiE4Jlp3vfU_IGSHRwogX1-fXn8PZdBw'
|
||||
|
||||
"PYTHON
|
||||
let g:python_host_prog = '/usr/bin/python2'
|
||||
let g:python_host_prog = '/usr/bin/python3'
|
||||
let g:python3_host_prog = '/usr/bin/python3'
|
||||
|
||||
"RUBY
|
||||
let g:ruby_path = system('rvm current')
|
||||
|
||||
"SYNTAX COLORING AND COMPLETION
|
||||
filetype plugin indent on
|
||||
colorscheme github_dark_dimmed
|
||||
syntax enable
|
||||
colorscheme smooth
|
||||
set omnifunc=syntaxcomplete#Complete
|
||||
|
||||
"VIM SESSIONS
|
||||
let g:session_directory = "~/.vim/session"
|
||||
@@ -192,35 +133,9 @@ let g:session_autoload = "no"
|
||||
let g:session_autosave = "no"
|
||||
let g:session_command_aliases = 1
|
||||
|
||||
"GTM
|
||||
let g:gtm_plugin_status_enabled = 1
|
||||
|
||||
"VIMFILER
|
||||
let g:vimfiler_as_default_explorer = 1
|
||||
|
||||
"EMMET
|
||||
let g:user_emmet_install_global = 0
|
||||
let g:user_emmet_expandabbr_key = '<C-e>'
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
" let g:deoplete#sources = [ 'tag', 'buffer' ]
|
||||
let deoplete#tag#cache_limit_size = 5000000
|
||||
|
||||
"LATEX
|
||||
let g:tex_flavor='latex'
|
||||
let g:Tex_DefaultTargetFormat='pdf'
|
||||
let g:Tex_ViewRule_pdf='firefox'
|
||||
let g:Tex_CompileRule_pdf='pdflatex -shell-escape'
|
||||
|
||||
"ARDUINO
|
||||
let g:arduino_dir = '/usr/share/arduino'
|
||||
|
||||
"ALE
|
||||
let g:ale_linters = {
|
||||
\ 'c': ['clang']
|
||||
\}
|
||||
let g:ale_c_clang_options = '-std=gnu11 -Wall -Wextra -Werror -lusb-1.0 -fexceptions -DNDEBUG'
|
||||
let g:ale_statusline_format = ['⨉ %d', '⚠ %d', '⬥ ok']
|
||||
|
||||
"STARTIFY
|
||||
let g:startify_list_order = [
|
||||
\ [' Most recently used in directory:'],
|
||||
@@ -323,7 +238,6 @@ endfunction
|
||||
function! LightlineFilename()
|
||||
return ('' != LightlineReadonly() ? LightlineReadonly() . ' ' : '') .
|
||||
\ (&ft == 'vimfiler' ? vimfiler#get_status_string() :
|
||||
\ &ft == 'unite' ? unite#get_status_string() :
|
||||
\ &ft == 'vimshell' ? vimshell#get_status_string() :
|
||||
\ '' != expand('%:t') ? expand('%:t') : '[No Name]') .
|
||||
\ ('' != LightlineModified() ? ' ' . LightlineModified() : '')
|
||||
@@ -353,15 +267,6 @@ function! LightlineMode()
|
||||
return winwidth(0) > 60 ? lightline#mode() : ''
|
||||
endfunction
|
||||
|
||||
"OMNICOMPLETE
|
||||
"FUNCTIONS
|
||||
function! PythonInit()
|
||||
set tabstop=4
|
||||
set softtabstop=4
|
||||
set shiftwidth=4
|
||||
set fileformat=unix
|
||||
endfunction
|
||||
|
||||
"AUTOCOMMANDS
|
||||
augroup helpfiles
|
||||
au!
|
||||
@@ -374,18 +279,6 @@ augroup filetypes
|
||||
au FileType html,css,eruby,php,vue EmmetInstall
|
||||
augroup END
|
||||
|
||||
augroup Vuefix
|
||||
au!
|
||||
au BufRead,BufNewFile *.vue setlocal filetype=vue
|
||||
au Filetype vue syntax sync fromstart
|
||||
augroup END
|
||||
|
||||
augroup spicefix
|
||||
au!
|
||||
au BufRead,BufNewFile *.cir setlocal filetype=spice
|
||||
au Filetype spice syntax sync fromstart
|
||||
augroup END
|
||||
|
||||
augroup newfiles
|
||||
au!
|
||||
au BufWritePre * %s/\s\+$//e
|
||||
|
||||
Reference in New Issue
Block a user