summaryrefslogtreecommitdiff
path: root/config/essentials/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'config/essentials/nvim')
-rw-r--r--config/essentials/nvim/after/plugin/telescope.lua25
-rw-r--r--config/essentials/nvim/ftplugin/java.lua16
-rw-r--r--config/essentials/nvim/lua/user/cmp/setup.lua24
-rw-r--r--config/essentials/nvim/lua/user/packer.lua1
-rw-r--r--config/essentials/nvim/lua/user/zk.lua10
5 files changed, 42 insertions, 34 deletions
diff --git a/config/essentials/nvim/after/plugin/telescope.lua b/config/essentials/nvim/after/plugin/telescope.lua
index f93ed60..06c5a03 100644
--- a/config/essentials/nvim/after/plugin/telescope.lua
+++ b/config/essentials/nvim/after/plugin/telescope.lua
@@ -1,3 +1,6 @@
+require('telescope').load_extension('fzf')
+require('telescope').load_extension('media_files')
+
require('telescope').setup({
defaults = {
path_display = {
@@ -14,13 +17,17 @@ require('telescope').setup({
override_generic_sorter = true,
override_file_sorter = true,
case_mode = "smart_case",
+ },
+ media_files = {
+ filetypes = {"png", "webp", "jpg", "jpeg"},
+ find_cmd = "rg"
}
}
})
-require('telescope').load_extension('fzf')
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files)
+vim.keymap.set('n', '<leader>fb', builtin.buffers)
vim.keymap.set('n', '<leader>fg', builtin.git_files)
vim.keymap.set('n', '<leader>fw', builtin.live_grep)
-- symbols
@@ -35,23 +42,7 @@ require("telescope").setup {
require("telescope.themes").get_dropdown {
-- even more opts
}
-
- -- pseudo code / specification for writing custom displays, like the one
- -- for "codeactions"
- -- specific_opts = {
- -- [kind] = {
- -- make_indexed = function(items) -> indexed_items, width,
- -- make_displayer = function(widths) -> displayer
- -- make_display = function(displayer) -> function(e)
- -- make_ordinal = function(e) -> string
- -- },
- -- -- for example to disable the custom builtin "codeactions" display
- -- do the following
- -- codeactions = false,
- -- }
}
}
}
--- To get ui-select loaded and working with telescope, you need to call
--- load_extension, somewhere after setup function:
require("telescope").load_extension("ui-select")
diff --git a/config/essentials/nvim/ftplugin/java.lua b/config/essentials/nvim/ftplugin/java.lua
index d1df118..ce0a202 100644
--- a/config/essentials/nvim/ftplugin/java.lua
+++ b/config/essentials/nvim/ftplugin/java.lua
@@ -12,22 +12,6 @@ end
local on_attach = function(_, bufnr)
-- Regular Neovim LSP client keymappings
local bufopts = { noremap=true, silent=true, buffer=bufnr }
- 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, buffer=bufnr, desc = "Code actions" })
- nnoremap('<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file")
-- Java extensions provided by jdtls
nnoremap("<leader><leader>i", jdtls.organize_imports, bufopts, "Organize imports")
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>")
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-05 13:42:35 +0000