Skip to content

Commit

Permalink
chore: QOL improvements
Browse files Browse the repository at this point in the history
- fixes statusline colors messed up if colorscheme changes for some
reasons
  • Loading branch information
kevinm6 committed Jan 18, 2025
1 parent 9ed0c56 commit e3ae399
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 126 deletions.
33 changes: 10 additions & 23 deletions after/ftplugin/java.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,20 @@ local config = {
single_file_support = true,
settings = {
java = {
redhat = {
telemetry = { enabled = false },
},
redhat = { telemetry = { enabled = false } },
autobuild = { enabled = false },
eclipse = { downloadSources = true },
maven = { downloadSources = true },
signatureHelp = { enabled = true },
contentProvider = { preferred = "fernflower" },
saveActions = {
organizeImports = true,
},
saveActions = { organizeImports = false },
sources = {
organizeImports = {
starThreshold = 9999,
staticStarThreshold = 9999,
},
},
import = {
gradle = {
enabled = true,
},
},
import = { gradle = { enabled = true } },
configuration = {
updateBuildConfiguration = "interactive",
runtimes = {
Expand All @@ -127,21 +119,16 @@ local config = {
},
},
},
testsCodeLens = {
enabled = true,
},
implementationsCodeLens = {
enabled = true,
},
referencesCodeLens = {
enabled = true,
},
references = {
includeDecompiledSources = true,
},
testsCodeLens = { enabled = true },
implementationsCodeLens = { enabled = true },
referencesCodeLens = { enabled = true },
references = { includeDecompiledSources = true },
inlayHints = { parameterNames = { enabled = "all" } },
format = {
enabled = true,
settings = {
["org.eclipse.jdt.core.formatter.comment.line_length"] = 100,
},
},
completion = {
maxResults = 20,
Expand Down
36 changes: 18 additions & 18 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{
"SchemaStore.nvim": { "branch": "main", "commit": "438f4f1f1fb890980cb23002597f99c9579834bd" },
"SchemaStore.nvim": { "branch": "main", "commit": "b62efcb71077bfeb407dcd05fb0584e422131150" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
"conform.nvim": { "branch": "master", "commit": "6dc21d4ce050c2e592d9635b7983d67baf216e3d" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "b544bd62623ca1b483d8b9bfb6d65805f112a320" },
"go.nvim": { "branch": "master", "commit": "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc" },
"gitsigns.nvim": { "branch": "main", "commit": "817bd848fffe82e697b4da656e3f2834cd0665c5" },
"go.nvim": { "branch": "master", "commit": "6e5a74b866aa4a112ed85a1169befff2ef82c027" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"image.nvim": { "branch": "master", "commit": "f1163cc2f6fff5b0de7c23c7502eee0df23a3e0e" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
"markdown.nvim": { "branch": "main", "commit": "786d643ac7a691515d401930b8850f596992725d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
"markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" },
"mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"molten-nvim": { "branch": "main", "commit": "c621baf53459a6c45dfd98dcc11cbba7a7ae9470" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "b768c8d0ce6da614ac17ed097bf2d94e35fe1a58" },
"nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" },
"nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
"nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
"nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
"nvim-jdtls": { "branch": "master", "commit": "266d0cb912bbe61d66b43c5e73db19a364380360" },
"nvim-jdtls": { "branch": "master", "commit": "5b079475890a2a9ff45c850b428357cc89c95278" },
"nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
"nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" },
"nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" },
"nvim-treesitter": { "branch": "master", "commit": "10a9464a82fb540cca912a1d25810f242cb97b5f" },
"nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
"nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "7041528bdedb350ad66e650684deec8456e053cc" },
"otter.nvim": { "branch": "main", "commit": "e8c662e1aefa8b483cfba6e00729a39a363dcecc" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" },
"otter.nvim": { "branch": "main", "commit": "3ff6c154d55528fbde475b2a722f91389421e873" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"quarto-nvim": { "branch": "main", "commit": "1cb2d24d7793241bd43f38e3a6f99a6d11f84458" },
"sqls.nvim": { "branch": "main", "commit": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"vimtex": { "branch": "master", "commit": "f822c8018effb44dc0e810eb765ec9cb4f395b5a" },
"telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
"vimtex": { "branch": "master", "commit": "c8412f444bfaf447981242d685c40e45b1c96b82" },
"which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
}
30 changes: 21 additions & 9 deletions lua/lib/session.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-- Last Modified: 08 Sep 2024, 11:06
-------------------------------------

local session = {
local M = {
dir = string.format("%s/session", vim.fn.stdpath "state"),
}

Expand All @@ -14,7 +14,7 @@ local session = {
local function get_sessions()
local sessions = {}

local sessions_files = vim.split(vim.fn.globpath(session.dir, "*.vim"), "\n", { trimempty = true })
local sessions_files = vim.split(vim.fn.globpath(M.dir, "*.vim"), "\n", { trimempty = true })

for _, f in pairs(sessions_files) do
table.insert(sessions, f)
Expand Down Expand Up @@ -83,10 +83,10 @@ local function save_session()
default = nil,
}, function(input)
if input then
if vim.fn.isdirectory(session.dir) ~= 1 then
vim.fn.mkdir(session.dir, "pR")
if vim.fn.isdirectory(M.dir) ~= 1 then
vim.fn.mkdir(M.dir, "pR")
end
local new_session_path = string.format("%s/%s.vim", session.dir, input)
local new_session_path = string.format("%s/%s.vim", M.dir, input)
vim.cmd.mksession { new_session_path, bang = true }
-- vim.cmd("mksession! " .. mks_path)
vim.notify(string.format("Session < %s > created!", input), vim.log.levels.INFO)
Expand All @@ -95,13 +95,25 @@ local function save_session()
end

---Helper function to usercmd completion
function session.usercmd_session_completion()
function M.usercmd_session_completion()
local args = { "restore", "save", "delete" }
return table.concat(args, "\n")
end

function session.select(arg)
if arg == "save" then
function M.select(arg)
if arg == "" then
vim.ui.select({ "save", "delete", "restore" }, {
prompt = "Sessions> choose",
}, function(choice)
if choice == "save" then
save_session()
elseif choice == "delete_session" then
delete_session()
elseif choice == "restore_session" then
restore_session()
end
end)
elseif arg == "save" then
save_session()
elseif arg == "restore" then
restore_session()
Expand All @@ -112,4 +124,4 @@ function session.select(arg)
end
end

return session
return M
Loading

0 comments on commit e3ae399

Please sign in to comment.