diff --git a/home/editor/neovim/default.nix b/home/editor/neovim/default.nix
index 5c37f7b..f5600d7 100644
--- a/home/editor/neovim/default.nix
+++ b/home/editor/neovim/default.nix
@@ -16,17 +16,21 @@
         cmp_luasnip
         copilot-cmp
         copilot-lua
-        lsp-zero-nvim
+        gitsigns-nvim
+        indent-blankline-nvim
         lualine-nvim
         luasnip
         nvim-cmp
         nvim-lspconfig
         plenary-nvim
         telescope-nvim
+        telescope-fzf-native-nvim
+        todo-comments-nvim
+        trouble-nvim
         undotree
         vim-floaterm
-        vim-fugitive
         vim-sleuth
+        which-key-nvim
         (nvim-treesitter.withPlugins (p: [
           p.tree-sitter-yaml
           p.tree-sitter-nix
@@ -57,7 +61,7 @@
 
     # LSPs
     gopls
-    pyright
+    basedpyright
     nodePackages.typescript-language-server
     nodePackages.typescript
     nil
diff --git a/home/editor/neovim/keybinds.lua b/home/editor/neovim/keybinds.lua
index 4246d97..862f968 100644
--- a/home/editor/neovim/keybinds.lua
+++ b/home/editor/neovim/keybinds.lua
@@ -1,32 +1,57 @@
 -- Keybinds
-vim.keymap.set("n", "<Leader>ds", vim.diagnostic.open_float, { desc = "Show diagnostic" })
+
+-- Diagnostics
+vim.keymap.set("n", "<leader>ds", vim.diagnostic.open_float, { desc = "Show diagnostic" })
+vim.keymap.set("n", "<leader>dd", '<cmd>Trouble diagnostics toggle<CR>', { desc = "Diagnostics list" })
+vim.keymap.set("n", "<leader>db", '<cmd>Trouble diagnostics toggle filter.buf=0<CR>', { desc = "Buffer diagnostics" })
 
 -- Term
-vim.g.floaterm_keymap_toggle = '<leader>ft'
+vim.g.floaterm_keymap_toggle = '<leader>T'
 
 -- Tabs
-vim.keymap.set('n', '<leader>n', ':tabnew<CR>',
-	{ silent = true, desc = '[N]ew tab' })
-vim.keymap.set('n', '<leader>p', ':tabnext<CR>',
-	{ silent = true, desc = '[p]Next tab' })
-vim.keymap.set('n', '<leader>P', ':tabprev<CR>',
-	{ silent = true, desc = '[P]Previous tab' })
+vim.keymap.set('n', '<leader>tn', ':tabnew<CR>',
+	{ silent = true, desc = 'New tab' })
+vim.keymap.set('n', '<leader>tp', ':tabnext<CR>',
+	{ silent = true, desc = 'Next tab' })
+vim.keymap.set('n', '<leader>tP', ':tabprev<CR>',
+	{ silent = true, desc = 'Previous tab' })
 
 -- Telescope
 vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles,
-	{ desc = '[?] FInd recently opened files' })
+	{ desc = 'Find recently opened files' })
 vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
-	{ desc = '[F]ind [F]iles' })
-vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
-	{ desc = '[F]ind [F]iles' })
+	{ desc = 'Find files' })
 vim.keymap.set('n', '<leader>fg', require('telescope.builtin').live_grep,
-	{ desc = '[F]ind by [G]rep' })
+	{ desc = 'Find by grep' })
+vim.keymap.set('n', '<leader>fb', require('telescope.builtin').buffers,
+	{ desc = 'Find buffers' })
+vim.keymap.set('n', '<leader>fd', require('telescope.builtin').diagnostics,
+	{ desc = 'Find diagnostics' })
+vim.keymap.set('n', '<leader>fw', require('telescope.builtin').grep_string,
+	{ desc = 'Find word under cursor' })
 
--- Tabs
-vim.keymap.set('n', '<leader>tt', ':tabnew<cr>')
-vim.keymap.set('n', '<leader>tn', ':tabnext<cr>')
-vim.keymap.set('n', '<leader>tp', ':tabprevious<cr>')
+-- Undotree
+vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle,
+	{ desc = 'Toggle undotree' })
+
+-- Gitsigns
+local gs = require('gitsigns')
+vim.keymap.set('n', ']h', gs.next_hunk, { desc = 'Next git hunk' })
+vim.keymap.set('n', '[h', gs.prev_hunk, { desc = 'Previous git hunk' })
+vim.keymap.set('n', '<leader>gs', gs.stage_hunk, { desc = 'Stage hunk' })
+vim.keymap.set('n', '<leader>gr', gs.reset_hunk, { desc = 'Reset hunk' })
+vim.keymap.set('n', '<leader>gS', gs.stage_buffer, { desc = 'Stage buffer' })
+vim.keymap.set('n', '<leader>gR', gs.reset_buffer, { desc = 'Reset buffer' })
+vim.keymap.set('n', '<leader>gp', gs.preview_hunk, { desc = 'Preview hunk' })
+vim.keymap.set('n', '<leader>gb', gs.blame_line, { desc = 'Blame line' })
+
+-- Todo comments
+vim.keymap.set('n', ']t', function() require('todo-comments').jump_next() end, { desc = 'Next todo comment' })
+vim.keymap.set('n', '[t', function() require('todo-comments').jump_prev() end, { desc = 'Previous todo comment' })
+vim.keymap.set('n', '<leader>ft', '<cmd>TodoTelescope<CR>', { desc = 'Find TODOs' })
 
 -- LSP
