Dotfiles V1.5.2
This commit is contained in:
1 parent
1ec21e387a
commit
b5c9d585c1
51 files changed
+1356
-1082
No files matched your search
@@ -5,4 +5,5 @@ local keymap = vim.keymap
|
||||
keymap.set("i", "jk", "<ESC>", { desc = "Exit out of insert mode" })
|
||||
keymap.set("n", "<leader>q", "<cmd>wq<CR>", { desc = "Exit NeoVim and Save file" })
|
||||
keymap.set("n", "<leader>w", "<cmd>w<CR>", { desc = "Save file" })
|
||||
keymap.set("n", "<leader>x", "<cmd>bd<CR>", { desc = "Delete Buffer" })
|
||||
keymap.set("n", "<leader>-", "gcc", { desc = "Toggle comment" })
|
||||
@@ -1,8 +1,17 @@
|
||||
local opt = vim.opt
|
||||
|
||||
opt.termsync = false
|
||||
|
||||
opt.relativenumber = true
|
||||
opt.number = true
|
||||
|
||||
-- treesitter
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
callback = function()
|
||||
pcall(vim.treesitter.start)
|
||||
end,
|
||||
})
|
||||
|
||||
-- tabs & indentation
|
||||
opt.tabstop = 2
|
||||
opt.shiftwidth = 2
|
||||
|
||||
@@ -21,15 +21,15 @@ return {
|
||||
wk.add({
|
||||
{ "<leader>l", group = "lsp", icon = "" },
|
||||
{ "<leader>lr", "<cmd>Telescope lsp_references<CR>", desc = "Show references", icon = "" },
|
||||
{ "<leader>lD", "<cmd>lua vim.lsp.buf.defenition()<CR>", desc = "Show defenition", icon = "" },
|
||||
{ "<leader>lD", "<cmd>lua vim.lsp.buf.definition()<CR>", desc = "Show defenition", icon = "" },
|
||||
{ "<leader>lc", "<cmd>lua vim.lsp.buf.code_action()<CR>", desc = "Code actions", icon = "" },
|
||||
{ "<leader>lR", "<cmd>lua vim.lsp.buf.rename()<CR>", desc = "Smart rename", icon = "" },
|
||||
{ "<leader>ld", "<cmd>Telescope diagnostics bufnr=0<CR>", desc = "Diagnostics", icon = "" },
|
||||
{ "<leader>ll", "<cmd>lua vim.lsp.buf.open_float()<CR>", desc = "Line Diagnostics", icon = "" },
|
||||
{ "<leader>ln", "<cmd>lua vim.diagnostics.goto_next()<CR>", desc = "Go to next Diagnostic", icon = "" },
|
||||
{ "<leader>ln", "<cmd>lua vim.diagnostic.goto_next()<CR>", desc = "Go to next Diagnostic", icon = "" },
|
||||
{
|
||||
"<leader>lp",
|
||||
"<cmd>lua vim.diagnostics.goto_prev()<CR>",
|
||||
"<cmd>lua vim.diagnostic.goto_prev()<CR>",
|
||||
desc = "Go to previous Diagnostic",
|
||||
icon = "",
|
||||
},
|
||||
|
||||
@@ -8,8 +8,9 @@ return {
|
||||
"clangd",
|
||||
"marksman",
|
||||
"texlab",
|
||||
"ltex",
|
||||
"ltex_plus",
|
||||
"gopls",
|
||||
"tinymist",
|
||||
},
|
||||
},
|
||||
dependencies = {
|
||||
@@ -25,11 +26,11 @@ return {
|
||||
"clang-format",
|
||||
"stylua",
|
||||
"prettier",
|
||||
"vale",
|
||||
"latexindent",
|
||||
"goimports-reviser",
|
||||
"golines",
|
||||
"golangci-lint",
|
||||
"typstyle",
|
||||
},
|
||||
},
|
||||
dependencies = {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
return {
|
||||
"MeanderingProgrammer/render-markdown.nvim",
|
||||
dependencies = { "nvim-mini/mini.nvim" }, -- if you use the mini.nvim suite
|
||||
---@module 'render-markdown'
|
||||
---@type render.md.UserConfig
|
||||
opts = {
|
||||
render_modes = true,
|
||||
},
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
return {
|
||||
"nvimdev/template.nvim",
|
||||
"glepnir/template.nvim",
|
||||
cmd = { "Template", "TemProject" },
|
||||
config = function()
|
||||
local template = require("template")
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
lazy = true,
|
||||
config = function()
|
||||
require("nvim-treesitter.configs").setup({
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
lookahead = true,
|
||||
keymaps = {
|
||||
["a="] = { query = "@assignment.outer", desc = "Select outer part of an assignment" },
|
||||
["i="] = { query = "@assignment.inner", desc = "Select inner part of an assignment" },
|
||||
["l="] = { query = "@assignment.lhs", desc = "Select left hand side of an assignment" },
|
||||
["r="] = { query = "@assignment.rhs", desc = "Select right hand side of an assignment" },
|
||||
["a:"] = { query = "@property.outer", desc = "Select outer part of an object property" },
|
||||
["i:"] = { query = "@property.inner", desc = "Select inner part of an object property" },
|
||||
["l:"] = { query = "@property.lhs", desc = "Select left part of an object property" },
|
||||
["r:"] = { query = "@property.rhs", desc = "Select right part of an object property" },
|
||||
["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter/argument" },
|
||||
["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter/argument" },
|
||||
["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" },
|
||||
["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" },
|
||||
["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" },
|
||||
["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" },
|
||||
["af"] = { query = "@call.outer", desc = "Select outer part of a function call" },
|
||||
["if"] = { query = "@call.inner", desc = "Select inner part of a function call" },
|
||||
["am"] = {
|
||||
query = "@function.outer",
|
||||
desc = "Select outer part of a method or function definition",
|
||||
},
|
||||
["im"] = {
|
||||
query = "@function.inner",
|
||||
desc = "Select inner part of a method or function definition",
|
||||
},
|
||||
["ac"] = { query = "@class.outer", desc = "Select outer part of a class" },
|
||||
["ic"] = { query = "@class.inner", desc = "Select inner part of a class" },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
@@ -1,45 +1,55 @@
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
"windwp/nvim-ts-autotag",
|
||||
},
|
||||
config = function()
|
||||
local treesitter = require("nvim-treesitter.configs")
|
||||
{
|
||||
"romus204/tree-sitter-manager.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
config = function()
|
||||
local tsm = require("tree-sitter-manager")
|
||||
|
||||
treesitter.setup({
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = { "latex" },
|
||||
},
|
||||
indent = {
|
||||
enable = true,
|
||||
},
|
||||
autotag = {
|
||||
enable = true,
|
||||
},
|
||||
ensure_installed = {
|
||||
"python",
|
||||
"cpp",
|
||||
"lua",
|
||||
"markdown_inline",
|
||||
"html",
|
||||
"css",
|
||||
"bash",
|
||||
"latex",
|
||||
"r",
|
||||
},
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = "<C-space>",
|
||||
node_incremental = "<C-space>",
|
||||
scope_incremental = false,
|
||||
node_decremental = "<bs>",
|
||||
-- 1. Manage Parser Files
|
||||
tsm.setup({
|
||||
ensure_installed = {
|
||||
"python",
|
||||
"cpp",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"html",
|
||||
"css",
|
||||
"bash",
|
||||
"zsh",
|
||||
"latex",
|
||||
"r",
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
-- 2. Enable Native Highlighting Engine
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
callback = function(args)
|
||||
local bufnr = args.buf
|
||||
local ft = vim.bo[bufnr].filetype
|
||||
|
||||
-- Filter out common "non-code" or problematic filetypes
|
||||
local ignore_ft = { "noice", "prompt", "TelescopePrompt", "notify" }
|
||||
for _, v in ipairs(ignore_ft) do
|
||||
if ft == v then
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
-- Try to get the language for the filetype
|
||||
local lang = vim.treesitter.language.get_lang(ft)
|
||||
|
||||
-- ONLY start if we have a valid language AND the parser is actually installed
|
||||
if lang then
|
||||
-- pcall (protected call) prevents the "Parser could not be created" error
|
||||
-- from popping up in your face if the parser is missing/corrupted.
|
||||
local ok, _ = pcall(vim.treesitter.start, bufnr, lang)
|
||||
if ok then
|
||||
vim.opt_local.indentexpr = "v:lua.vim.treesitter.indentexpr()"
|
||||
end
|
||||
end
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
return {
|
||||
"christoomey/vim-tmux-navigator",
|
||||
cmd = {
|
||||
"TmuxNavigateLeft",
|
||||
"TmuxNavigateDown",
|
||||
"TmuxNavigateUp",
|
||||
"TmuxNavigateRight",
|
||||
},
|
||||
keys = {
|
||||
{ "<M-h>", "<cmd>TmuxNavigateLeft<cr>" },
|
||||
{ "<M-j>", "<cmd>TmuxNavigateDown<cr>" },
|
||||
{ "<M-k>", "<cmd>TmuxNavigateUp<cr>" },
|
||||
{ "<M-l>", "<cmd>TmuxNavigateRight<cr>" },
|
||||
},
|
||||
}
|
||||
@@ -22,6 +22,35 @@ return {
|
||||
{ "<leader>il", "<cmd>Lazy<CR>", desc = "Open Lazy Menu" },
|
||||
{ "<leader>im", "<cmd>Mason<CR>", desc = "Open Mason Menu" },
|
||||
{ "<leader>ie", "<cmd>VenvSelect<CR>", desc = "Python Virtual Environment Selector" },
|
||||
{ "<leader>p", group = "typst", icon = "" },
|
||||
{ "<leader>pc", "<cmd>!typst c %<CR>", desc = "Compile current file", icon = "" },
|
||||
{
|
||||
"<leader>pw",
|
||||
function()
|
||||
if _G.typst_job_id then
|
||||
vim.notify("Typst watch is already running!", vim.log.levels.WARN)
|
||||
return
|
||||
end
|
||||
_G.typst_job_id = vim.fn.jobstart({ "typst", "w", vim.fn.expand("%") })
|
||||
vim.notify("Typst watch started in background", vim.log.levels.INFO)
|
||||
end,
|
||||
desc = "Watch current file",
|
||||
icon = "",
|
||||
},
|
||||
{
|
||||
"<leader>ps",
|
||||
function()
|
||||
if _G.typst_job_id then
|
||||
vim.fn.jobstop(_G.typst_job_id)
|
||||
_G.typst_job_id = nil
|
||||
vim.notify("Typst watch stopped", vim.log.levels.INFO)
|
||||
else
|
||||
vim.notify("No Typst job running", vim.log.levels.WARN)
|
||||
end
|
||||
end,
|
||||
desc = "Stop watch current file",
|
||||
icon = "",
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
Reference in new issue
Block a user