Skip to content

Commit

Permalink
chore: more QOL improvements and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinm6 committed Feb 16, 2025
1 parent ad50211 commit 873e83d
Show file tree
Hide file tree
Showing 10 changed files with 113 additions and 38 deletions.
8 changes: 6 additions & 2 deletions after/ftplugin/java.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if not has_jdtls then
return
end

local javaBin = vim.fn.expand [[/opt/homebrew/opt/openjdk@21/bin/java]]
local javaBin = vim.fn.expand [[/opt/homebrew/opt/openjdk/bin/java]]
if not vim.fn.exepath(javaBin) then
vim.notify("Java is not installed", vim.log.levels.ERROR, { title = "Java" })
return
Expand Down Expand Up @@ -87,7 +87,7 @@ local config = {
workspace_dir,
},
capabilities = capabilities,
-- root_dir = root_dir,
root_dir = root_dir,
single_file_support = true,
settings = {
java = {
Expand Down Expand Up @@ -116,6 +116,10 @@ local config = {
name = "JavaSE-21",
path = "/Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home",
},
{
name = "JavaSE-23",
path = "/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home",
},
},
},
testsCodeLens = { enabled = true },
Expand Down
44 changes: 22 additions & 22 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{
"SchemaStore.nvim": { "branch": "main", "commit": "b265e7b68308c9b68581d57c3f79419ce5e8dca2" },
"SchemaStore.nvim": { "branch": "main", "commit": "97b08f928d355bd6d5dee595fdf667b5bfb6329f" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
"blink.cmp": { "branch": "main", "commit": "cc2f10e9d8b6420324d4743a4d9a428de427e2cf" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
"conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" },
"go.nvim": { "branch": "master", "commit": "9ecbd0950bac754d9c449ca79e883ab6b230bda2" },
"gitsigns.nvim": { "branch": "main", "commit": "8b00147519d6f8353867d5d0b55f587306b0cfb6" },
"go.nvim": { "branch": "master", "commit": "d37c188ad9e38050ea84cb6f726edceb9a203f6b" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
"lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" },
"lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
"markdown.nvim": { "branch": "main", "commit": "5c2440d932a4ba96840e5ce5a7bd40f0624bdaa2" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
"mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
"mini.surround": { "branch": "main", "commit": "f40be56134835421061bf32c3702de9a29fb789c" },
"mini.surround": { "branch": "main", "commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb" },
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-dbee": { "branch": "master", "commit": "f9aa10f113ae439ef20c6d8b91b27dab93274360" },
"nvim-jdtls": { "branch": "master", "commit": "3cdd09f336ab7169476b936c0825213d86d32e41" },
"nvim-dbee": { "branch": "master", "commit": "42ddeb6e7bba643e0d8179a6213be9116b1509b3" },
"nvim-jdtls": { "branch": "master", "commit": "2f7bff9b8d2ee1918b36ca55f19547d9d335a268" },
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
"nvim-lspconfig": { "branch": "master", "commit": "75edb91a3d2deabe76a9911cde2c13d411b3b097" },
"nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
"nvim-treesitter": { "branch": "master", "commit": "62911c78a868bac24c8a86f2c1c412d0b799f885" },
"nvim-treesitter": { "branch": "master", "commit": "38e46a6d7ade5c8718f77b2b9fd98a0f7ab32c1e" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "81f5ffa6e8ba27c48403cf681d4b383d924e03e4" },
"nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
"otter.nvim": { "branch": "main", "commit": "0e42fa795c35c7190935e3beda3791189c41bb72" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"oil.nvim": { "branch": "master", "commit": "975a77cce3c8cb742bc1b3629f4328f5ca977dad" },
"otter.nvim": { "branch": "main", "commit": "21f042f4d1a9ff4788634ad76a10033eed13c7f2" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"quarto-nvim": { "branch": "main", "commit": "abc417c7e7422033f1090c0da5f30ef3ecb0c7ca" },
"sqls.nvim": { "branch": "main", "commit": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
"vimtex": { "branch": "master", "commit": "dfaf26c2cafddf61963ebeff28437352002691ac" },
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
"telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" },
"vimtex": { "branch": "master", "commit": "10c6c1672919db9d0687e5cb74d613dc811b1684" },
"which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" }
}
9 changes: 8 additions & 1 deletion lua/lib/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,11 @@ function M.user_command_toggle(name, var_name, opts)
})
end

return M
---TODO: define on nvim-0.11
-- function M.detaching()
-- local addr = vim.v.servername
-- -- save into file in stdpath 'state'
-- local save_addr_path = vim.fn.stdpath "state" .. "/nvim_server_addr"
-- end

return M
8 changes: 6 additions & 2 deletions lua/plugins/editor/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
return {
"saghen/blink.cmp",
event = { "InsertEnter", "CmdlineEnter" },
-- enabled = function()
-- return vim.fn.has "nvim-0.11" ~= 1
-- end,
version = "v0.*",
opts = {
keymap = {
Expand All @@ -20,8 +23,9 @@ return {
["<C-i>"] = { "snippet_forward", "fallback" },
["<C-S-i>"] = { "snippet_backward", "fallback" },
["<C-Space>"] = { "show", "show_documentation", "hide_documentation" },

cmdline = {
},
cmdline = {
keymap = {
["<C-i>"] = { "select_and_accept", "fallback" },
["<C-k>"] = { "select_prev", "fallback" },
["<C-j>"] = { "select_next", "fallback" },
Expand Down
6 changes: 3 additions & 3 deletions lua/plugins/lsp/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ local function set_buf_funcs_for_capabilities(client, bufnr)

-- Completion
-- TODO nvim-0.11
-- if vim.fn.has "nvim-0.11" == 1 then -- and client.supports_method "textDocument/completion" then
-- vim.lsp.completion.enable(true, client.id, bufnr, { autotrigger = true })
-- end
if vim.fn.has "nvim-0.11" == 1 then -- and client.supports_method "textDocument/completion" then
vim.lsp.completion.enable(true, client.id, bufnr, { autotrigger = true })
end

-- InlayHints
if client.supports_method "textDocument/inlayHint" then
Expand Down
16 changes: 11 additions & 5 deletions lua/plugins/utils/markdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ return {
"MeanderingProgrammer/markdown.nvim",
main = "render-markdown",
ft = { "markdown", "quarto" },
keys = {
{
"<localleader>r",
function()
require("render-markdown").toggle()
end,
{ "markdown", "quarto" },
desc = "Render Markdown",
},
},
opts = function(_, o)
o.enabled = false -- not rendering on enter md files
o.file_types = { "markdown", "quarto" } -- TODO to test
Expand All @@ -61,9 +71,5 @@ return {
}

vim.api.nvim_set_hl(0, "RenderMarkdownCode", { link = "TabLine" })

vim.keymap.set("n", "<localleader>r", function()
require("render-markdown").toggle()
end, { desc = "Render Markdown", buffer = true })
end,
}
}
4 changes: 2 additions & 2 deletions plugin/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ nmap { "N", "Nzz" }
nmap { "#", "#zz" }
nmap { "g*", "g*zz" }
nmap { "S", ":%s///g<Left><Left><Left>" }
nmap { "<M-s>", ":%s//&/gn<Left><Left><Left><Left><Left>", "Count occurrences of search" }
nmap { "<M-s>", ":%s/<C-r><C-w>/&/gn<Left><Left><Left><Left><Left>", "Count occurrences of search" }
-- nmap { "<M-S-->", "<C-w>| <C-w>_" }
-- nmap { "<M-J>", "<C-w>J" }
-- nmap { "<M-K>", "<C-w>K" }
Expand Down Expand Up @@ -381,7 +381,7 @@ vim.cmd.cnoreabbrev("Xa", "xa")
vim.cmd.cnoreabbrev("XA", "xa")

--TODO nvim-0.11 ?
--NOTE enable on nvim-0.11 and disable nvim-cmp?
--NOTE enable on nvim-0.11 if snippets are available?
---Completion
-- local function feedkeys(keys)
-- vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(keys, true, false, true), "n", true)
Expand Down
2 changes: 1 addition & 1 deletion plugin/usercommands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,4 @@ usercmd_toggle("ToggleAutoTrimTrailSpaces", "auto_remove_trail_spaces", {
vim.api.nvim_del_autocmd(autocmd[1].id)
end
end,
})
})
6 changes: 6 additions & 0 deletions templates/.editorconfig.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
48 changes: 48 additions & 0 deletions templates/tex.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
\documentclass[a4paper, oneside, halfparskip, 11pt]{scrartcl}

\usepackage[ngerman]{babel}
\usepackage[utf8]{inputenc}

\usepackage{mathpazo}
\usepackage{textcomp}

\usepackage[left=2cm,right=2cm, top=2cm, bottom=2cm, includeheadfoot]{geometry}

\usepackage{graphicx}
\usepackage{amsmath}
\usepackage{listings}
\usepackage{paralist}

\usepackage{scrpage2}
\usepackage{array}
\usepackage{url}
\usepackage{lastpage}

\usepackage{setspace}

\ihead{IHEAD}
\chead{}
\ohead{AUTHOR}
\ifoot{}
\cfoot{\pagemark / \pageref{LastPage}}
\ofoot{}

\setheadsepline{1pt}
\setfootsepline{1pt}

\pagestyle{scrheadings}

\begin{document}

\begin{titlepage}
\title{TITLE}
\author{AUTHOR}

\maketitle
\tableofcontents
\end{titlepage}

%\onehalfspacing

\label{LastPage}
\end{document}

0 comments on commit 873e83d

Please sign in to comment.