diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 73a5574..44084df 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -72,11 +72,11 @@ return require("packer").startup({
 			"nvim-treesitter/nvim-treesitter",
 			run = ":TSUpdate",
 		})
-		-- GPS
+		-- Navic
 		use({
-			"SmiteshP/nvim-gps",
+			"SmiteshP/nvim-navic",
 			requires = {
-				"nvim-treesitter/nvim-treesitter",
+				"neovim/nvim-lspconfig",
 			},
 		})
 		-- Rainbow parentheses
diff --git a/.config/nvim/lua/plugins/gps.lua b/.config/nvim/lua/plugins/gps.lua
deleted file mode 100644
index d0ce304..0000000
--- a/.config/nvim/lua/plugins/gps.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("nvim-gps").setup()
diff --git a/.config/nvim/lua/plugins/lsp-cmp.lua b/.config/nvim/lua/plugins/lsp-cmp.lua
index 1e95db9..790dfd9 100644
--- a/.config/nvim/lua/plugins/lsp-cmp.lua
+++ b/.config/nvim/lua/plugins/lsp-cmp.lua
@@ -25,28 +25,33 @@ local function format_on_save(client, bufnr)
 end
 
 local lsp_signature = require("lsp_signature")
-lsp_signature_config = {
-	bind = true,
-	doc_lines = 0,
-	hint_prefix = "💡 ",
-	handler_opts = {
-		border = "single",
-	},
-	transparency = 10,
-}
+local navic = require("nvim-navic")
 
-lspconfig["jedi-language-server"].setup({
-	capabilities = capabilities,
-	on_attach = function(client, bufnr)
-		lsp_signature.on_attach(lsp_signature_config)
-	end,
-})
+local function on_attach_without_formatting(client, bufnr)
+	lsp_signature_config = {
+		bind = true,
+		doc_lines = 0,
+		hint_prefix = "💡 ",
+		handler_opts = {
+			border = "single",
+		},
+		transparency = 10,
+	}
+	lsp_signature.on_attach(lsp_signature_config)
+
+	navic.attach(client, bufnr)
+end
 
 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)
 end
 
+lspconfig["jedi_language_server"].setup({
+	capabilities = capabilities,
+	on_attach = on_attach_without_formatting,
+})
+
 lspconfig["julials"].setup({
 	capabilities = capabilities,
 	on_attach = on_attach_with_formatting,
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index 8174599..583786b 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -1,5 +1,3 @@
-local gps = require("nvim-gps")
-
 local function search_count()
 	if vim.api.nvim_get_vvar("hlsearch") == 1 then
 		local res = vim.fn.searchcount({ maxcount = 999, timeout = 500 })
@@ -12,11 +10,13 @@ local function search_count()
 	return ""
 end
 
+local navic = require("nvim-navic")
+
 require("lualine").setup({
 	sections = {
 		lualine_a = { "filename" },
 		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_y = { "branch" },
 		lualine_z = { "filetype" },