Update nvim, kitty

This commit is contained in:
Smirnov-O 2021-07-16 11:36:03 +03:00
parent 43b3ba3aaa
commit e3fa73c712
6 changed files with 33 additions and 43 deletions

View file

@ -2,10 +2,17 @@
## Install nvim
```bash
# From AUR
yay -S neovim-nightly-bin
# From pacman
sudo pacman -S neovim
```
## Install plugin manager(`packer`)
## Install plugin manager(`vim-plug`)
```bash
sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
```
## Install LSP servers
```bash

View file

@ -1,27 +1,23 @@
call plug#begin('~/.vim/plugged')
" Plug 'Smirnov-O/nten.vim'
Plug 'projekt0n/github-nvim-theme'
Plug 'Smirnov-O/nten.vim'
Plug 'hoob3rt/lualine.nvim'
Plug 'romgrk/barbar.nvim'
Plug 'b3nj5m1n/kommentary'
Plug 'jiangmiao/auto-pairs'
Plug 'nvim-lua/plenary.nvim'
Plug 'lewis6991/gitsigns.nvim'
" LSP
Plug 'hrsh7th/nvim-compe'
Plug 'neovim/nvim-lspconfig'
Plug 'kabouzeid/nvim-lspinstall'
" Files
Plug 'junegunn/fzf.vim', {'on': ['Files', 'GFiles']}
" Plug 'kyazdani42/nvim-tree.lua', {'on': 'NvimTreeToggle'}
" Syntax
Plug 'sheerun/vim-polyglot'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
" Completion
Plug 'neovim/nvim-lspconfig'
Plug 'hrsh7th/nvim-compe'
Plug 'kabouzeid/nvim-lspinstall'
" Git
Plug 'lewis6991/gitsigns.nvim'
" Plug 'TimUntersberger/neogit'
Plug 'sheerun/vim-polyglot'
call plug#end()
" colo codedark
colo codedark
let mapleader=";"
"== Config
@ -54,7 +50,7 @@ set ts=4 sw=4 sts=4
set sta et ai
"== Custom commands
com! Prettier :sil !prettier -w %
com! Prettier :sil !prettier --no-semi -w %
com! Term :vs|winc L|se nonu nornu|start|term
com! GoFmt :sil !gofmt -w %
com! Black :sil !black %
@ -65,8 +61,7 @@ au FileType javascript,yaml,json setl et ts=2 sw=2 sts=4
au FileType python setl et ts=4 sw=4 sts=4 ai
autocmd BufReadPost,FileReadPost lua require "lsp_signature".on_attach()
"== Config's
lua require'config'
lua require"config"
so $HOME/.config/nvim/vimscript/barbar.vim
so $HOME/.config/nvim/vimscript/mappings.vim

View file

@ -3,13 +3,10 @@ require"lspconfig".gopls.setup {}
-- require"lspconfig".pyls.setup {}
-- require"lspconfig".rls.setup {}
-- require"lspconfig".denols.setup {}
require"lspconfig".lua.setup{}
-- require"lspconfig".lua.setup{}
require"tsserver"
require"efm"
-- Theme
require"github-theme".setup {}
-- Compe
require'compe'.setup {
enabled = true,
@ -24,7 +21,7 @@ require'compe'.setup {
-- LuaLine
require'lualine'.setup {options={
theme = "github"
theme = "codedark"
}}
-- GitSigns
@ -45,15 +42,10 @@ require'gitsigns'.setup {
use_internal_diff = true,
}
-- NvimTree
vim.g.nvim_tree_side = "right"
vim.g.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "env"}
-- vim.g.nvim_tree_auto_close = 0
vim.g.nvim_tree_width = 24
-- TreeSitter
require'nvim-treesitter.configs'.setup {
ensure_installed = {'javascript', 'typescript', 'jsdoc', 'python', 'go', 'bash'};
highlight = {enable=true};
highlight = {
enable=true
};
}

View file

@ -2,7 +2,6 @@ nno <C-s> :w<cr>
nno <C-p> :GFiles<cr>
nno <C-n> :enew<cr>
nno <leader>; :Files<cr>
" nno <leader>e :NvimTreeToggle<cr>
nno <space> :noh<cr>
" Buffer
@ -24,14 +23,14 @@ nno si :lua vim.lsp.buf.implementation()<cr>
nno <C-h> :winc h<cr>
nno <C-j> :winc j<cr>
nno <C-k> :winc k<cr>
nno <C-l> :winc l<cr>
nno<C-l> :winc l<cr>
nno <A-h> :vert res +3<cr>
nno <A-j> :res -3<cr>
nno <A-k> :res +3<cr>
nno <A-l> :vert res -3<cr>
nno spv :vs<cr>
nno sph :sp<cr>
nno spv :vnew<cr>
nno sph :new<cr>
nno spk :winc K<cr>
nno spl :winc L<cr>