From 483c48635939854a5ac426abff3fe2bf8706a4a6 Mon Sep 17 00:00:00 2001
From: b12f <git@benjaminbaedorf.eu>
Date: Fri, 23 Aug 2024 18:59:52 +0200
Subject: [PATCH] modules/terminal-life: update nvim keybindings

---
 modules/terminal-life/nvim/init.vim    | 4 ----
 modules/terminal-life/nvim/lsp.vim     | 6 +++---
 modules/terminal-life/nvim/plugins.vim | 1 -
 treefmt.toml                           | 5 +++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/terminal-life/nvim/init.vim b/modules/terminal-life/nvim/init.vim
index d84a12a..4070cba 100644
--- a/modules/terminal-life/nvim/init.vim
+++ b/modules/terminal-life/nvim/init.vim
@@ -58,10 +58,6 @@ map <leader>wJ :wincmd H<CR>
 map <leader>wK :wincmd J<CR>
 map <leader>wL :wincmd L<CR>
 
-map <leader>tj :tabprevious<CR>
-map <leader>tl :tabnext<CR>
-map <leader>tq :tabclose<CR>
-
 " replay macro for each line of a visual selection
 xnoremap @q :normal @q<CR>
 xnoremap @@ :normal @@<CR>
diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index 8d806dd..2e7f25a 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -16,11 +16,11 @@ local lspconfig    = require('lspconfig')
 -- Mappings (global)
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
 local opts = { noremap=true, silent=true }
-vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
 vim.api.nvim_set_keymap('n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
 vim.api.nvim_set_keymap('n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
 vim.api.nvim_set_keymap('n', '<leader>dq', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+vim.api.nvim_set_keymap('n', '<leader>do', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
+vim.api.nvim_set_keymap('n', '<leader>bf', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 
 local on_attach = function(client, bufnr)
   -- Enable completion triggered by <c-x><c-o>
@@ -32,12 +32,12 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gT', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
 
diff --git a/modules/terminal-life/nvim/plugins.vim b/modules/terminal-life/nvim/plugins.vim
index b0ff194..a2bffce 100644
--- a/modules/terminal-life/nvim/plugins.vim
+++ b/modules/terminal-life/nvim/plugins.vim
@@ -84,7 +84,6 @@ local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
 vim.keymap.set('n', '<leader>f/', builtin.live_grep, {})
 vim.keymap.set('n', '<leader>f?', builtin.builtin, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
 vim.keymap.set('n', '<leader>fr', builtin.command_history, {})
 vim.keymap.set('n', '<leader>fc', builtin.commands, {})
 vim.keymap.set('n', '<leader>ft', builtin.treesitter, {})
diff --git a/treefmt.toml b/treefmt.toml
index 41ee305..0186e6a 100644
--- a/treefmt.toml
+++ b/treefmt.toml
@@ -1,7 +1,8 @@
 [formatter.nix]
-command = "alejandra"
+command = "nix"
+options = ["fmt"]
 includes = ["*.nix"]
-excludes = ["pkgs/_sources/generated.nix"]
+excludes = []
 
 [formatter.prettier]
 command = "prettier"