Compare commits

..

No commits in common. "27fd7cc0a1c2b6f747a208eb986d5f709dc80ba9" and "8cbfecc80bfdf127eb52e3d594ad4b8aac222cb7" have entirely different histories.

4 changed files with 14 additions and 17 deletions

View File

@ -1,9 +1,7 @@
require 'plugins' require 'plugins'
require('onedark').setup { vim.g.onedark_style = 'warmer'
style = 'warmer' require('onedark').setup()
}
require('onedark').load()
require 'lsp' require 'lsp'
require 'completion' require 'completion'

View File

@ -2,7 +2,7 @@ local key = vim.api.nvim_set_keymap
local u = require('utils') local u = require('utils')
vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]]) vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]])
vim.cmd([[autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})]]) vim.cmd([[autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({focusable = false})]])
key('n', ';', ':Telescope find_files<CR>', {}) key('n', ';', ':Telescope find_files<CR>', {})
key('', '<C-n>', ':NvimTreeToggle<CR>', {}) key('', '<C-n>', ':NvimTreeToggle<CR>', {})

View File

@ -1,3 +1,4 @@
require'lspinstall'.setup()
local u = require('utils') local u = require('utils')
local nvim_lsp = require'lspconfig' local nvim_lsp = require'lspconfig'
@ -53,24 +54,24 @@ local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
local servers = require'nvim-lsp-installer' local servers = require'lspinstall'.installed_servers()
servers.on_server_ready(function(server) for _, lsp in ipairs(servers) do
local config = { local config = {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
flags = {debounce_text_changes = 150} flags = {debounce_text_changes = 150}
} }
if server.name == "sumneko_lua" then if lsp == "lua" then
config.settings = require'lsp.lua' config.settings = require'lsp.lua'
end end
if server.name == "rust_analyzer" then if lsp == "rust" then
config.settings = require'lsp.rust' config.settings = require'lsp.rust'
end end
server:setup(config) nvim_lsp[lsp].setup(config)
end) end
-- Set completeopt to have a better completion experience -- Set completeopt to have a better completion experience
vim.o.completeopt = 'menuone,noselect' vim.o.completeopt = 'menuone,noselect'

View File

@ -32,6 +32,8 @@ return require('packer').startup({function()
opt = true, opt = true,
cmd = { 'Dispatch', 'Dispatch!' } cmd = { 'Dispatch', 'Dispatch!' }
} }
use 'scrooloose/nerdtree'
use 'Xuyuanp/nerdtree-git-plugin'
use 'tpope/vim-fugitive' use 'tpope/vim-fugitive'
use 'tpope/vim-commentary' use 'tpope/vim-commentary'
use 'sheerun/vim-polyglot' use 'sheerun/vim-polyglot'
@ -46,7 +48,7 @@ return require('packer').startup({function()
use 'akinsho/toggleterm.nvim' use 'akinsho/toggleterm.nvim'
-- LSP Setup -- LSP Setup
use 'neovim/nvim-lspconfig' use 'neovim/nvim-lspconfig'
use 'williamboman/nvim-lsp-installer' use 'kabouzeid/nvim-lspinstall'
use 'nvim-lua/lsp_extensions.nvim' use 'nvim-lua/lsp_extensions.nvim'
use 'nvim-lua/completion-nvim' use 'nvim-lua/completion-nvim'
use 'nvim-lua/popup.nvim' use 'nvim-lua/popup.nvim'
@ -64,12 +66,9 @@ return require('packer').startup({function()
use "hrsh7th/cmp-path" use "hrsh7th/cmp-path"
use 'kdheepak/cmp-latex-symbols' use 'kdheepak/cmp-latex-symbols'
use 'nvim-treesitter/nvim-treesitter' use 'nvim-treesitter/nvim-treesitter'
use 'simrat39/symbols-outline.nvim'
use 'kyazdani42/nvim-web-devicons' use 'kyazdani42/nvim-web-devicons'
use 'stevearc/dressing.nvim'
use { use {
'kyazdani42/nvim-tree.lua', 'kyazdani42/nvim-tree.lua',
cmd = { cmd = {
@ -79,7 +78,6 @@ return require('packer').startup({function()
}, },
config = function() require'plugins/nvim-tree' end config = function() require'plugins/nvim-tree' end
} }
use 'justinmk/vim-sneak'
end, end,
config = { config = {
display = { display = {