From 7ccbd7a8d0b05a78461a2c5e743643054d7ddc38 Mon Sep 17 00:00:00 2001 From: Laily Date: Mon, 7 Feb 2022 11:17:03 +0800 Subject: [PATCH] fix(vim): remove spacevim --- .SpaceVim.d/autoload/myspacevim.vim | 30 -------- .SpaceVim.d/init.toml | 109 --------------------------- .SpaceVim.d/lua/custom.lua | 113 ---------------------------- 3 files changed, 252 deletions(-) delete mode 100644 .SpaceVim.d/autoload/myspacevim.vim delete mode 100755 .SpaceVim.d/init.toml delete mode 100644 .SpaceVim.d/lua/custom.lua diff --git a/.SpaceVim.d/autoload/myspacevim.vim b/.SpaceVim.d/autoload/myspacevim.vim deleted file mode 100644 index d3994df..0000000 --- a/.SpaceVim.d/autoload/myspacevim.vim +++ /dev/null @@ -1,30 +0,0 @@ -function! myspacevim#before() abort - autocmd VimEnter * nnoremap gd :lua vim.lsp.buf.definition() - call deoplete#custom#option('auto_complete', v:false) -endfunction - -lua << EOF - local c = require('custom') - lcustom.init() -EOF - -function! myspacevim#after() abort - set wrap - "设置折叠方式 - set foldmethod=indent - " 打开文件默认不折叠 - set foldlevelstart=99 - let g:go_metalinter_autosave=0 - let g:XkbSwitchEnabled = 1 - - "nnoremap k :call gitblame#echo() - - "大括号回车 - "inoremap { {} - "逗号后加上空格 - "inoremap , , - "等号左右空格 - "inoremap = = -endfunction - - diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml deleted file mode 100755 index bbae49e..0000000 --- a/.SpaceVim.d/init.toml +++ /dev/null @@ -1,109 +0,0 @@ -#============================================================================= -# dark_powered.toml --- dark powered configuration example for SpaceVim -# Copyright (c) 2016-2017 Wang Shidong & Contributors -# Author: Wang Shidong < wsdjeg at 163.com > -# URL: https://spacevim.org -# License: GPLv3 -#============================================================================= - -# All SpaceVim option below [option] section -[options] - # set spacevim theme. by default colorscheme layer is not loaded, - # if you want to use more colorscheme, please load the colorscheme - # layer - auto_complete = false - colorscheme = "NeoSolarized" - background = "dark" - # Disable guicolors in basic mode, many terminal do not support 24bit - # true colors - enable_guicolors = true - # Disable statusline separator, if you want to use other value, please - # install nerd fonts - statusline_separator = "arrow" - statusline_inactive_separator = "arrow" - buffer_index_type = 4 -<<<<<<< HEAD - autocomplete_method = 'deoplete' -# autocomplete_method = 'lsp' -======= - #autocomplete_method = 'deoplete' ->>>>>>> c920830f6bd108e167886cdb7d3557c51e304e33 - enable_tabline_filetype_icon = true - enable_statusline_display_mode = false - vim_help_language = "cn" - default_indent = 4 - bootstrap_before= "myspacevim#before" - bootstrap_after= "myspacevim#after" - disabled_plugins = ["auto_complete"] - enable_neomake = false - -# Enable autocomplete layer -#[[layers]] -#name = 'autocomplete' -#auto-completion-return-key-behavior = "smart" -#auto-completion-tab-key-behavior = "smart" - -[[layers]] -name="colorscheme" - -[[layers]] -name = 'shell' -default_position = 'bottom' -default_height = 30 - -<<<<<<< HEAD -[[layers]] -name = "lang#golsp" - -#[[layers]] -#name = "lang#go" -======= -#[[layers]] -#name = "lang#go" - -#[[layers]] -#name = "lang#rust" ->>>>>>> c920830f6bd108e167886cdb7d3557c51e304e33 - -[[layers]] -name = "lang#python" - -[[layers]] -name = "lang#java" - -[[layers]] -name = "lang#markdown" - -[[layers]] -name = "lang#html" - -[[layers]] -name = "lang#typescript" - -#[[layers]] -#name = "lang/vim" - -[[layers]] -name = "fzf" - -[[layers]] -name = "VersionControl" - -[[layers]] -name = "tmux" - -[[layers]] -name = 'autocomplete' -enable = false - -[[custom_plugins]] -name = "terryma/vim-multiple-cursors" - -[[custom_plugins]] -repo="https://github.com/lyokha/vim-xkbswitch" -merged=false - -[[custom_plugins]] -name = "zivyangll/git-blame.vim" -merged=false - diff --git a/.SpaceVim.d/lua/custom.lua b/.SpaceVim.d/lua/custom.lua deleted file mode 100644 index 036a248..0000000 --- a/.SpaceVim.d/lua/custom.lua +++ /dev/null @@ -1,113 +0,0 @@ -lcustom = {} -local cmd = vim.cmd -- to execute Vim commands e.g. cmd('pwd') -local fn = vim.api -- to call Vim functions e.g. fn.bufnr() -local g = vim.g -- a table to access global variables - -function lcustom.echo() - print("hello lua") -end - -function add_plugin() - cmd 'packadd paq-nvim' - local paq = require('paq-nvim').paq - paq{'savq/paq-nvim', opt = true} - paq{'neovim/nvim-lspconfig'} - paq{'nvim-treesitter/nvim-treesitter'} - paq{'nvim-lua/completion-nvim'} -end - -function llsp() - local lspconfig = require('lspconfig') - lspconfig.gopls.setup{on_attach=custom_attach} - -- lspconfig.lua.setup{on_attach=custom_attach} - vim.lsp.set_log_level("debug") - lsp_key_map() - print("init lsp finished") -end - -function lcustom.init() - vim.api.nvim_set_keymap('n','kk',' lua lcustom.echo()',{ noremap = true, silent = true }) - vim.api.nvim_set_keymap('n','kl',' lua llsp()',{ noremap = true, silent = true }) - add_plugin() - llsp() - -- g['deoplete#enable_at_startup'] = 1 -- enable deoplete at startup - -- spc_key_bind('nore',{'g','d'}, 'test key bind', ':lua custom.echo()',1) - -- vim.api.nvim_command('autocmd VimEnter * nnoremap gd :lua vim.lsp.buf.definition()') - print('init llsp') - -- vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - -- - vim.o['completeopt']='menuone,noinsert,noselect' - - treesitter() - print('init finished') -end - -function treesitter() - require'nvim-treesitter.configs'.setup { - ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages - highlight = { - enable = true, -- false will disable the whole extension - disable = {}, -- list of language that will be disabled - }, - } -end - -function lsp_key_map() - simple_key_map('gd','lua vim.lsp.buf.definition()') -end - -function simple_key_map(keys, cmd) - vim.api.nvim_set_keymap('n',keys,cmd,{ noremap = true, silent = true }) -end - -custom_attach = function(client, bufnr) - print("LSP started."); - require'completion'.on_attach(client, bufnr) - -- require'diagnostic'.on_attach(client) - - map('n','gD','lua vim.lsp.buf.declaration()') - map('n','gd','lua vim.lsp.buf.definition()') - map('n','K','lua vim.lsp.buf.hover()') - map('n','gr','lua vim.lsp.buf.references()') - map('n','gs','lua vim.lsp.buf.signature_help()') - map('n','gi','lua vim.lsp.buf.implementation()') - map('n','gt','lua vim.lsp.buf.type_definition()') - map('n','gw','lua vim.lsp.buf.document_symbol()') - map('n','gW','lua vim.lsp.buf.workspace_symbol()') - map('n','ah','lua vim.lsp.buf.hover()') - map('n','af','lua vim.lsp.buf.code_action()') - map('n','ee','lua vim.lsp.util.show_line_diagnostics()') - map('n','ar','lua vim.lsp.buf.rename()') - map('n','=', 'lua vim.lsp.buf.formatting()') - map('n','ai','lua vim.lsp.buf.incoming_calls()') - map('n','ao','lua vim.lsp.buf.outgoing_calls()') -end - -map = function(type, key, value) - -- autocmd VimEnter * nnoremap [ :tabprev - -- local cmd = [[vim.fn.nvim_buf_set_keymap(0,type,key,value,{noremap = true, silent = true})]] - -- vim.api.nvim_command('autocmd VimEnter * nnoremap '..key..' '..value) - vim.api.nvim_buf_set_keymap(0,type,key,value,{noremap = true, silent = true}); -end - -function _G.dump(...) - local objects = vim.tbl_map(vim.inspect, {...}) - print(unpack(objects)) -end - - -local function RunIt(...) - if pcall(function(...) - string.format(...) - end) == false then - error("Function cannot format text",2) - end -end - ---[[ ---// not work -spc_key_bind = function(nore, keys, desc, cmd, num) - vim.fn['SpaceVim#custom#SPC'](nore, keys, desc, cmd, num) -end -]]-- -