Merge branch 'main' of /var/git/dotfiles

3 files changed, 34 insertions, 1 deletions

diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua
index 8f8291e..36d55e3 100644
--- a/config/essentials/nvim/lua/user/cmp/setup.lua
+++ b/config/essentials/nvim/lua/user/cmp/setup.lua
@@ -42,3 +42,27 @@ cmp.setup.cmdline(':', {
 		{ name = 'cmdline', keyword_length = 4 }
 	}),
 })
+
+local function nnoremap(rhs, lhs, bufopts, desc)
+  bufopts.desc = desc
+  vim.keymap.set("n", rhs, lhs, bufopts)
+end
+
+-- Regular Neovim LSP client keymappings
+local bufopts = { noremap=true, silent=true }
+nnoremap('gD', vim.lsp.buf.declaration, bufopts, "Go to declaration")
+nnoremap('gd', vim.lsp.buf.definition, bufopts, "Go to definition")
+nnoremap('gi', vim.lsp.buf.implementation, bufopts, "Go to implementation")
+nnoremap('K', vim.lsp.buf.hover, bufopts, "Hover text")
+nnoremap('<C-k>', vim.lsp.buf.signature_help, bufopts, "Show signature")
+nnoremap('<leader>wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder")
+nnoremap('<leader>wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder")
+nnoremap('<leader>wl', function()
+print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+end, bufopts, "List workspace folders")
+nnoremap('<leader>D', vim.lsp.buf.type_definition, bufopts, "Go to type definition")
+nnoremap('<leader>rn', vim.lsp.buf.rename, bufopts, "Rename")
+nnoremap('<leader><Return>', vim.lsp.buf.code_action, bufopts, "Code actions")
+vim.keymap.set('v', "<leader><Return>", "<ESC><CMD>lua vim.lsp.buf.range_code_action()<CR>",
+{ noremap=true, silent=true, desc = "Code actions" })
+nnoremap('<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file")
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index 9351460..4a174bc 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -8,6 +8,7 @@ return require('packer').startup(function(use)
 	}
 	use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
 	use {'nvim-telescope/telescope-ui-select.nvim' }
+	use {'nvim-telescope/telescope-media-files.nvim'}
 
 	use('nvim-telescope/telescope-symbols.nvim')
 	use('theprimeagen/harpoon')
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 8004238..41072a6 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -50,6 +50,11 @@ require('telekasten').setup({
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
+		DataEssentials = {
+			home = home .. "/" .. "DataEssentials",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
 		NetworkEssentials = {
 			home = home .. "/" .. "NetworkEssentials",
 			template_new_note = home .. "/" .. "templates/new_note.md",
@@ -69,6 +74,7 @@ require('telekasten').setup({
 })
 
 vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<cr>")
+vim.keymap.set("n", "<leader>zb", "<cmd>Telekasten show_backlinks<cr>")
 vim.keymap.set("n", "<leader>zz", "<cmd>Telekasten follow_link<cr>")
 vim.keymap.set("n", "<leader>zN", "<cmd>Telekasten new_templated_note<cr>")
 vim.keymap.set("n", "<leader>zT", "<cmd>Telekasten goto_today<cr>")
@@ -79,7 +85,9 @@ vim.keymap.set("n", "<leader>zg", "<cmd>Telekasten search_notes<cr>")
 vim.keymap.set("n", "<leader>zm", "<cmd>Telekasten browse_media<cr>")
 vim.keymap.set("n", "<leader>zn", "<cmd>Telekasten new_note<cr>")
 vim.keymap.set("n", "<leader>zp", "<cmd>Telekasten preview_img<cr>")
+vim.keymap.set("n", "<leader>zr", "<cmd>Telekasten rename_note<cr>")
 vim.keymap.set("n", "<leader>zs", "<cmd>Telekasten switch_vault<cr>")
+vim.keymap.set("n", "<leader>zS", "<cmd>Telekasten search_notes<cr>")
 vim.keymap.set("n", "<leader>zt", "<cmd>Telekasten panel<cr>")
 vim.keymap.set("n", "<leader>zw", "<cmd>Telekasten find_weekly_notes<cr>")
-vim.keymap.set("n", "<leader>#", "<cmd>Telekasten show_tags<cr>")
+vim.keymap.set("n", "<leader>z#", "<cmd>Telekasten show_tags<cr>")