Recover linting info. Small tweaks
This commit is contained in:
parent
219d254ea5
commit
4287dfe370
5
init.lua
5
init.lua
|
@ -1,11 +1,14 @@
|
||||||
-- Lua quick doc reference https://learnxinyminutes.com/docs/lua/
|
-- Lua quick doc reference https://learnxinyminutes.com/docs/lua/
|
||||||
|
|
||||||
require "core.settings"
|
-- Sets <space> as the <leader> key
|
||||||
|
vim.g.mapleader = ' '
|
||||||
|
vim.g.maplocalleader = ' '
|
||||||
|
|
||||||
-- Bootsrap plugin manager
|
-- Bootsrap plugin manager
|
||||||
require "core.bootstrap-plugin-manager"
|
require "core.bootstrap-plugin-manager"
|
||||||
|
|
||||||
require "core.plugins"
|
require "core.plugins"
|
||||||
|
require "core.settings"
|
||||||
require "core.keymaps"
|
require "core.keymaps"
|
||||||
require "core.setup"
|
require "core.setup"
|
||||||
|
|
||||||
|
|
|
@ -26,13 +26,16 @@ return function(buffer)
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
end, '[W]orkspace [L]ist Folders')
|
end, '[W]orkspace [L]ist Folders')
|
||||||
|
|
||||||
-- nvim-ufo mappings
|
local function peekAtFold()
|
||||||
nmap("zR", require("ufo").openAllFolds, "Open All Folds")
|
|
||||||
nmap("zM", require("ufo").closeAllFolds, "Close All Folds")
|
|
||||||
nmap("zj", function()
|
|
||||||
local winid = require("ufo").peekFoldedLinesUnderCursor()
|
local winid = require("ufo").peekFoldedLinesUnderCursor()
|
||||||
|
|
||||||
if not winid then
|
if not winid then
|
||||||
vim.lsp.buf.hover()
|
vim.lsp.buf.hover()
|
||||||
end
|
end
|
||||||
end, "Peek At Current Fold")
|
end
|
||||||
|
|
||||||
|
-- nvim-ufo mappings
|
||||||
|
nmap("zR", require("ufo").openAllFolds, "Open All Folds")
|
||||||
|
nmap("zM", require("ufo").closeAllFolds, "Close All Folds")
|
||||||
|
nmap("zj", peekAtFold, "Peek At Current Fold")
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
return {
|
||||||
|
'nvim-telescope/telescope.nvim',
|
||||||
|
branch = '0.1.x',
|
||||||
|
dependencies = {
|
||||||
|
'nvim-lua/plenary.nvim',
|
||||||
|
-- Fuzzy Finder Algorithm which requires local dependencies to be built.
|
||||||
|
-- Only load if `make` is available. Make sure you have the system
|
||||||
|
-- requirements installed.
|
||||||
|
{
|
||||||
|
'nvim-telescope/telescope-fzf-native.nvim',
|
||||||
|
-- NOTE: If you are having trouble with this installation,
|
||||||
|
-- refer to the README for telescope-fzf-native for more instructions.
|
||||||
|
build = 'make',
|
||||||
|
cond = function()
|
||||||
|
return vim.fn.executable 'make' == 1
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
|
@ -103,20 +103,7 @@ local plugins = {
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Fuzzy Finder (files, lsp, etc)
|
-- Fuzzy Finder (files, lsp, etc)
|
||||||
{ 'nvim-telescope/telescope.nvim', branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } },
|
require 'core.plugins.file-search',
|
||||||
|
|
||||||
-- Fuzzy Finder Algorithm which requires local dependencies to be built.
|
|
||||||
-- Only load if `make` is available. Make sure you have the system
|
|
||||||
-- requirements installed.
|
|
||||||
{
|
|
||||||
'nvim-telescope/telescope-fzf-native.nvim',
|
|
||||||
-- NOTE: If you are having trouble with this installation,
|
|
||||||
-- refer to the README for telescope-fzf-native for more instructions.
|
|
||||||
build = 'make',
|
|
||||||
cond = function()
|
|
||||||
return vim.fn.executable 'make' == 1
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
-- Highlight, edit, and navigate code
|
-- Highlight, edit, and navigate code
|
||||||
|
@ -137,7 +124,6 @@ local plugins = {
|
||||||
|
|
||||||
require 'core.plugins.todo-comments',
|
require 'core.plugins.todo-comments',
|
||||||
|
|
||||||
-- require 'core.plugins.neo-tree',
|
|
||||||
require 'core.plugins.project-tree',
|
require 'core.plugins.project-tree',
|
||||||
|
|
||||||
require 'core.plugins.nvim-ufo',
|
require 'core.plugins.nvim-ufo',
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
-- [[ Setting options ]]
|
-- [[ Setting options ]]
|
||||||
|
|
||||||
-- Sets <space> as the <leader> key
|
|
||||||
vim.g.mapleader = ' '
|
|
||||||
vim.g.maplocalleader = ' '
|
|
||||||
|
|
||||||
-- As in nvim-tree docs
|
-- As in nvim-tree docs
|
||||||
|
|
||||||
-- disable netrw at the very start of your init.lua
|
-- disable netrw at the very start of your init.lua
|
||||||
|
@ -40,6 +36,9 @@ vim.o.smartcase = true
|
||||||
-- Keep signcolumn on by default
|
-- Keep signcolumn on by default
|
||||||
vim.wo.signcolumn = 'yes'
|
vim.wo.signcolumn = 'yes'
|
||||||
|
|
||||||
|
-- Save undo history
|
||||||
|
vim.o.undofile = true
|
||||||
|
|
||||||
-- Decrease update time
|
-- Decrease update time
|
||||||
vim.o.updatetime = 250
|
vim.o.updatetime = 250
|
||||||
vim.o.timeout = true
|
vim.o.timeout = true
|
||||||
|
|
|
@ -67,11 +67,6 @@ end
|
||||||
require('lspconfig').tsserver.setup {
|
require('lspconfig').tsserver.setup {
|
||||||
on_attach = tsserver_on_attach,
|
on_attach = tsserver_on_attach,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
init_options = {
|
|
||||||
preferences = {
|
|
||||||
disableSuggestions = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
commands = {
|
commands = {
|
||||||
OrganizeImports = {
|
OrganizeImports = {
|
||||||
organize_imports,
|
organize_imports,
|
||||||
|
|
Loading…
Reference in New Issue