mirror of
https://codeberg.org/Mo8it/dotfiles.git
synced 2024-10-17 20:52:40 +00:00
Use navic instead of gps
This commit is contained in:
parent
12214820b9
commit
c7a868b6c5
4 changed files with 27 additions and 23 deletions
|
@ -72,11 +72,11 @@ return require("packer").startup({
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
run = ":TSUpdate",
|
run = ":TSUpdate",
|
||||||
})
|
})
|
||||||
-- GPS
|
-- Navic
|
||||||
use({
|
use({
|
||||||
"SmiteshP/nvim-gps",
|
"SmiteshP/nvim-navic",
|
||||||
requires = {
|
requires = {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"neovim/nvim-lspconfig",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
-- Rainbow parentheses
|
-- Rainbow parentheses
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
require("nvim-gps").setup()
|
|
|
@ -25,7 +25,10 @@ local function format_on_save(client, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
local lsp_signature = require("lsp_signature")
|
local lsp_signature = require("lsp_signature")
|
||||||
lsp_signature_config = {
|
local navic = require("nvim-navic")
|
||||||
|
|
||||||
|
local function on_attach_without_formatting(client, bufnr)
|
||||||
|
lsp_signature_config = {
|
||||||
bind = true,
|
bind = true,
|
||||||
doc_lines = 0,
|
doc_lines = 0,
|
||||||
hint_prefix = "💡 ",
|
hint_prefix = "💡 ",
|
||||||
|
@ -33,20 +36,22 @@ lsp_signature_config = {
|
||||||
border = "single",
|
border = "single",
|
||||||
},
|
},
|
||||||
transparency = 10,
|
transparency = 10,
|
||||||
}
|
}
|
||||||
|
|
||||||
lspconfig["jedi-language-server"].setup({
|
|
||||||
capabilities = capabilities,
|
|
||||||
on_attach = function(client, bufnr)
|
|
||||||
lsp_signature.on_attach(lsp_signature_config)
|
lsp_signature.on_attach(lsp_signature_config)
|
||||||
end,
|
|
||||||
})
|
navic.attach(client, bufnr)
|
||||||
|
end
|
||||||
|
|
||||||
local function on_attach_with_formatting(client, bufnr)
|
local function on_attach_with_formatting(client, bufnr)
|
||||||
lsp_signature.on_attach(lsp_signature_config)
|
on_attach_without_formatting(client, bufnr)
|
||||||
format_on_save(client, bufnr)
|
format_on_save(client, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
lspconfig["jedi_language_server"].setup({
|
||||||
|
capabilities = capabilities,
|
||||||
|
on_attach = on_attach_without_formatting,
|
||||||
|
})
|
||||||
|
|
||||||
lspconfig["julials"].setup({
|
lspconfig["julials"].setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach_with_formatting,
|
on_attach = on_attach_with_formatting,
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
local gps = require("nvim-gps")
|
|
||||||
|
|
||||||
local function search_count()
|
local function search_count()
|
||||||
if vim.api.nvim_get_vvar("hlsearch") == 1 then
|
if vim.api.nvim_get_vvar("hlsearch") == 1 then
|
||||||
local res = vim.fn.searchcount({ maxcount = 999, timeout = 500 })
|
local res = vim.fn.searchcount({ maxcount = 999, timeout = 500 })
|
||||||
|
@ -12,11 +10,13 @@ local function search_count()
|
||||||
return ""
|
return ""
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local navic = require("nvim-navic")
|
||||||
|
|
||||||
require("lualine").setup({
|
require("lualine").setup({
|
||||||
sections = {
|
sections = {
|
||||||
lualine_a = { "filename" },
|
lualine_a = { "filename" },
|
||||||
lualine_b = { { search_count, type = "lua_expr" } },
|
lualine_b = { { search_count, type = "lua_expr" } },
|
||||||
lualine_c = { { gps.get_location, cond = gps.is_available } },
|
lualine_c = { { navic.get_location, cond = navic.is_available } },
|
||||||
lualine_x = {},
|
lualine_x = {},
|
||||||
lualine_y = { "branch" },
|
lualine_y = { "branch" },
|
||||||
lualine_z = { "filetype" },
|
lualine_z = { "filetype" },
|
||||||
|
|
Loading…
Reference in a new issue