Updated config to not be broken anymore
This commit is contained in:
parent
1037c5c229
commit
9bd672f82e
|
@ -90,11 +90,11 @@ map <S-k> 10k
|
||||||
nnoremap <leader>ff <cmd>Telescope find_files<cr>
|
nnoremap <leader>ff <cmd>Telescope find_files<cr>
|
||||||
nnoremap <leader>fg <cmd>Telescope live_grep<cr>
|
nnoremap <leader>fg <cmd>Telescope live_grep<cr>
|
||||||
nnoremap <leader>fb <cmd>Telescope buffers<cr>
|
nnoremap <leader>fb <cmd>Telescope buffers<cr>
|
||||||
nnoremap <leader>lc <cmd>Telescope lsp_code_actions<cr>
|
|
||||||
nnoremap <leader>ls <cmd>Telescope lsp_document_symbols<cr>
|
nnoremap <leader>ls <cmd>Telescope lsp_document_symbols<cr>
|
||||||
nnoremap <leader>ln <cmd>lua vim.lsp.diagnostic.goto_next()<cr>
|
nnoremap <leader>ln <cmd>lua vim.lsp.diagnostic.goto_next()<cr>
|
||||||
nnoremap <leader>lp <cmd>lua vim.lsp.diagnostic.goto_prev()<cr>
|
nnoremap <leader>lp <cmd>lua vim.lsp.diagnostic.goto_prev()<cr>
|
||||||
nnoremap <leader>ll <cmd>lua vim.lsp.buf.
|
nnoremap <leader>ll :lua vim.lsp.buf.
|
||||||
|
nnoremap <leader>lc <cmd>lua vim.lsp.buf.code_action()<cr>
|
||||||
nnoremap <leader>lh <cmd>lua vim.lsp.buf.hover()<cr>
|
nnoremap <leader>lh <cmd>lua vim.lsp.buf.hover()<cr>
|
||||||
nnoremap <leader>lf <cmd>lua vim.lsp.buf.formatting()<cr>
|
nnoremap <leader>lf <cmd>lua vim.lsp.buf.formatting()<cr>
|
||||||
|
|
||||||
|
@ -103,3 +103,5 @@ highlight! CmpItemAbbrMatchFuzzy ctermfg=Cyan
|
||||||
highlight! NvimTreeFolderName ctermfg=Blue
|
highlight! NvimTreeFolderName ctermfg=Blue
|
||||||
highlight! NvimTreeOpenedFolderName ctermfg=Blue cterm=bold
|
highlight! NvimTreeOpenedFolderName ctermfg=Blue cterm=bold
|
||||||
highlight! NvimTreeEmptyFolderName ctermfg=Blue
|
highlight! NvimTreeEmptyFolderName ctermfg=Blue
|
||||||
|
|
||||||
|
autocmd BufEnter * ++nested if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif
|
||||||
|
|
|
@ -10,7 +10,7 @@ require('packer').startup(function()
|
||||||
|
|
||||||
use 'gruvbox-community/gruvbox'
|
use 'gruvbox-community/gruvbox'
|
||||||
use 'tomasiser/vim-code-dark'
|
use 'tomasiser/vim-code-dark'
|
||||||
use 'bling/vim-airline'
|
use 'vim-airline/vim-airline'
|
||||||
|
|
||||||
use 'Raimondi/delimitMate'
|
use 'Raimondi/delimitMate'
|
||||||
-- use 'scrooloose/nerdtree'
|
-- use 'scrooloose/nerdtree'
|
||||||
|
@ -18,9 +18,6 @@ require('packer').startup(function()
|
||||||
'kyazdani42/nvim-tree.lua',
|
'kyazdani42/nvim-tree.lua',
|
||||||
requires = {
|
requires = {
|
||||||
},
|
},
|
||||||
config = function() require'nvim-tree'.setup {
|
|
||||||
auto_close = true,
|
|
||||||
} end
|
|
||||||
}
|
}
|
||||||
use 'tpope/vim-commentary'
|
use 'tpope/vim-commentary'
|
||||||
use 'tpope/vim-surround'
|
use 'tpope/vim-surround'
|
||||||
|
@ -32,6 +29,7 @@ require('packer').startup(function()
|
||||||
'nvim-telescope/telescope.nvim',
|
'nvim-telescope/telescope.nvim',
|
||||||
requires = { {'nvim-lua/plenary.nvim'} }
|
requires = { {'nvim-lua/plenary.nvim'} }
|
||||||
}
|
}
|
||||||
|
use {'nvim-telescope/telescope-ui-select.nvim' }
|
||||||
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
||||||
|
|
||||||
use 'neovim/nvim-lspconfig'
|
use 'neovim/nvim-lspconfig'
|
||||||
|
@ -77,6 +75,10 @@ require('telescope').setup {
|
||||||
defaults = {
|
defaults = {
|
||||||
},
|
},
|
||||||
extensions = {
|
extensions = {
|
||||||
|
["ui-select"] = {
|
||||||
|
require("telescope.themes").get_dropdown {
|
||||||
|
}
|
||||||
|
},
|
||||||
fzf = {
|
fzf = {
|
||||||
fuzzy = true, -- false will only do exact matching
|
fuzzy = true, -- false will only do exact matching
|
||||||
override_generic_sorter = true, -- override the generic sorter
|
override_generic_sorter = true, -- override the generic sorter
|
||||||
|
@ -89,6 +91,7 @@ require('telescope').setup {
|
||||||
-- To get fzf loaded and working with telescope, you need to call
|
-- To get fzf loaded and working with telescope, you need to call
|
||||||
-- load_extension, somewhere after setup function:
|
-- load_extension, somewhere after setup function:
|
||||||
require('telescope').load_extension('fzf')
|
require('telescope').load_extension('fzf')
|
||||||
|
require("telescope").load_extension("ui-select")
|
||||||
|
|
||||||
require "lsp_signature".setup({
|
require "lsp_signature".setup({
|
||||||
hint_enable = false,
|
hint_enable = false,
|
||||||
|
@ -265,7 +268,7 @@ cmp.setup {
|
||||||
}
|
}
|
||||||
|
|
||||||
require'nvim-treesitter.configs'.setup {
|
require'nvim-treesitter.configs'.setup {
|
||||||
ensure_installed = "maintained",
|
ensure_installed = "all",
|
||||||
}
|
}
|
||||||
require('nvim-ts-autotag').setup()
|
require('nvim-ts-autotag').setup()
|
||||||
require'nvim-treesitter.configs'.setup {
|
require'nvim-treesitter.configs'.setup {
|
||||||
|
|
|
@ -44,8 +44,8 @@ local function save_profiles(threshold)
|
||||||
end
|
end
|
||||||
|
|
||||||
time([[Luarocks path setup]], true)
|
time([[Luarocks path setup]], true)
|
||||||
local package_path_str = "/home/tim/.cache/nvim/packer_hererocks/2.0.5/share/lua/5.1/?.lua;/home/tim/.cache/nvim/packer_hererocks/2.0.5/share/lua/5.1/?/init.lua;/home/tim/.cache/nvim/packer_hererocks/2.0.5/lib/luarocks/rocks-5.1/?.lua;/home/tim/.cache/nvim/packer_hererocks/2.0.5/lib/luarocks/rocks-5.1/?/init.lua"
|
local package_path_str = "/home/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||||
local install_cpath_pattern = "/home/tim/.cache/nvim/packer_hererocks/2.0.5/lib/lua/5.1/?.so"
|
local install_cpath_pattern = "/home/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
||||||
if not string.find(package.path, package_path_str, 1, true) then
|
if not string.find(package.path, package_path_str, 1, true) then
|
||||||
package.path = package.path .. ';' .. package_path_str
|
package.path = package.path .. ';' .. package_path_str
|
||||||
end
|
end
|
||||||
|
@ -135,7 +135,6 @@ _G.packer_plugins = {
|
||||||
url = "https://github.com/neovim/nvim-lspconfig"
|
url = "https://github.com/neovim/nvim-lspconfig"
|
||||||
},
|
},
|
||||||
["nvim-tree.lua"] = {
|
["nvim-tree.lua"] = {
|
||||||
config = { "\27LJ\1\2J\0\0\2\0\4\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\3\0>\0\2\1G\0\1\0\1\0\1\15auto_close\2\nsetup\14nvim-tree\frequire\0" },
|
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/tim/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
|
path = "/home/tim/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
|
||||||
url = "https://github.com/kyazdani42/nvim-tree.lua"
|
url = "https://github.com/kyazdani42/nvim-tree.lua"
|
||||||
|
@ -170,13 +169,18 @@ _G.packer_plugins = {
|
||||||
path = "/home/tim/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim",
|
path = "/home/tim/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim",
|
||||||
url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
|
url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
|
||||||
},
|
},
|
||||||
|
["telescope-ui-select.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/home/tim/.local/share/nvim/site/pack/packer/start/telescope-ui-select.nvim",
|
||||||
|
url = "https://github.com/nvim-telescope/telescope-ui-select.nvim"
|
||||||
|
},
|
||||||
["telescope.nvim"] = {
|
["telescope.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/tim/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
path = "/home/tim/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||||
url = "https://github.com/nvim-telescope/telescope.nvim"
|
url = "https://github.com/nvim-telescope/telescope.nvim"
|
||||||
},
|
},
|
||||||
["trouble.nvim"] = {
|
["trouble.nvim"] = {
|
||||||
config = { "\27LJ\1\2<EFBFBD>\1\0\0\3\0\6\0\t4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\4\0003\2\3\0:\2\5\1>\0\2\1G\0\1\0\nsigns\1\0\0\1\0\4\16information\tinfo\thint\thint\fwarning\twarn\nerror\nerror\nsetup\ftrouble\frequire\0" },
|
config = { "\27LJ\2\n<EFBFBD>\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\nsigns\1\0\0\1\0\4\nerror\nerror\16information\tinfo\thint\thint\fwarning\twarn\nsetup\ftrouble\frequire\0" },
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/tim/.local/share/nvim/site/pack/packer/start/trouble.nvim",
|
path = "/home/tim/.local/share/nvim/site/pack/packer/start/trouble.nvim",
|
||||||
url = "https://github.com/folke/trouble.nvim"
|
url = "https://github.com/folke/trouble.nvim"
|
||||||
|
@ -189,7 +193,7 @@ _G.packer_plugins = {
|
||||||
["vim-airline"] = {
|
["vim-airline"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/tim/.local/share/nvim/site/pack/packer/start/vim-airline",
|
path = "/home/tim/.local/share/nvim/site/pack/packer/start/vim-airline",
|
||||||
url = "https://github.com/bling/vim-airline"
|
url = "https://github.com/vim-airline/vim-airline"
|
||||||
},
|
},
|
||||||
["vim-bbye"] = {
|
["vim-bbye"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
|
@ -241,16 +245,13 @@ _G.packer_plugins = {
|
||||||
time([[Defining packer_plugins]], false)
|
time([[Defining packer_plugins]], false)
|
||||||
-- Config for: trouble.nvim
|
-- Config for: trouble.nvim
|
||||||
time([[Config for trouble.nvim]], true)
|
time([[Config for trouble.nvim]], true)
|
||||||
try_loadstring("\27LJ\1\2<EFBFBD>\1\0\0\3\0\6\0\t4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\4\0003\2\3\0:\2\5\1>\0\2\1G\0\1\0\nsigns\1\0\0\1\0\4\16information\tinfo\thint\thint\fwarning\twarn\nerror\nerror\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")
|
try_loadstring("\27LJ\2\n<EFBFBD>\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\nsigns\1\0\0\1\0\4\nerror\nerror\16information\tinfo\thint\thint\fwarning\twarn\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")
|
||||||
time([[Config for trouble.nvim]], false)
|
time([[Config for trouble.nvim]], false)
|
||||||
-- Config for: nvim-tree.lua
|
|
||||||
time([[Config for nvim-tree.lua]], true)
|
|
||||||
try_loadstring("\27LJ\1\2J\0\0\2\0\4\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\3\0>\0\2\1G\0\1\0\1\0\1\15auto_close\2\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua")
|
|
||||||
time([[Config for nvim-tree.lua]], false)
|
|
||||||
if should_profile then save_profiles() end
|
if should_profile then save_profiles() end
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
if not no_errors then
|
if not no_errors then
|
||||||
|
error_msg = error_msg:gsub('"', '\\"')
|
||||||
vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
|
vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user