Add efm to nvim, update vscode, zsh

This commit is contained in:
Smirnov Alexander 2021-06-21 19:44:12 +03:00
parent 093639a28a
commit fef35c3ef0
21 changed files with 169 additions and 129 deletions

View file

@ -1,6 +1,7 @@
" Settings
let bufferline = get(g:, 'bufferline', {})
let bufferline.icon_close_tab = '🗴'
let bufferline.icons = v:false
" Mappings
nno <A-1> :BufferGoto 1<cr>

View file

@ -1,11 +0,0 @@
" Settings
set completeopt=menuone,noselect
" Mappings
ino <expr> <tab> pumvisible() ? "\<C-n>" : "\<tab>"
ino <expr> <s-tab> pumvisible() ? "\<C-p>" : "\<tab>"
ino <expr> <cr> compe#confirm('<CR>')
nno sr :lua vim.lsp.buf.rename()<cr>
nno sh :lua vim.lsp.buf.hover()<cr>
nno si :lua vim.lsp.buf.definition()<cr>
nno sa :lua vim.lsp.buf.code_action()<cr>

View file

@ -1,23 +0,0 @@
"== Vim config
set termguicolors " GUI colors
set nu rnu nocul " Line numbers & cursor line highlight
set nolbr nowrap " Line wrap
set mouse=a mh " Mouse
set history=500 " Set history size
set autoread " Auto read file on change
set hidden " Change buffet without warning
set visualbell t_vb= " Disable sounds
set pumheight=8 " Maximum items in pop up
set modeline " Enable modeline
set nosmd " Disable show mode
set nobk noswf noudf " Swap files
set is ic scs " Search
set spr " Split
set enc=utf-8 fenc=utf-8 " Encoding
set scrolloff=3
set list listchars=tab:\|·,trail:~,space
"== Netrw file tree
let g:netrw_liststyle = 3
let g:netrw_banner = 0
let g:netrw_dirhistmax = 0

View file

@ -1,9 +0,0 @@
"== Config
let g:user_emmet_mode = "i"
let g:user_emmet_expandabbr_key ='<c-j>'
let g:user_emmet_leader = ","
let g:user_emmet_settings = {
\ 'javascript': {'extends': 'jsx'}}
"== Load
au FileType html,jst,pug,vue,css,less,scss :EmmetInstall

View file

@ -1,3 +0,0 @@
au FileType python,elm setl sw=4 ts=4 sts=2
au FileType go setl noet sw=4 ts=4 sts=2
au FileType javascript,html,jst,pug,css,less,scss,json,yaml,lua,vim setl sw=2 ts=2 sts=2

View file

@ -1,15 +1,28 @@
nno <C-s> :w<cr>
nno <C-p> :GFiles<cr>
nno <space> :noh<cr>
nno <leader>t :Term<cr>
nno <leader>e :NvimTreeToggle<cr>
nno <leader>; :Telescope fd<cr>
nno <leader>: :Telescope git_files<cr>
nno <leader>g :Neogit<cr>
nno <leader>; :Files<cr>
nno <leader>d :Neogit<cr>
" Buffer
nno <leader>j :bn<cr>
nno <leader>k :bp<cr>
" Compe
ino <expr> <tab> pumvisible() ? "\<C-n>" : "\<tab>"
ino <expr> <s-tab> pumvisible() ? "\<C-p>" : "\<tab>"
ino <expr> <cr> compe#confirm('<CR>')
ino <expr> <c-space> compe#complete()
nno sr :lua vim.lsp.buf.rename()<cr>
nno sh :lua vim.lsp.buf.hover()<cr>
nno sd :lua vim.lsp.buf.definition()<cr>
nno sa :lua vim.lsp.buf.code_action()<cr>
nno si :lua vim.lsp.buf.implementation()<cr>
nno sf :lua vim.lsp.buf.formatting()
nno sR :lua vim.lsp.buf.references()<CR>
" Split
nno <C-h> :winc h<cr>
nno <C-j> :winc j<cr>