jonas/nvim
1
0
Fork 0
mirror of https://github.com/Ascyii/nvim.git synced 2026-01-01 04:04:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the keymaps such that the keymaps are where the plugins are. This is for easy sharing of configurations

Browse Source
This commit is contained in:
Jonas Hahn
2025-08-29 13:34:49 +02:00
parent e37215ae97
commit e085a5cc23
11 changed files with 235 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lua/plugins/custom.lua
View File

@@ -1,14 +1,15 @@
-- Custom modules
--- @param name string
--- @param name? string
--- @return string
local function get_dir(name)
local function get_custom_dir(name)
if name == nil then
return vim.fn.stdpath("config") .. "/lua/custom"
end
return vim.fn.stdpath("config") .. "/lua/custom/" .. name
end
return {
{
dir = get_dir("todo"),
dir = get_custom_dir("todo"),
name = "todo",
dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" },
config = function()
@@ -16,7 +17,7 @@ return {
end,
},
{
dir = vim.fn.stdpath("config") .. "/lua/custom", -- folder containing typst.lua
dir = get_custom_dir(),
name = "typst",
dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" },
keys = {

2
lua/plugins/git.lua
View File

@@ -80,7 +80,7 @@ return {
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
map('n', '<leader>tw', gitsigns.toggle_word_diff)
-- map('n', '<leader>tw', gitsigns.toggle_word_diff)
-- Text object
map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)

2
lua/plugins/lsp.lua
View File

@@ -1,5 +1,5 @@
return {
{ "stevearc/aerial.nvim", opts = {} },
{ "stevearc/aerial.nvim", config = true },
{
"nvimdev/lspsaga.nvim",
opts = {

83
lua/plugins/misc.lua
View File

@@ -1,26 +1,77 @@
local base_zet = "~/synced/brainstore/zettelkasten"
return {
{ "ThePrimeagen/harpoon" },
{ "akinsho/toggleterm.nvim", config = true },
{
"ThePrimeagen/harpoon",
config = function()
vim.keymap.set("n", "<leader>af", function()
require("harpoon.mark").add_file()
end)
vim.keymap.set("n", "<leader>hf", function()
require("harpoon.ui").toggle_quick_menu()
end)
vim.keymap.set("n", "<leader>Hn", function()
require("harpoon.ui").nav_next()
end)
vim.keymap.set("n", "<leader>Hp", function()
require("harpoon.ui").nav_prev()
end)
end
},
{
"akinsho/toggleterm.nvim",
config = function()
-- Cannot setup with opts here need to call before using the command for the plugin
require("toggleterm").setup({
size = 20,
direction = "horizontal",
})
local first_open = false
local function toggle_term()
vim.cmd("ToggleTerm")
if first_open == true then
vim.cmd("startinsert")
end
end
vim.keymap.set("n", "<C-/>", toggle_term, { noremap = true, silent = true })
vim.keymap.set("t", "<C-/>", toggle_term, { noremap = true, silent = true })
end
},
{
'Ascyii/telekasten.nvim',
dev = true,
opts = {
home = vim.fn.expand(base_zet),
dailies = vim.fn.expand(base_zet .. "/daily"),
config = function()
-- Again can only use opts when not using config
require("telekasten").setup({
home = vim.fn.expand(base_zet),
dailies = vim.fn.expand(base_zet .. "/daily"),
image_subdir = vim.fn.expand(base_zet .. "/media"),
weeklies = vim.fn.expand(base_zet .. "/weekly"),
templates = vim.fn.expand(base_zet .. "/templates"),
template_new_note = vim.fn.expand(base_zet .. "/templates/note.md"),
template_new_daily = vim.fn.expand(base_zet .. "/templates/daily.md"),
template_new_weekly = vim.fn.expand(base_zet .. "/templates/weekly.md"),
image_subdir = vim.fn.expand(base_zet .. "/media"),
weeklies = vim.fn.expand(base_zet .. "/weekly"),
templates = vim.fn.expand(base_zet .. "/templates"),
template_new_note = vim.fn.expand(base_zet .. "/templates/note.md"),
template_new_daily = vim.fn.expand(base_zet .. "/templates/daily.md"),
template_new_weekly = vim.fn.expand(base_zet .. "/templates/weekly.md"),
filename_format = "%Y%m%d%H%M-%title%",
new_note_filename = "uuid-title",
uuid_type = "%Y%m%d%H%M",
uuid_separator = "-",
}
filename_format = "%Y%m%d%H%M-%title%",
new_note_filename = "uuid-title",
uuid_type = "%Y%m%d%H%M",
uuid_separator = "-",
})
vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<CR>")
vim.keymap.set("n", "<leader>zf", "<cmd>Telekasten find_notes<CR>")
vim.keymap.set("n", "<leader>zg", "<cmd>Telekasten search_notes<CR>")
vim.keymap.set("n", "<leader>zd", "<cmd>Telekasten goto_today<CR>")
vim.keymap.set("n", "<leader>zr", "<cmd>Telekasten rename_note<CR>")
vim.keymap.set("n", "<leader>zz", "<cmd>Telekasten follow_link<CR>")
vim.keymap.set("n", "<leader>zn", "<cmd>Telekasten new_note<CR>")
vim.keymap.set("n", "<leader>zb", "<cmd>Telekasten show_backlinks<CR>")
vim.keymap.set("n", "<leader>zw", "<cmd>Telekasten find_weekly_notes<CR>")
vim.keymap.set("n", "<leader>il", "<cmd>Telekasten insert_link<CR>")
vim.keymap.set("n", "<leader>zI", "<cmd>Telekasten insert_img_link<CR>")
end
},
};

6
lua/plugins/nvimtree.lua
View File

@@ -1,5 +1,11 @@
return {
"nvim-tree/nvim-tree.lua",
keys = {
{ "<leader>e", function()
require("nvim-tree.api").tree.toggle({ find_file = true, update_root = true, focus = true, })
end
}
},
opts = {
sort_by = "case_sensitive",

62
lua/plugins/searching.lua
View File

@@ -7,5 +7,67 @@ return {
{
"nvim-telescope/telescope.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
lazy = true,
keys = {
{
"<leader>tt",
":Telescope<CR>",
desc = "Telescope menu",
},
{
"<C-p>",
function()
require("telescope.builtin").buffers()
end,
desc = "Fzf current buffers"
},
{
"<leader>fr",
function()
require('telescope.builtin').oldfiles({
disable_devicons = true,
})
end,
desc = "Open last files"
},
{
"<leader>g",
function()
require('telescope.builtin').live_grep({
disable_devicons = true,
cwd = vim.fn.getcwd(),
additional_args = function()
return { '--hidden', '--glob', '!.git/*' }
end,
})
end
},
{
"<leader>fh",
function()
require('telescope.builtin').help_tags()
end,
},
{
"<leader><leader>",
function()
require('telescope.builtin').find_files({
hidden = true,
no_ignore = true, -- Also show files in gitignore
follow = true,
disable_devicons = true,
prompt_title = "Find Files - custom",
find_command = {
"rg", "--files",
"--glob", "!**/.git/*",
"--glob", "!**/build/*",
"--glob", "!**/*.{jpg,png,gif,mp4,mkv,tar,zip,iso}"
}
})
end
}
},
config = true,
},
}

8
lua/plugins/typstar.lua
View File

@@ -23,6 +23,14 @@ return {
"<Cmd>TypstarSmartJumpBack<CR>",
mode = { "s", "i" },
},
{
"<leader>ti",
":TypstarInsertRnote<CR>",
},
{
"<leader>to",
":TypstarOpenDrawing<CR>",
},
},
config = function()
local typstar = require("typstar")

8
lua/plugins/ui.lua
View File

@@ -63,8 +63,6 @@ return {
'lewis6991/gitsigns.nvim',
'nvim-tree/nvim-web-devicons',
},
init = function() vim.g.barbar_auto_setup = false end,
cmd = { "BufferNext", "BufferPrevious" },
opts = {
clickable = false,
tabpages = false,
@@ -72,5 +70,11 @@ return {
icons = { filetype = { enabled = false } }
},
version = '^1.0.0', -- only update when a new 1.x version is released
config = function()
vim.keymap.set("n", "L", ":BufferNext<CR>", { silent = true })
vim.keymap.set("n", "H", ":BufferPrevious<CR>", { silent = true })
vim.keymap.set("n", "<leader>bd", ":BufferDelete<CR>")
end
},
}