From d5a125567ecece95a1571a29ec2f07ea53d06e42 Mon Sep 17 00:00:00 2001 From: TheK4n Date: Mon, 16 Jan 2023 01:15:45 +0300 Subject: [PATCH] asd --- sub/nvim/lua/base/base.lua | 4 +- sub/vim/init.lua | 153 ------------------------------------- sub/vim/vimrc | 17 ----- 3 files changed, 3 insertions(+), 171 deletions(-) delete mode 100644 sub/vim/init.lua diff --git a/sub/nvim/lua/base/base.lua b/sub/nvim/lua/base/base.lua index 320a17d..b919d3d 100644 --- a/sub/nvim/lua/base/base.lua +++ b/sub/nvim/lua/base/base.lua @@ -11,7 +11,9 @@ vim.opt.shell = 'bash' vim.opt.ttimeoutlen = 0 --- vim.opt.compatible = false +vim.opt.compatible = false + +vim.opt.hidden = true vim.opt.expandtab = true vim.opt.smarttab = true diff --git a/sub/vim/init.lua b/sub/vim/init.lua deleted file mode 100644 index 69e1749..0000000 --- a/sub/vim/init.lua +++ /dev/null @@ -1,153 +0,0 @@ - -local autosave = require("auto-save") - -autosave.setup( -{ - enabled = true, -- start auto-save when the plugin is loaded (i.e. when your package manager loads it) - execution_message = { - message = function() -- message to print on save - return ("AutoSave: saved at " .. vim.fn.strftime("%H:%M:%S")) - end, - dim = 0.18, -- dim the color of `message` - cleaning_interval = 1250, -- (milliseconds) automatically clean MsgArea after displaying `message`. See :h MsgArea - }, - trigger_events = {"InsertLeave", "TextChanged"}, -- vim events that trigger auto-save. See :h events - -- function that determines whether to save the current buffer or not - -- return true: if buffer is ok to be saved - -- return false: if it's not ok to be saved - condition = function(buf) - local fn = vim.fn - local utils = require("auto-save.utils.data") - - if - fn.getbufvar(buf, "&modifiable") == 1 and - utils.not_in(fn.getbufvar(buf, "&filetype"), {}) then - return true -- met condition(s), can save - end - return false -- can't save - end, - write_all_buffers = false, -- write all buffers when the current one meets `condition` - debounce_delay = 135, -- saves the file at most every `debounce_delay` milliseconds - callbacks = { -- functions to be executed at different intervals - enabling = nil, -- ran when enabling auto-save - disabling = nil, -- ran when disabling auto-save - before_asserting_save = nil, -- ran before checking `condition` - before_saving = nil, -- ran before doing the actual save - after_saving = nil -- ran after doing the actual save - } -} -) - - - --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,noselect' - --- luasnip setup -local luasnip = require 'luasnip' - --- nvim-cmp setup -local cmp = require 'cmp' -cmp.setup { - completion = { - autocomplete = false - }, - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - 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' }, - { name = 'luasnip' }, - }, -} - - - - -local nvim_lsp = require('lspconfig') - --- Use an on_attach function to only map the following keys --- after the language server attaches to the current buffer -local on_attach = function(client, bufnr) - - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - - -- Enable completion triggered by - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - local opts = { noremap=true, silent=true } - - -- See `:help vim.lsp.*` for documentation on any of the below functions - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) - buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) - buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) - -end - --- Use a loop to conveniently call 'setup' on multiple servers and --- map buffer local keybindings when the language server attaches -local servers = { 'pyright' } -for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - on_attach = on_attach, - flags = { - debounce_text_changes = 150, - } - } -end - - -require('telescope').load_extension('fzf') - -require("nvim-autopairs").setup {} - -require('gitsigns').setup() - diff --git a/sub/vim/vimrc b/sub/vim/vimrc index 1b1e126..0361b00 100644 --- a/sub/vim/vimrc +++ b/sub/vim/vimrc @@ -167,25 +167,8 @@ call vundle#begin() Plugin 'ryanoasis/vim-devicons' Plugin 'windwp/nvim-autopairs' - " pyright - Plugin 'neovim/nvim-lspconfig' - Plugin 'hrsh7th/nvim-cmp' - Plugin 'hrsh7th/cmp-nvim-lsp' - Plugin 'saadparwaiz1/cmp_luasnip' - Plugin 'L3MON4D3/LuaSnip' - Plugin 'nvim-lua/plenary.nvim' - Plugin 'powerman/vim-plugin-ruscmd' " Russian navigation - " golang - " Plugin 'fatih/vim-go' - Plugin 'nvim-telescope/telescope.nvim' - Plugin 'nvim-telescope/telescope-fzf-native.nvim', {'do': 'make'} - Plugin 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - - - Plugin 'lewis6991/gitsigns.nvim' - call vundle#end() filetype plugin indent on