Update
This commit is contained in:
parent
a47d635070
commit
b0365310b7
4 changed files with 5 additions and 191 deletions
|
|
@ -38,6 +38,7 @@ augroup vimrc-incsearch-highlight
|
|||
autocmd CmdlineLeave /,\? :set nohlsearch
|
||||
augroup END
|
||||
|
||||
command! LogPath :lua print(vim.inspect(vim.lsp.get_log_path()))
|
||||
|
||||
nnoremap <leader>ps :lua require('telescope.builtin').grep_string({ search = vim.fn.input("Grep For >")})<cr>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
" auto toggle relativenumber
|
||||
set number! relativenumber!
|
||||
augroup numbertoggle
|
||||
autocmd!
|
||||
autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
|
||||
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
||||
augroup END
|
||||
|
||||
" Tab options
|
||||
set tabstop=4 softtabstop=4
|
||||
set shiftwidth=4
|
||||
set expandtab
|
||||
set smartindent
|
||||
|
||||
set signcolumn=yes
|
||||
|
||||
set noerrorbells
|
||||
|
||||
set nobackup
|
||||
set nowrap
|
||||
set undodir=~/.vim/undodir
|
||||
set undofile
|
||||
|
||||
set updatetime=500
|
||||
|
||||
let mapleader = " "
|
||||
|
||||
lua require("matcha")
|
||||
|
||||
" smartsearch
|
||||
set smartcase ignorecase
|
||||
set incsearch
|
||||
|
||||
" toggle nu column
|
||||
augroup vimrc-incsearch-highlight
|
||||
autocmd!
|
||||
autocmd CmdlineEnter /,\? :set hlsearch
|
||||
autocmd CmdlineLeave /,\? :set nohlsearch
|
||||
augroup END
|
||||
|
||||
" start custom RPC server ( for Twitch )
|
||||
command! Twitchbotstart :call serverstart('/tmp/nvimbot')
|
||||
|
||||
" is it a bug? Ask to neovim community
|
||||
command! Twitchbotstop :call serverstop('/tmp/nvimbot')
|
||||
|
||||
|
||||
nnoremap <leader>ps :lua require('telescope.builtin').grep_string({ search = vim.fn.input("Grep For >")})<cr>
|
||||
|
||||
" Find files using Telescope command-line sugar.
|
||||
nnoremap <leader>ff <cmd>Telescope find_files<cr>
|
||||
nnoremap <leader>fg <cmd>Telescope live_grep<cr>
|
||||
nnoremap <leader>fb <cmd>Telescope buffers<cr>
|
||||
nnoremap <leader>fh <cmd>Telescope help_tags<cr>
|
||||
|
||||
|
||||
|
|
@ -1,134 +0,0 @@
|
|||
local execute = vim.api.nvim_command
|
||||
local fn = vim.fn
|
||||
|
||||
local install_path = fn.stdpath('data')..'/site/pack/packer/opt/packer.nvim'
|
||||
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
fn.system({'git', 'clone', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||
execute 'packadd packer.nvim'
|
||||
end
|
||||
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
|
||||
|
||||
require('packer').startup(function()
|
||||
-- Packer can manage itself
|
||||
use 'wbthomason/packer.nvim'
|
||||
|
||||
use {'dracula/vim'}
|
||||
use {'whatyouhide/vim-gotham'}
|
||||
use {'neovim/nvim-lspconfig'}
|
||||
use {'hrsh7th/nvim-compe'}
|
||||
use {'shaunsingh/moonlight.nvim'}
|
||||
|
||||
-- Telescope project search
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}}
|
||||
}
|
||||
|
||||
use {'nvim-treesitter/nvim-treesitter'}
|
||||
|
||||
end)
|
||||
|
||||
|
||||
vim.cmd('colorscheme moonlight')
|
||||
|
||||
-- Setup LSP servers
|
||||
local system_name
|
||||
if vim.fn.has("mac") == 1 then
|
||||
system_name = "macOS"
|
||||
elseif vim.fn.has("unix") == 1 then
|
||||
system_name = "Linux"
|
||||
elseif vim.fn.has('win32') == 1 then
|
||||
system_name = "Windows"
|
||||
else
|
||||
print("Unsupported system for sumneko")
|
||||
end
|
||||
|
||||
local sumneko_root_path = vim.fn.stdpath('cache')..'/lspconfig/sumneko_lua/lua-language-server'
|
||||
local sumneko_binary = sumneko_root_path.."/bin/"..system_name.."/lua-language-server"
|
||||
|
||||
require'lspconfig'.sumneko_lua.setup{
|
||||
cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"};
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
|
||||
version = 'LuaJIT',
|
||||
-- Setup your lua path
|
||||
path = vim.split(package.path, ';'),
|
||||
},
|
||||
diagnostics = {
|
||||
-- Get the language server to recognize the `vim` global
|
||||
globals = {'vim'},
|
||||
},
|
||||
workspace = {
|
||||
-- Make the server aware of Neovim runtime files
|
||||
library = {
|
||||
[vim.fn.expand('$VIMRUNTIME/lua')] = true,
|
||||
[vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true,
|
||||
},
|
||||
},
|
||||
-- Do not send telemetry data containing a randomized but unique identifier
|
||||
telemetry = {
|
||||
enable = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
require'lspconfig'.rls.setup {
|
||||
settings = {
|
||||
rust = {
|
||||
unstable_features = true,
|
||||
build_on_save = false,
|
||||
all_features = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
require'lspconfig'.tsserver.setup{}
|
||||
|
||||
require'lspconfig'.pyls.setup{}
|
||||
|
||||
vim.o.completeopt = "menuone,noselect"
|
||||
require'compe'.setup {
|
||||
enabled = true;
|
||||
autocomplete = true;
|
||||
debug = false;
|
||||
min_length = 1;
|
||||
preselect = 'enable';
|
||||
throttle_time = 80;
|
||||
source_timeout = 200;
|
||||
incomplete_delay = 400;
|
||||
max_abbr_width = 100;
|
||||
max_kind_width = 100;
|
||||
max_menu_width = 100;
|
||||
documentation = true;
|
||||
|
||||
source = {
|
||||
path = true;
|
||||
buffer = true;
|
||||
calc = true;
|
||||
nvim_lsp = true;
|
||||
nvim_lua = true;
|
||||
vsnip = true;
|
||||
ultisnips = true;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
--nvim treesitter
|
||||
require'nvim-treesitter.configs'.setup {
|
||||
ensure_installed = "maintained", -- list of languages
|
||||
highlight = {
|
||||
enable = true,
|
||||
},
|
||||
rainbow = {
|
||||
enable = true,
|
||||
extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
|
||||
}
|
||||
}
|
||||
|
|
@ -81,7 +81,10 @@ install_neovim () {
|
|||
mkdir -p ~/.config/nvim
|
||||
cp -r ./configs/nvim/* ~/.config/nvim
|
||||
refresh_repo
|
||||
sudo apt install ripgrep -y
|
||||
sudo apt install ripgrep ruby-dev -y
|
||||
gem install --user-install solargraph
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
|
||||
source ~/.cargo/env
|
||||
;;
|
||||
*)
|
||||
echo "No modification"
|
||||
|
|
|
|||
Loading…
Reference in a new issue