-vim.keymap.set('n', 'gD', vim.lsp.buf.declaration)
-vim.keymap.set('n', 'gd', vim.lsp.buf.definition)
+vim.keymap.set('n', '<leader>lr', vim.lsp.buf.rename, { desc = 'Rename' })
+vim.keymap.set('n', '<leader>la', vim.lsp.buf.code_action, { desc = 'Code action' })
+vim.keymap.set('n', '<leader>lf', function() vim.lsp.buf.format({ async = false }) end,
+	{ desc = 'Format' })
diff --git a/home/editor/neovim/plugins.lua b/home/editor/neovim/plugins.lua
index d17769f..db7de1e 100644
--- a/home/editor/neovim/plugins.lua
+++ b/home/editor/neovim/plugins.lua
@@ -1,25 +1,13 @@
 -- Plugins
 
--- LSP stuff
-local lsp_zero = require('lsp-zero')
-
-
-lsp_zero.on_attach(function(_, bufnr)
-	lsp_zero.default_keymaps({ buffer = bufnr })
-end)
-
-lsp_zero.format_on_save({
-	format_opts = {
-		async = false,
-		timeout_ms = 10000,
-	},
-	servers = {
-		['gopls'] = { 'go' },
-		['nil_ls'] = { 'nix' },
-		['lua_ls'] = { 'lua' },
-		['ts_ls'] = { 'typescript', 'javascript', 'typescriptreact' },
-	},
+-- Format on save for nix, lua, ts/js
+vim.api.nvim_create_autocmd("BufWritePre", {
+	pattern = { "*.nix", "*.lua", "*.ts", "*.tsx", "*.js" },
+	callback = function()
+		vim.lsp.buf.format({ async = false, timeout_ms = 10000 })
+	end,
 })
+
 -- LSP: go
 vim.lsp.config("gopls", {
 	settings = {
@@ -158,14 +146,12 @@ vim.api.nvim_create_autocmd("LspAttach", {
 	desc = 'LSP: Disable hover capability from Ruff',
 })
 
--- Pyright
-vim.lsp.config("pyright", {
+-- Basedpyright
+vim.lsp.config("basedpyright", {
 	settings = {
-		pyright = {
+		basedpyright = {
 			-- Using Ruff's import organizer
 			disableOrganizeImports = true,
-		},
-		python = {
 			analysis = {
 				-- Ignore all files for analysis to exclusively use Ruff for linting
 				ignore = { '*' },
@@ -173,7 +159,10 @@ vim.lsp.config("pyright", {
 		},
 	},
 })
-vim.lsp.enable({ "pyright" })
+vim.lsp.enable({ "basedpyright" })
+
+-- Gitsigns
+require('gitsigns').setup()
 
 -- Telescope
 require('telescope').setup({
@@ -186,8 +175,9 @@ require('telescope').setup({
 		}
 	},
 })
+require('telescope').load_extension('fzf')
 
--- Tresitter stuff
+-- Treesitter
 require('nvim-treesitter').setup {
 	ensure_installed = {},
 	auto_install = false,
@@ -262,12 +252,12 @@ require('copilot_cmp').setup()
 
 -- Cmp
 local cmp = require('cmp')
-local cmp_action = lsp_zero.cmp_action()
+local luasnip = require('luasnip')
 
 cmp.setup({
 	snippet = {
 		expand = function(args)
-			require('luasnip').lsp_expand(args.body)
+			luasnip.lsp_expand(args.body)
 		end,
 	},
 	mapping = cmp.mapping.preset.insert({
@@ -275,9 +265,25 @@ cmp.setup({
 		['<CR>'] = cmp.mapping.confirm({ select = false }),
 		-- Ctrl+Space to open completion menu
 		['<C-Space>'] = cmp.mapping.complete(),
-		-- Move between snippet placeholders
-		['<C-f>'] = cmp_action.luasnip_jump_forward(),
-		['<C-b>'] = cmp_action.luasnip_jump_backward(),
+		-- Tab to select next item or jump in snippet
+		['<Tab>'] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_next_item()
+			elseif luasnip.expand_or_jumpable() then
+				luasnip.expand_or_jump()
+			else
+				fallback()
+			end
+		end, { 'i', 's' }),
+		['<S-Tab>'] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_prev_item()
+			elseif luasnip.jumpable(-1) then
+				luasnip.jump(-1)
+			else
+				fallback()
+			end
+		end, { 'i', 's' }),
 		-- Scroll in completion docs
 		['<C-k>'] = cmp.mapping.scroll_docs(-4),
 		['<C-j>'] = cmp.mapping.scroll_docs(4),
@@ -292,6 +298,29 @@ cmp.setup({
 })
 
 
+-- Indent blankline
+require('ibl').setup()
+
+-- Trouble
+require('trouble').setup({
+	icons = false,
+})
+
+-- Todo comments
+require('todo-comments').setup({
+	signs = false,
+})
+
+-- Which-key
+require('which-key').setup()
+require('which-key').add({
+	{ "<leader>d", group = "Diagnostics" },
+	{ "<leader>f", group = "Find" },
+	{ "<leader>g", group = "Git" },
+	{ "<leader>l", group = "LSP" },
+	{ "<leader>t", group = "Tabs" },
+})
+
 -- Colorscheme
 require('catppuccin').setup {
 }