From 007027ff697cdf7cd8030af4c49d65d2fa71226e Mon Sep 17 00:00:00 2001 From: TheK4n Date: Tue, 17 Jan 2023 18:52:14 +0300 Subject: [PATCH] ref(nvim) --- Makefile | 2 +- sub/nvim/after/plugin/cmp.lua | 18 ------------------ sub/nvim/after/plugin/colorscheme.lua | 2 +- sub/nvim/lua/base/base.lua | 21 +++++++++++++-------- sub/nvim/lua/base/maps.lua | 25 +++++++++++++------------ sub/nvim/lua/base/plugins.lua | 19 ++++++++----------- 6 files changed, 36 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 4a0f409..866b0a3 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ nvim: ln -s $(PWD)/sub/nvim ~/.config/nvim ln -s $(PWD)/functions/vim_askpass_helper ~/.local/bin git clone --depth 1 https://github.com/wbthomason/packer.nvim ~/.local/share/nvim/site/pack/packer/start/packer.nvim - nvim +PackerCompile +PackerClean +PackerInstall +PackerUpdate +PackerUpdate +qall + nvim +PackerCompile +PackerClean +PackerUpdate +PackerUpdate +qall ssh: cat $(PWD)/sub/ssh/config >> ~/.ssh/config diff --git a/sub/nvim/after/plugin/cmp.lua b/sub/nvim/after/plugin/cmp.lua index b09b7b6..3393733 100644 --- a/sub/nvim/after/plugin/cmp.lua +++ b/sub/nvim/after/plugin/cmp.lua @@ -25,24 +25,6 @@ cmp.setup { behavior = cmp.ConfirmBehavior.Replace, select = true, }, - [''] = function(fallback) - if vim.fn.pumvisible() == 1 then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes('', true, true, true), 'n') - elseif luasnip.expand_or_jumpable() then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes('luasnip-expand-or-jump', true, true, true), '') - else - fallback() - end - end, - [''] = function(fallback) - if vim.fn.pumvisible() == 1 then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes('', true, true, true), 'n') - elseif luasnip.jumpable(-1) then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes('luasnip-jump-prev', true, true, true), '') - else - fallback() - end - end, }, sources = { { name = 'nvim_lsp' }, diff --git a/sub/nvim/after/plugin/colorscheme.lua b/sub/nvim/after/plugin/colorscheme.lua index 4b64ef0..0a0f807 100644 --- a/sub/nvim/after/plugin/colorscheme.lua +++ b/sub/nvim/after/plugin/colorscheme.lua @@ -2,4 +2,4 @@ local status, autosave = pcall(require, "gruvbox") if (not status) then return end -vim.api.nvim_exec('colorscheme gruvbox', true) +vim.cmd.colorscheme("gruvbox") diff --git a/sub/nvim/lua/base/base.lua b/sub/nvim/lua/base/base.lua index 1e2ff3e..8c236fb 100644 --- a/sub/nvim/lua/base/base.lua +++ b/sub/nvim/lua/base/base.lua @@ -81,16 +81,16 @@ vim.opt.cursorline = true -vim.cmd([[let &t_SI.="\e[5 q"]]) -vim.cmd([[let &t_SR.="\e[3 q"]]) -vim.cmd([[let &t_EI.="\e[1 q"]]) +vim.t_SI = [[\e[5 q]] +vim.t_SR = [[\e[3 q]] +vim.t_EI = [[\e[1 q]] -vim.cmd([[let g:netrw_banner = 0]]) -- hide banner -vim.cmd([[let g:netrw_liststyle = 3]]) -- tree instead of plain view -vim.cmd([[let g:netrw_browse_split = 0]]) -vim.cmd([[let g:netrw_winsize = 15]]) -vim.cmd([[let g:netrw_keepdir = 0]]) +vim.g.netrw_banner = 0 -- hide banner +vim.g.netrw_liststyle = 3 -- tree instead of plain view +vim.g.netrw_browse_split = 0 +vim.g.netrw_winsize = 15 +vim.g.netrw_keepdir = 0 -- Highlight yanked text for a while @@ -100,3 +100,8 @@ vim.api.nvim_create_autocmd("TextYankPost", { vim.highlight.on_yank() end, }) + +vim.cmd.highlight({ "DiagnosticError", "guifg=Grey" }) +vim.cmd.highlight({ "DiagnosticWarn", "guifg=Grey" }) +vim.cmd.highlight({ "DiagnosticInfo", "guifg=Grey" }) +vim.cmd.highlight({ "DiagnosticHint", "guifg=Grey" }) diff --git a/sub/nvim/lua/base/maps.lua b/sub/nvim/lua/base/maps.lua index 7f4f527..e489e99 100644 --- a/sub/nvim/lua/base/maps.lua +++ b/sub/nvim/lua/base/maps.lua @@ -6,21 +6,23 @@ vim.g.mapleader = ',' function create_function_tabdo(command) return function() - local currTab = vim.fn.tabpagenr() - vim.cmd(string.format([[tabdo %s]], command)) - vim.cmd(string.format([[tabn %s]], currTab)) + local curr_tab = vim.fn.tabpagenr() + vim.cmd.tabdo(command) + vim.cmd.tabn(curr_tab) end end +-- Toggle line highlighting keymap.set('n', 'c', create_function_tabdo('set cursorline!'), {silent = true}) -keymap.set('n', '/', [[:set invhlsearch]], {silent = true}) +keymap.set('n', '/', + function() vim.opt.hlsearch = not vim.opt.hlsearch["_value"] end, + {silent = true}) keymap.set('i', 'jk', '', {silent = true}) keymap.set('i', 'ол', '', {silent = true}) - -- x to blackhole keymap.set('n', 'x', '"_x', {silent = true}) @@ -29,16 +31,15 @@ keymap.set('n', '+', '', {silent = true}) keymap.set('n', '-', '', {silent = true}) -- map \ to prev finding -keymap.set('n', [[\]], ',', {silent = true}) -keymap.set('v', [[\]], ',', {silent = true}) +keymap.set({"n", "v"}, [[\]], ',', {silent = true}) -- Select all keymap.set('n', '', 'ggG', {silent = true}) -- Scroll tabs -keymap.set("n", '', ':tabnext', {silent = true}) -keymap.set("n", '', ':tabprev', {silent = true}) +keymap.set("n", '', vim.cmd.tabnext, {silent = true}) +keymap.set("n", '', vim.cmd.tabprev, {silent = true}) -- Kill current buffer @@ -70,7 +71,7 @@ vim.api.nvim_create_user_command('Sw', [[execute 'silent! write !SUDO_ASKPASS=$( function create_autocmd_filetype(func) - create_autocmd = vim.api.nvim_create_autocmd + local create_autocmd = vim.api.nvim_create_autocmd create_autocmd("BufEnter", { pattern = '*', callback = func} @@ -78,7 +79,7 @@ function create_autocmd_filetype(func) end function set_keymap_run_script(cmd) - cmd_string = string.format([[:tabnew %% :terminal %s %% :set nocursorline number norelativenumber G ]], cmd) + local cmd_string = string.format([[:tabnew %% :terminal %s %% :set nocursorline number norelativenumber G ]], cmd) keymap.set("n", "rr", cmd_string, {silent = true}) end @@ -99,6 +100,7 @@ function create_function_create_autocmd_filename(fn, cmd) end +-- Run current file by type create_autocmd_filetype(create_function_create_autocmd_filetype('python', 'python3')) create_autocmd_filetype(create_function_create_autocmd_filetype('go', 'go run')) create_autocmd_filetype(create_function_create_autocmd_filetype('rust', 'cargo run')) @@ -108,7 +110,6 @@ create_autocmd_filetype(create_function_create_autocmd_filename('manpage', 'man - -- Toggle line number style vim.opt.number = true vim.opt.relativenumber = true diff --git a/sub/nvim/lua/base/plugins.lua b/sub/nvim/lua/base/plugins.lua index 3572108..de9cbfc 100644 --- a/sub/nvim/lua/base/plugins.lua +++ b/sub/nvim/lua/base/plugins.lua @@ -15,13 +15,16 @@ return require('packer').startup(function(use) use 'preservim/vimux' use 'rbgrouleff/bclose.vim' use 'frazrepo/vim-rainbow' + use 'mattn/emmet-vim' + use 'Pocco81/auto-save.nvim' + use 'windwp/nvim-autopairs' + use 'powerman/vim-plugin-ruscmd' -- Russian navigation + use 'lewis6991/gitsigns.nvim' + use 'windwp/nvim-ts-autotag' + use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } -- requiered patch your font use 'ryanoasis/vim-devicons' - use 'powerman/vim-plugin-ruscmd' -- Russian navigation - - use 'Pocco81/auto-save.nvim' - use 'windwp/nvim-autopairs' -- pyright use 'neovim/nvim-lspconfig' @@ -29,15 +32,9 @@ return require('packer').startup(function(use) use 'hrsh7th/cmp-nvim-lsp' use 'saadparwaiz1/cmp_luasnip' use 'L3MON4D3/LuaSnip' - use 'nvim-lua/plenary.nvim' use { 'nvim-telescope/telescope.nvim', - requires = { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', opt = false } + requires = {{'nvim-lua/plenary.nvim'}, { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', opt = false }} } - use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } - - use 'lewis6991/gitsigns.nvim' - use 'windwp/nvim-ts-autotag' - end)