squibid/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yes there's a bit of java in my nvim config why do you ask?

Browse Source
This commit is contained in:
Squibid
2024-08-09 02:45:31 -04:00
parent ad76983d96
commit c489d39369
104 changed files with 2058 additions and 2796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +0,0 @@
spell/

11
README.md
View File

@ -1,11 +0,0 @@
<h1 style="text-align: center;">Welcome To My Neovim Config</h1>
<hr>
## Versioning
The master branch contains my current config, major revisions are tagged: v#.#
## Use Case
My config is built around what I work on; this mainly includes: c, lua, java, and shell scripting. I also try to keep my config relatively portable which is why I to not use any nerd fonts
## Plugins
For plugin management I use my own [fork](https://git.squi.bid/dep/) of [Dep](https://github.com/chiyadev/dep) To find the current list of plugins go to the [plugin.lua](https://git.squi.bid/nvim/tree/lua/conf/plugins.lua) file.

6
after/ftplugin/c.lua Normal file
View File

@ -0,0 +1,6 @@
local misc = require('core.misc')
local map_local = misc.map_local
-- sort #includes <> (very jank)
-- TODO: rewrite in a semi-sane way
map_local("n", "cri", "mz/^#include.*<.*>$<CR>ggVGN:sort<CR>`z<cmd>delm z<CR>:nohlsearch<Bar>:echo<CR>")

1
after/ftplugin/gitcommit.lua
View File

@ -1 +0,0 @@
vim.cmd('startinsert | 1')

1
after/ftplugin/gitrebase.lua
View File

@ -1 +0,0 @@
gitcommit.lua

1
after/ftplugin/help.lua
View File

@ -1 +0,0 @@
vim.treesitter.start()

255
after/ftplugin/java.lua
View File

@ -1,255 +0,0 @@
-- NOTE: Make sure you're $JAVA_HOME is correct (prob should be 17 or higher)
local java_cmds = vim.api.nvim_create_augroup('java_cmds', {clear = true})
local cache_vars = {}
local root_files = {
'.git',
'mvnw',
'gradlew',
'pom.xml',
'build.gradle',
}
local features = {
-- change this to `true` to enable codelens
codelens = true,
-- change this to `true` if you have `nvim-dap`,
-- `java-test` and `java-debug-adapter` installed
debugger = true,
}
local function get_jdtls_paths()
if cache_vars.paths then
return cache_vars.paths
end
local path = {}
path.data_dir = vim.fn.stdpath('cache') .. '/nvim-jdtls'
local jdtls_install = require('mason-registry').get_package('jdtls'):get_install_path()
path.java_agent = jdtls_install .. '/lombok.jar'
path.launcher_jar = vim.fn.glob(jdtls_install .. '/plugins/org.eclipse.equinox.launcher_*.jar')
path.platform_config = jdtls_install .. '/config_linux'
path.bundles = {}
-- Include java-test bundle if present
local java_test_path = require('mason-registry')
.get_package('java-test')
:get_install_path()
local java_test_bundle = vim.split(
vim.fn.glob(java_test_path .. '/extension/server/*.jar'),
'\n'
)
if java_test_bundle[1] ~= '' then
vim.list_extend(path.bundles, java_test_bundle)
end
-- Include java-debug-adapter bundle if present
local java_debug_path = require('mason-registry')
.get_package('java-debug-adapter')
:get_install_path()
local java_debug_bundle = vim.split(
vim.fn.glob(java_debug_path .. '/extension/server/com.microsoft.java.debug.plugin-*.jar'),
'\n'
)
if java_debug_bundle[1] ~= '' then
vim.list_extend(path.bundles, java_debug_bundle)
end
-- Useful if you're starting jdtls with a Java version that's
-- different from the one the project uses.
path.runtimes = {
-- Note: the field `name` must be a valid `ExecutionEnvironment`,
-- you can find the list here:
-- https://github.com/eclipse/eclipse.jdt.ls/wiki/Running-the-JAVA-LS-server-from-the-command-line#initialize-request
--
-- This example assume you are using sdkman: https://sdkman.io
-- {
-- name = 'JavaSE-17',
-- path = vim.fn.expand('~/.sdkman/candidates/java/17.0.6-tem'),
-- },
-- {
-- name = 'JavaSE-18',
-- path = vim.fn.expand('~/.sdkman/candidates/java/18.0.2-amzn'),
-- },
}
cache_vars.paths = path
return path
end
local function enable_codelens(bufnr)
pcall(vim.lsp.codelens.refresh)
vim.api.nvim_create_autocmd('BufWritePost', {
buffer = bufnr,
group = java_cmds,
desc = 'refresh codelens',
callback = function()
pcall(vim.lsp.codelens.refresh)
end,
})
end
local function enable_debugger(bufnr)
require('jdtls').setup_dap({hotcodereplace = 'auto'})
require('jdtls.dap').setup_dap_main_class_configs()
local opts = {buffer = bufnr}
vim.keymap.set('n', '<leader>df', "<cmd>lua require('jdtls').test_class()<cr>", opts)
vim.keymap.set('n', '<leader>dn', "<cmd>lua require('jdtls').test_nearest_method()<cr>", opts)
end
local function jdtls_on_attach(client, bufnr)
if features.debugger then
enable_debugger(bufnr)
end
if features.codelens then
enable_codelens(bufnr)
end
-- The following mappings are based on the suggested usage of nvim-jdtls
-- https://github.com/mfussenegger/nvim-jdtls#usage
local opts = {buffer = bufnr}
vim.keymap.set('n', 'cri', "<cmd>lua require('jdtls').organize_imports()<cr>", opts)
vim.keymap.set('n', 'crv', "<cmd>lua require('jdtls').extract_variable()<cr>", opts)
vim.keymap.set('x', 'crv', "<esc><cmd>lua require('jdtls').extract_variable(true)<cr>", opts)
vim.keymap.set('n', 'crc', "<cmd>lua require('jdtls').extract_constant()<cr>", opts)
vim.keymap.set('x', 'crc', "<esc><cmd>lua require('jdtls').extract_constant(true)<cr>", opts)
vim.keymap.set('x', 'crm', "<esc><Cmd>lua require('jdtls').extract_method(true)<cr>", opts)
end
local function jdtls_setup(event)
local jdtls = require('jdtls')
local path = get_jdtls_paths()
local data_dir = path.data_dir .. '/' .. vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')
if cache_vars.capabilities == nil then
jdtls.extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
local ok_cmp, cmp_lsp = pcall(require, 'cmp_nvim_lsp')
cache_vars.capabilities = vim.tbl_deep_extend(
'force',
vim.lsp.protocol.make_client_capabilities(),
ok_cmp and cmp_lsp.default_capabilities() or {}
)
end
-- The command that starts the language server
-- See: https://github.com/eclipse/eclipse.jdt.ls#running-from-the-command-line
local cmd = {
'java',
'-Declipse.application=org.eclipse.jdt.ls.core.id1',
'-Dosgi.bundles.defaultStartLevel=4',
'-Declipse.product=org.eclipse.jdt.ls.core.product',
'-Dlog.protocol=true',
'-Dlog.level=ALL',
'-javaagent:' .. path.java_agent,
'-Xms1G',
'--add-modules=ALL-SYSTEM',
'--add-opens',
'java.base/java.util=ALL-UNNAMED',
'--add-opens',
'java.base/java.lang=ALL-UNNAMED',
'-jar', path.launcher_jar,
'-configuration', path.platform_config,
'-data', data_dir,
}
local lsp_settings = {
java = {
-- jdt = {
-- ls = {
-- vmargs = "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx1G -Xms100m"
-- }
-- },
eclipse = {
downloadSources = true,
},
configuration = {
updateBuildConfiguration = 'interactive',
runtimes = path.runtimes,
},
maven = {
downloadSources = true,
},
implementationsCodeLens = {
enabled = true,
},
referencesCodeLens = {
enabled = true,
},
-- inlayHints = {
-- parameterNames = {
-- enabled = 'all' -- literals, all, none
-- }
-- },
format = {
enabled = true,
-- settings = {
-- profile = 'asdf'
-- },
}
},
signatureHelp = {
enabled = true,
},
completion = {
favoriteStaticMembers = {
'org.hamcrest.MatcherAssert.assertThat',
'org.hamcrest.Matchers.*',
'org.hamcrest.CoreMatchers.*',
'org.junit.jupiter.api.Assertions.*',
'java.util.Objects.requireNonNull',
'java.util.Objects.requireNonNullElse',
'org.mockito.Mockito.*',
},
},
contentProvider = {
preferred = 'fernflower',
},
extendedClientCapabilities = jdtls.extendedClientCapabilities,
sources = {
organizeImports = {
starThreshold = 9999,
staticStarThreshold = 9999,
}
},
codeGeneration = {
toString = {
template = '${object.className}{${member.name()}=${member.value}, ${otherMembers}}',
},
useBlocks = true,
},
}
-- This starts a new client & server,
-- or attaches to an existing client & server depending on the `root_dir`.
jdtls.start_or_attach({
cmd = cmd,
settings = lsp_settings,
on_attach = jdtls_on_attach,
capabilities = cache_vars.capabilities,
root_dir = jdtls.setup.find_root(root_files),
flags = {
allow_incremental_sync = true,
},
init_options = {
bundles = path.bundles,
},
})
end
vim.api.nvim_create_autocmd('FileType', {
group = java_cmds,
pattern = {'java'},
desc = 'Setup jdtls',
callback = jdtls_setup,
})

20
after/ftplugin/netrw.lua Normal file
View File

@ -0,0 +1,20 @@
local misc = require("core.misc")
local map_local = misc.map_local
map_local("n", "h", "-", { noremap = false, remap = true }) -- Go up a directory
map_local("n", "l", "<CR>", { noremap = false, remap = true }) -- Go down a directory / open a file
map_local("n", ".", "gh", { noremap = false, remap = true }) -- Toggle hidden files
map_local("n", "P", "<C-w>z", { noremap = false, remap = true }) -- Close preview window
-- Close netrw only if it isn't the last window
map_local("n", "<esc>", function()
if #vim.api.nvim_tabpage_list_wins(0) > 1 then
vim.api.nvim_win_close(0, false)
end
end)
-- change neovim root
map_local("n", "rt", function()
vim.api.nvim_set_current_dir(vim.b.netrw_curdir)
vim.notify("root dir updated: "..vim.b.netrw_curdir, vim.log.levels.LOW, { title = misc.appid })
end)

27
after/ftplugin/norg.lua
View File

@ -1,3 +1,28 @@
local misc = require('core.misc')
-- make sure norg parsers are installed before opening a norg file, currently
-- there are two parsers: norg, and norg_meta
local found = {}
found[0] = 0 -- used to store the number of elements in the table
-- check for the parsers
misc.loopf(vim.fn.stdpath("data").."/site/pack/deps/opt/nvim-treesitter/parser",
function(file)
if string.find(file, "norg") then
found[file] = true
found[0] = found[0] + 1
end
end, "so")
-- if the parsers don't exist download them
if found[0] < 2 and
(not found["norg.so"] or not found["norg_meta.so"]) then
vim.cmd("Neorg sync-parsers")
end
-- set colorcolumn in norg buffers
vim.opt_local.colorcolumn = { 80 }
-- make text wrap at the colorcolumn automatically
vim.api.nvim_set_option_value("textwidth",
tonumber(vim.api.nvim_get_option_value("colorcolumn", {})), { buf = 0 })
vim.api.nvim_win_set_option(0, 'colorcolumn', '0')

16
after/plugin/actionpreview.lua
View File

@ -1,16 +0,0 @@
local status_ok, actions = pcall(require, "actions-preview")
if not status_ok then
return
end
actions.setup {
backend = { "telescope" },
telescope = require("telescope.themes").get_dropdown {
borderchars = {
prompt = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
results = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
preview = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
},
layout_strategy = 'cursor',
}
}

10
after/plugin/auto-indent.lua
View File

@ -1,10 +0,0 @@
local status_ok, indent = pcall(require, "auto-indent")
if not status_ok then
return
end
indent.setup {
indentexpr = function(lnum)
return require("nvim-treesitter.indent").get_indent(lnum)
end
}

8
after/plugin/autopairs.lua
View File

@ -1,8 +0,0 @@
local status_ok, autopairs = pcall(require, "ultimate-autopair")
if not status_ok then
return
end
autopairs.setup {
ignored_next_char = string.gsub("!@#$%^&*()_+", "%s+", "")
}

143
after/plugin/cmp.lua
View File

@ -1,143 +0,0 @@
local status_ok, cmp = pcall(require, "cmp")
if not status_ok then
return
end
local function has_words_before()
unpack = unpack or table.unpack
local line, col = unpack(a.nvim_win_get_cursor(0))
return col ~= 0 and a.nvim_buf_get_lines(0, line - 1, line, true)
[1]:sub(col, col):match("%s") == nil
end
local luasnip = require('luasnip')
local neogen = require('neogen')
require("luasnip.loaders.from_vscode").lazy_load()
cmp.setup {
sources = cmp.config.sources({
{ name = 'nvim_lsp', priority = 999 },
{ name = 'luasnip_choice', priority = 750 },
{ name = 'buffer', max_item_count = 3 },
{ name = 'async_path', max_item_count = 5 },
{ name = 'nvim_lua' },
{ name = 'neorg' },
{ name = 'calc' },
{ name = 'cmdline' },
{ name = 'nvim_lsp_signature_help' }
}),
window = {
completion = {
scrollbar = false,
border = 'solid',
winhighlight = "Normal:WinBarNC,FloatBorder:WinBarNC,Search:WinBarNC",
},
documentation = {
border = 'solid',
winhighlight = "Normal:WinBarNC,FloatBorder:WinBarNC,Search:WinBarNC",
}
},
view = {
entries = { name = 'custom', selection_order = 'near_cursor' },
},
experimental = {
ghost_text = true
},
formatting = {
fields = {'menu', 'abbr', 'kind'},
format = function(entry, item)
local menu_icon = {
nvim_lsp = 'λ',
nvim_lua = 'v',
calc = '+',
luasnip = '%',
buffer = '@',
path = '#',
}
item.menu = menu_icon[entry.source.name]
return item
end,
},
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
-- mappings -----------------------------------------------------------------
mapping = cmp.mapping.preset.insert({
["<Tab>"] = cmp.mapping(function(fallback)
if #cmp.get_entries() == 1 then
cmp.confirm({ select = true })
elseif cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump()
elseif has_words_before() then
cmp.complete()
if #cmp.get_entries() == 1 then
cmp.confirm({ select = true })
end
elseif neogen.jumpable() then
neogen.jump_next()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
elseif neogen.jumpable(true) then
neogen.jump_prev()
else
fallback()
end
end, { "i", "s" }),
['<CR>'] = cmp.mapping {
i = function(fallback)
if cmp.visible() and cmp.get_active_entry() then
cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
else
fallback()
end
end,
s = cmp.mapping.confirm({ select = true }),
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace,
select = true }),
},
["<C-u>"] = cmp.mapping.scroll_docs(-4),
["<C-d>"] = cmp.mapping.scroll_docs(4),
['<ESC>'] = cmp.mapping.close(),
["<C-e>"] = cmp.mapping.abort(),
}),
sorting = {
comparators = {
cmp.config.compare.offset,
cmp.config.compare.exact,
cmp.config.compare.score,
require("cmp-under-comparator").under,
cmp.config.compare.kind,
cmp.config.compare.sort_text,
cmp.config.compare.length,
cmp.config.compare.order,
}
},
enabled = function()
local context = require 'cmp.config.context'
if a.nvim_get_mode().mode == 'c' then
return true
else
return not context.in_treesitter_capture("comment")
and not context.in_syntax_group("Comment")
end
end
}

13
after/plugin/colorizer.lua
View File

@ -1,13 +0,0 @@
local status_ok, colorizer = pcall(require, "colorizer")
if not status_ok then
return
end
colorizer.setup {
filetypes = { '*' },
user_default_options = {
names = false,
RRGGBBAA = true,
AARRGGBB = true,
},
}

3
after/plugin/colorscheme.lua Normal file
View File

@ -0,0 +1,3 @@
local misc = require('core.misc')
misc.colorscheme('mellow')

6
after/plugin/comment.lua
View File

@ -1,6 +0,0 @@
local status_ok, comment = pcall(require, "Comment")
if not status_ok then
return
end
comment.setup {}

16
after/plugin/dressing.lua
View File

@ -1,16 +0,0 @@
local status_ok, dressing = pcall(require, "dressing")
if not status_ok then
return
end
dressing.setup {
input = {
enabled = true,
title_pos = "center",
border = 'single',
relative = "win"
},
select = {
enabled = true,
}
}

14
after/plugin/fidget.lua
View File

@ -1,14 +0,0 @@
local status_ok, fidget = pcall(require, "fidget")
if not status_ok then
return
end
fidget.setup {
text = {
spinner = "line",
done = ":)",
},
window = {
zindex = 1,
}
}

9
after/plugin/git-yodel.lua
View File

@ -1,9 +0,0 @@
local status_ok, yodel = pcall(require, "git-yodel")
if not status_ok then
return
end
yodel.setup {
border = 'shadow',
position = 'auto'
}

69
after/plugin/gitsigns.lua
View File

@ -1,69 +0,0 @@
local status_ok, gitsigns = pcall(require, "gitsigns")
if not status_ok then
return
end
gitsigns.setup {
signs = {
add = { text = '│' },
change = { text = '│' },
delete = { text = '-' },
topdelete = { text = '‾' },
changedelete = { text = '~' },
untracked = { text = '┆' },
},
signcolumn = true,
numhl = false,
linehl = false,
word_diff = false,
watch_gitdir = {
interval = 1000,
follow_files = true
},
attach_to_untracked = true,
current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
preview_config = {
border = 'shadow',
},
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
local function map(mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end
-- Navigation
map('n', ']c', function()
if vim.wo.diff then return ']c' end
vim.schedule(function() gs.next_hunk() end)
return '<Ignore>'
end, {expr=true})
map('n', '[c', function()
if vim.wo.diff then return '[c' end
vim.schedule(function() gs.prev_hunk() end)
return '<Ignore>'
end, {expr=true})
-- Actions
map('n', '<leader>hs', gs.stage_hunk)
map('n', '<leader>hr', gs.reset_hunk)
map('v', '<leader>hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
map('v', '<leader>hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
map('n', '<leader>hS', gs.stage_buffer)
map('n', '<leader>hu', gs.undo_stage_hunk)
map('n', '<leader>hR', gs.reset_buffer)
map('n', '<leader>hp', gs.preview_hunk)
map('n', '<leader>hb', function() gs.blame_line{full=true} end)
map('n', '<leader>tb', gs.toggle_current_line_blame)
map('n', '<leader>hd', gs.diffthis)
map('n', '<leader>hD', function() gs.diffthis('~') end)
map('n', '<leader>td', gs.toggle_deleted)
-- Text object
map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
end
}

29
after/plugin/glance.lua
View File

@ -1,29 +0,0 @@
local status_ok, glance = pcall(require, "glance")
if not status_ok then
return
end
glance.setup {
detached = function(winid)
return vim.api.nvim_win_get_width(winid) < 100
end,
border = {
enable = true,
top_char = '',
},
theme = {
enable = false,
},
folds = {
fold_closed = '>',
fold_open = 'V',
folded = true,
},
indent_lines = {
enable = false,
},
winbar = {
enable = true,
},
}

6
after/plugin/harpoon.lua
View File

@ -1,6 +0,0 @@
local status_ok, harpoon = pcall(require, "harpoon")
if not status_ok then
return
end
harpoon.setup {}

28
after/plugin/headlines.lua
View File

@ -1,28 +0,0 @@
local status_ok, headlines = pcall(require, "headlines")
if not status_ok then
return
end
headlines.setup {
norg = {
headline_highlights = {
"@neorg.headings.1.title",
"@neorg.headings.2.title",
"@neorg.headings.3.title",
"@neorg.headings.4.title",
"@neorg.headings.5.title",
"@neorg.headings.6.title"
},
bullets = { "", "", "", "" },
},
markdown = {
headline_highlights = {
"@neorg.headings.1.title",
"@neorg.headings.2.title",
"@neorg.headings.3.title",
"@neorg.headings.4.title",
"@neorg.headings.5.title",
"@neorg.headings.6.title"
}
},
}

15
after/plugin/indent-blankline.lua
View File

@ -1,15 +0,0 @@
local status_ok, ibl = pcall(require, "ibl")
if not status_ok then
return
end
ibl.setup {
indent = {
char = '▏',
},
scope = {
enabled = true,
show_start = false,
show_end = false
},
}

23
after/plugin/jabs.lua
View File

@ -1,23 +0,0 @@
local status_ok, jabs = pcall(require, "jabs")
if not status_ok then
return
end
jabs.setup {
offset = { bottom = 2, right = 2 },
symbols = {
current = "@",
split = "|",
alternate = "*",
hidden = "\\",
locked = "=",
ro = "=",
edited = "+",
terminal = ">_",
default_file = "~",
terminal_symbol = ">_",
},
use_devicons = false,
}

92
after/plugin/lsp.lua
View File

@ -1,92 +0,0 @@
local status_ok, lspconfig = pcall(require, "lspconfig")
if not status_ok then
return
end
-- configure lsp when attached
local function lsp_attach(client, bufnr)
-- helper functions
local function set_lsp_sign(name, text)
vim.fn.sign_define(name, { text = text, texthl = name })
end
local function map(m, lhs, rhs)
local opts = { remap = false, silent = true, buffer = bufnr }
vim.keymap.set(m, lhs, rhs, opts)
end
set_lsp_sign("DiagnosticSignError", "x")
set_lsp_sign("DiagnosticSignWarn" , "!")
set_lsp_sign("DiagnosticSignInfo" , "i")
set_lsp_sign("DiagnosticSignHint" , "h")
-- LSP actions
map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
map('n', 'gD', '<cmd>lua vim.lsp.buf.definition()<cr>')
-- map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
map('n', 'gI', '<cmd>lua vim.lsp.buf.implementation()<cr>')
map('n', 'gY', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
map('n', 'gR', '<cmd>lua vim.lsp.buf.references()<cr>')
map('n', '<S-Tab>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
map('n', '<leader>lr', '<cmd>lua vim.lsp.buf.rename()<cr>')
map('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>')
map('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-- Diagnostics
map('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
map('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
vim.api.nvim_buf_create_user_command(bufnr, 'LspFormat', function()
vim.lsp.buf.format()
end, {desc = 'Format buffer with language server'})
vim.api.nvim_buf_create_user_command('LspWorkspaceAdd', function()
vim.lsp.buf.add_workspace_folder()
end, { desc = 'Add folder to workspace' })
vim.api.nvim_buf_create_user_command('LspWorkspaceList', function()
vim.notify(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, { desc = 'List workspace folders' })
vim.api.nvim_buf_create_user_command('LspWorkspaceRemove', function()
vim.lsp.buf.remove_workspace_folder()
end, { desc = 'Remove folder from workspace' })
end
vim.diagnostic.config({
virtual_text = false,
signs = true,
update_in_insert = false,
underline = true,
severity_sort = true,
})
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
vim.lsp.handlers.hover, {
border = 'solid',
})
vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
vim.lsp.handlers.signature_help, {
border = 'solid',
})
-- get servers and attach to them
local status_ok1, mason = pcall(require, "mason")
if not status_ok1 then
return
end
mason.setup {}
local status_ok2, masonlspconfig = pcall(require, "mason-lspconfig")
if not status_ok2 then
return
end
masonlspconfig.setup {}
masonlspconfig.setup_handlers {
function (server_name)
lspconfig[server_name].setup { on_attach = lsp_attach }
end,
-- specific servers can be setup as follows:
-- ["rust_analyzer"] = function ()
-- require("rust-tools").setup {}
-- end
-- check out :help mason-lspconfig for more info
}

13
after/plugin/lsplines.lua
View File

@ -1,13 +0,0 @@
local status_ok, lines = pcall(require, "lsp_lines")
if not status_ok then
return
end
lines.setup()
vim.diagnostic.config {
virtual_lines = {
highlight_whole_line = false,
only_current_line = true
}
}

6
after/plugin/luasnip-choice.lua
View File

@ -1,6 +0,0 @@
local status_ok, lschoice = pcall(require, "cmp_luasnip_choice")
if not status_ok then
return
end
lschoice.setup {}

15
after/plugin/luasnip.lua
View File

@ -1,15 +0,0 @@
local status_ok, luasnip = pcall(require, "luasnip")
if not status_ok then
return
end
luasnip.config.set_config {
-- return back into snippet
history = true,
-- update on text insert
updateevents = "TextChanged,TextChangedI"
}
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_snipmate").lazy_load()

8
after/plugin/marks.lua
View File

@ -1,8 +0,0 @@
local status_ok, marks = pcall(require, "marks")
if not status_ok then
return
end
marks.setup {
default_mappings = true,
}

29
after/plugin/mason.lua
View File

@ -1,29 +0,0 @@
local status_ok, mason = pcall(require, "mason")
if not status_ok then
return
end
mason.setup {
ui = {
border = "shadow",
width = 0.6,
height = 0.9,
icons = {
package_installed = "+",
package_pending = "?",
package_uninstalled = "x"
}
},
keymaps = {
toggle_package_expand = "<CR>",
install_package = "i", -- Keymap to install the package under the current cursor position
update_package = "u", -- Keymap to reinstall/update the package under the current cursor position
check_package_version = "c", -- Keymap to check for new version for the package under the current cursor position
update_all_packages = "U", -- Keymap to update all installed packages
check_outdated_packages = "C", -- Keymap to check which installed packages are outdated
uninstall_package = "r", -- Keymap to uninstall a package
cancel_installation = "<C-c>", -- Keymap to cancel a package installation
apply_language_filter = "<C-f>", -- Keymap to apply language filter
},
}

17
after/plugin/masontool.lua
View File

@ -1,17 +0,0 @@
local status_ok, masontool = pcall(require, "mason-tool-installer")
if not status_ok then
return
end
masontool.setup {
ensure_installed = {
'lua-language-server',
'bash-language-server',
'editorconfig-checker',
'stylua',
'shellcheck',
'clangd',
'html-lsp',
'css-lsp',
},
}

10
after/plugin/neogen.lua
View File

@ -1,10 +0,0 @@
local status_ok, neogen = pcall(require, "neogen")
if not status_ok then
return
end
neogen.setup {
enabled = true,
input_after_comment = true,
snippet_engine = "luasnip",
}

65
after/plugin/neorg.lua
View File

@ -1,65 +0,0 @@
local status_ok, neorg = pcall(require, "neorg")
if not status_ok then
return
end
local status_ok2, luarocks = pcall(require, "luarocks-nvim")
if not status_ok2 then
return
end
luarocks.setup {}
local wsphome = (os.getenv("XDG_DOCUMENTS_DIR") or
(os.getenv("HOME").."/Documents")).."/notes/"
neorg.setup {
load = {
["core.defaults"] = {},
["core.esupports.metagen"] = {
config = {
type = "auto",
update_date = true,
}
},
["core.dirman"] = {
config = {
workspaces = {
home = wsphome.."home",
robotics = wsphome.."robotics",
school = wsphome.."school"
},
index = "index.norg",
default_workspace = "home"
}
},
["core.summary"] = {},
["core.concealer"] = {
config = {
dim_code_blocks = {
padding = { right = 2, },
content_only = false,
width = "content",
},
folds = false,
icon_preset = "basic",
}
},
["core.export"] = {},
["core.completion"] = {
config = {
engine = "nvim-cmp",
}
},
["core.qol.toc"] = {
config = {
close_after_use = true
}
},
["core.presenter"] = {
config = {
zen_mode = "zen-mode",
}
},
["core.integrations.telescope"] = {},
}
}

32
after/plugin/notify.lua
View File

@ -1,32 +0,0 @@
local status_ok, notify = pcall(require, "notify")
if not status_ok then
return
end
notify.setup {
timeout = 3000,
minimum_width = 35,
icons = {
DEBUG = "B",
ERROR = "x",
INFO = "i",
TRACE = "t",
WARN = "!"
},
max_height = function() return math.floor(vim.o.lines * 0.75) end,
max_width = function() return math.floor(vim.o.columns * 0.5) end,
on_open = function(win, record)
if record.title[1] == '' then record.title[1] = 'Unkown' end
vim.api.nvim_win_set_config(win, {
title = {
{ ' '..record.title[1]..' ', 'Notify'..record.level..'Title' }
},
title_pos = 'center',
border = 'single'
})
end,
render = function(bufnr, notif)
vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, notif.message)
end,
}

20
after/plugin/project.lua
View File

@ -1,20 +0,0 @@
local status_ok, project = pcall(require, "project_nvim")
if not status_ok then
return
end
project.setup {
detection_methods = { "pattern", "lsp" },
patterns = {
".git",
"Makefile",
"_darcs",
".hg",
".bzr",
".svn",
"package.json",
"index.norg"
},
show_hidden = false,
scope = "tab"
}

47
after/plugin/sfm.lua
View File

@ -1,47 +0,0 @@
local status_ok, sfm = pcall(require, "sfm")
if not status_ok then
return
end
sfm.setup {
view = {
side = 'right',
width = 35,
},
mappings = {
custom_only = false,
list = {
{ key = 's', action = 'toggle_selection' }
}
},
renderer = {
icons = {
file = {
default = "#",
symlink = "#",
},
folder = {
default = "[|",
open = "[/",
symlink = "[|",
symlink_open = "[/",
},
indicator = {
folder_closed = "",
folder_open = "",
file = "",
},
selection = "*"
}
}
}:load_extension('sfm-git', {
icons = {
unstaged = "+",
staged = "S",
unmerged = "U",
renamed = "r",
untracked = "?",
deleted = "-",
ignored = "?",
}
})

28
after/plugin/smartsplits.lua
View File

@ -1,28 +0,0 @@
local status_ok, smartsplits = pcall(require, "smart-splits")
if not status_ok then
return
end
smartsplits.setup {
default_amount = 3,
resize_mode = {
quit_key = '<leader>r',
resize_keys = {
'<C-h>',
'<C-j>',
'<C-k>',
'<C-l>',
},
silent = true,
hooks = {
on_enter = function()
vim.notify("Resize mode on", vim.log.levels.INFO, { title = "Smart Splits" })
vim.cmd('unmap <leader>r')
end,
on_leave = function()
vim.notify("Resize Mode off", vim.log.levels.INFO, { title = "Smart Splits" })
vim.keymap.set('n', '<leader>r', smartsplits.start_resize_mode, {})
end,
},
},
}

115
after/plugin/startpage.lua
View File

@ -1,115 +0,0 @@
local status_ok, alpha = pcall(require, "alpha")
if not status_ok then
return
end
local function button(sc, txt, cmd, kopts, opts)
opts = opts or {
position = "center",
shortcut = sc:gsub("<leader>", "LDR"),
cursor = 0,
width = 49,
align_shortcut = "right",
hl_shortcut = "AlphaShortcut",
hl = "AlphaText",
}
if cmd then
kopts = kopts or { noremap = true, silent = true, nowait = true }
opts.keymap = { "n", sc, cmd, kopts }
end
local function on_press()
local key = vim.api.nvim_replace_termcodes(cmd, true, false, true)
vim.api.nvim_feedkeys(key, "t", false)
end
return {
type = "button",
val = txt,
opts = opts,
on_press = on_press,
}
end
local header = {
'█▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀ ▀▀▀█ █▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀ ▀▀▀█ ',
'█ ░█████▀▀▀▀▀█████▓▄ ▀▀▀▀ ░ ░█ ░█ ░█ █ ',
'█ ▒███████ ▓███████ ▒██ ▓███ ▓███ ▓███ █ ',
'█ ▓███████ ▓███████ ▓█████████████████ █ ',
'█ ▓███████ ▓███████ ███ ██████████████ █ ',
'█ ▓███████ ▓███████ ███ ██████████████ █ ',
'█ ▓███████ ▓███████ ███ ██████████████ █ ',
'█ ▓███████ ▓███████ ███▄██████████████ █ ',
'█ ▓███████ ▓███████ ██████▀▀██████████ █ ',
'▀ ▓███████ ▓███████▄ ▄▄███████████ █ ',
'█ ▓███████ ██████████████████ █▄▄▄',
'█ ▓███████▀▀ ▀ ▀ ▀████████████████▄ ▄ █',
'█▄▄▄▄▄▄▄ ▀ █▀▀▀▀▀▀▀▀▀▀▀▀█▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█',
' █ ▀ █ ',
' ▀▀▀▀▀ ',
}
local footer = {
'▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄ ▄▄▄▄▄▄▄▄▄▄▄ ▄',
}
alpha.setup {
layout = {
{ type = 'text', val = function()
local padding = {}
for i = 1, math.floor((vim.api.nvim_win_get_height(0) - #header - 6 - #footer) / 2), 1 do
table.insert(padding, " ")
end
return padding
end },
{ type = 'text', val = header, opts = {
position = 'center',
hl = 'AlphaHeader',
} },
{ type = 'padding', val = 1 },
{ type = 'group', val = {
button('f', '? Find files', '<cmd>Telescope find_files<CR>'),
button('r', '↺ Recent files', '<cmd>Telescope oldfiles <CR>'),
button('n', '▣ Neorg workspace', '<cmd>Telescope neorg switch_workspace<CR>'),
button('m', '≡ Menu', '<cmd>lua require("core.conf").configmenu()<CR>'),
button('q', '✖ Quit', '<cmd>wqa<CR>'),
} },
{ type = 'text', val = footer, opts = {
position = 'center',
hl = 'AlphaFooter',
} },
},
opts = {
keymap = {
press = '<CR>',
press_queue = nil
},
setup = function()
vim.api.nvim_create_autocmd('User', {
pattern = 'AlphaReady',
desc = 'disable stuff for alpha',
callback = function()
vim.opt.laststatus = 0
vim.opt.showtabline = 0
vim.opt.more = false
vim.opt.showcmd = false
vim.opt.ruler = false
vim.opt.number = false
vim.opt.relativenumber = false
end,
})
vim.api.nvim_create_autocmd('BufUnload', {
buffer = 0,
desc = 'enable stuff after alpha closes',
callback = function()
vim.opt.laststatus = 3
vim.opt.showtabline = 2
vim.opt.more = true
vim.opt.showcmd = true
vim.opt.ruler = true
vim.opt.number = false
vim.opt.relativenumber = false
end,
})
end,
}
}

78
after/plugin/statusline.lua
View File

@ -1,78 +0,0 @@
local status_ok, el = pcall(require, "el")
if not status_ok then
return
end
el.reset_windows()
local builtin = require("el.builtin")
local sections = require("el.sections")
local c = require("core.statusbar.components")
local function hl(fg, b)
b = b or false
return c.extract_hl({
bg = { ["StatusLine"] = "bg" },
fg = { [fg] = "fg" },
bold = b,
})
end
local modes = {
-- display name, mode, highlight group
n = { "Normal", "N", hl("@neorg.headings.1.title") },
niI = { "Normal", "N", hl("@neorg.headings.1.title") },
niR = { "Normal", "N", hl("@neorg.headings.1.title") },
niV = { "Normal", "N", hl("@neorg.headings.1.title") },
no = { "N·OpPd", "?" },
v = { "Visual", "V", hl("@neorg.headings.2.title") },
V = { "V·Line", "Vl", hl("@neorg.headings.2.title") },
[""] = { "V·Block", "Vb", hl("@neorg.headings.2.title") },
s = { "Select", "S" },
S = { "S·Line", "Sl" },
[""] = { "S·Block", "Sb" },
i = { "Insert", "I", hl("@neorg.headings.4.title") },
ic = { "ICompl", "Ic" },
R = { "Replace", "R", hl("@neorg.headings.5.title") },
Rv = { "VReplace", "Rv", hl("@neorg.headings.5.title") },
c = { "Command", "C", hl("@neorg.headings.3.title") },
cv = { "Vim Ex", "E" },
ce = { "Ex (r)", "E" },
r = { "Prompt", "P" },
rm = { "More", "M" },
["r?"] = { "Confirm", "Cn" },
["!"] = { "Shell", "S" },
nt = { "Term", "T" },
t = { "Term", "T" },
}
el.setup {
generator = function()
return {
{ { " " }, c.mode { modes = modes, hl_icon_only = false } },
{ sections.split, required = true },
{ sections.collapse_builtin { { builtin.filetype }, { " " } } },
{ sections.maximum_width(c.fn_tail, 0.50), required = true },
{ sections.collapse_builtin { { " " }, { builtin.modified_flag } } },
{ sections.split, required = true },
{ c.lsp_srvname },
{ c.diagnostics {
fmt = "[%s]",
hl_err = hl("DiagnosticError", true),
hl_warn = hl("DiagnosticWarn", true),
hl_info = hl("DiagnosticInfo", true),
hl_hint = hl("DiagnosticHint", true)
}},
{ c.git_branch { icon = "*", fmt = " %s%s" } },
{ c.git_changes_buf {
fmt = "[%s]",
hl_insert = hl("GitSignsAdd", true),
hl_change = hl("GitSignsChange", true),
hl_delete = hl("GitSignsDelete", true),
}},
{ { " " }, c.line {
fmt = "[%s]",
}, required = true },
}
end
}

8
after/plugin/tabline.lua
View File

@ -1,8 +0,0 @@
local status_ok, tabline = pcall(require, "tar")
if not status_ok then
return
end
tabline.setup {
closeicon = "%#Constant#[x]"
}

97
after/plugin/telescope.lua
View File

@ -1,97 +0,0 @@
local status_ok, telescope = pcall(require, "telescope")
if not status_ok then
return
end
local actions = require('telescope.actions')
local action_layout = require("telescope.actions.layout")
local function telescopew()
if vim.o.columns <= 80 then
return vim.o.columns
else
return 0.8
end
end
telescope.setup {
defaults = {
borderchars = {
prompt = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
results = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
preview = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
},
winblend = 0,
layout_strategy = 'horizontal',
sorting_strategy = 'descending',
scroll_strategy = 'limit',
layout_config = {
horizontal = {
width = telescopew(),
height = 20,
prompt_position = 'bottom',
anchor = 'N',
}
},
preview = {
-- add image previews via chafa
mime_hook = function(filepath, bufnr, opts)
local function is_image(filepath)
local image_extensions = { -- supported image formats
'png',
'jpg',
'jpe',
'jpeg',
'webp',
'gif'
}
local split_path = vim.split(filepath:lower(), '.', { plain=true })
local extension = split_path[#split_path]
return vim.tbl_contains(image_extensions, extension)
end
if is_image(filepath) and vim.fn.executable('chafa') == 1 then
local term = vim.api.nvim_open_term(bufnr, {})
local function send_output(_, data, _)
for _, d in ipairs(data) do
vim.api.nvim_chan_send(term, d..'\r\n')
end
end
vim.fn.jobstart({
'chafa', '-C', 'on', '--animate', 'off', '-s',
'23x18', '--clear', filepath
}, { on_stdout = send_output, stdout_buffered = true, pty = true })
a.nvim_set_option_value("number", false, { buf = bufnr })
else
require("telescope.previewers.utils").set_preview_message(bufnr,
opts.winid, "File cannot be previewed")
end
end
},
mappings = {
i = {
["<esc>"] = actions.close,
['<C-h>'] = 'which_key',
['<C-j>'] = actions.move_selection_next,
['<C-k>'] = actions.move_selection_previous,
['<C-l>'] = actions.select_default,
['<C-u>'] = actions.preview_scrolling_up,
['<C-d>'] = actions.preview_scrolling_down,
["<C-p>"] = action_layout.toggle_preview
},
n = {
["gg"] = actions.move_to_top,
["G"] = actions.move_to_bottom,
},
},
}
}
telescope.load_extension('file_browser')
telescope.load_extension('projects')
telescope.load_extension('fzf')
telescope.load_extension('harpoon')
a.nvim_create_autocmd('User', {
pattern = 'TelescopePreviewerLoaded',
callback = function()
vim.opt.winblend = 0
end,
})

36
after/plugin/todo-comments.lua
View File

@ -1,36 +0,0 @@
local status_ok, todocomments = pcall(require, "todo-comments")
if not status_ok then
return
end
todocomments.setup {
keywords = {
FIX = {
icon = "# ",
alt = { "FIXME", "BUG" },
},
HACK = {
icon = "* ",
color = "warning",
},
WARN = {
icon = "! ",
color = "warning",
alt = { "WARNING", "XXX" },
},
NOTE = {
icon = "i ",
color = "hint",
alt = { "INFO", "TODO" },
},
PERF = {
icon = "@ ",
alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" },
},
TEST = {
icon = "@ ",
color = "test",
alt = { "TESTING", "PASSED", "FAILED" },
},
},
}

36
after/plugin/ts.lua
View File

@ -1,36 +0,0 @@
local status_ok, treesitter = pcall(require, "nvim-treesitter.configs")
if not status_ok then
return
end
treesitter.setup {
ensure_installed = {
"c",
"lua",
"bash",
"vim",
"vimdoc",
"query",
"git_rebase",
"gitattributes",
"gitcommit",
"gitignore",
"git_config",
},
highlight = {
enable = true,
additional_vim_regex_highlighting = false,
disable = function(lang, buf)
if lang == "diff" then return true end
local max_filesize = 1024 * 100 -- 100 KB
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end
},
indent = {
enable = true
}
}

10
after/plugin/tsc.lua
View File

@ -1,10 +0,0 @@
local status_ok, tc = pcall(require, "treesitter-context")
if not status_ok then
return
end
tc.setup{
enable = true,
line_numbers = true,
separator = '-',
}

9
after/plugin/tsj.lua
View File

@ -1,9 +0,0 @@
local status_ok, treesj = pcall(require, "treesj")
if not status_ok then
return
end
treesj.setup {
use_default_keymaps = false,
max_join_length = 120,
}

3
after/plugin/undotree.lua
View File

@ -1,3 +0,0 @@
if (g.loaded_undotree) then
g.undotree_DiffAutoOpen = 0
end

8
after/plugin/urlview.lua
View File

@ -1,8 +0,0 @@
local status_ok, urlview = pcall(require, "urlview")
if not status_ok then
return
end
urlview.setup {
default_picker = 'telescope',
}

21
after/plugin/whichkey.lua
View File

@ -1,21 +0,0 @@
local status_ok, whichkey = pcall(require, "which-key")
if not status_ok then
return
end
whichkey.setup {
icons = {
breadcrumb = '>>',
separator = '->',
},
winblend = 0,
window = {
border = 'shadow',
margin = { 1, .1, 2, .1 },
},
layout = {
width = { min = 20, max = 50 },
align = 'center',
}
}

89
colors/mellow.ext.lua
View File

@ -1,89 +0,0 @@
vim.cmd('runtime mellow')
local function highlight(group, opts, space)
space = space or 0
if type(group) == 'table' then
for i in pairs(group) do
a.nvim_set_hl(space, group[i], opts)
end
elseif type(group) == 'string' then
a.nvim_set_hl(space, group, opts)
end
end
local function cpyhl(hlgroup)
local ok, hl = pcall(vim.api.nvim_get_hl_by_name, hlgroup, true)
if not ok then return end
for _, key in pairs({"foreground", "background", "special"}) do
if hl[key] then
hl[key] = string.format("#%06x", hl[key])
end
end
return hl
end
local function getcolor(index, fallback)
return vim.g['terminal_color_' .. index] or fallback
end
local colors = {
black = getcolor(0, 'Black'),
red = getcolor(1, 'Red'),
green = getcolor(2, 'Green'),
yellow = getcolor(3, 'Yellow'),
blue = getcolor(4, 'Blue'),
magenta = getcolor(5, 'Magenta'),
cyan = getcolor(6, 'Cyan'),
white = getcolor(7, 'White'),
bright_black = getcolor(8, 'DarkGrey'),
bright_red = getcolor(9, 'LightRed'),
bright_green = getcolor(10, 'LightGreen'),
bright_yellow = getcolor(11, 'LightYellow'),
bright_blue = getcolor(12, 'LightBlue'),
bright_magenta = getcolor(13, 'LightMagenta'),
bright_cyan = getcolor(14, 'LightCyan'),
bright_white = getcolor(15, 'LightGray'),
}
if pcall(require, "mellow") then c = require('mellow.colors').dark end
-- remove tildas
highlight('EndOfBuffer', { fg = vim.g.terminal_color_background })
-- make all backgrounds the same color
highlight('NormalNC', cpyhl('Normal'))
highlight('NormalFloat', { bg = c.bg_dark })
highlight('FloatBorder', cpyhl('NormalFloat'))
-- plugin highlights ----------------------------------------------------------
-- telescope
highlight('TelescopeMatching', { fg = c.yellow })
-- alpha
highlight('AlphaHeader', { fg = colors.blue })
highlight('AlphaText', { fg = colors.blue })
highlight('AlphaShortcut', { bold = true })
highlight('AlphaFooter', { fg = colors.blue })
-- fidget
highlight('FidgetTask', { fg = vim.g.terminal_color_foreground })
-- sfm
highlight("SFMNormal", { bg = c.bg_dark })
highlight("SFMNormalNC", cpyhl("SFMNormal"))
highlight("SFMSignColumn", cpyhl("SFMNormal"))
-- norg + headings
highlight({ "@neorg.headings.1.title", "@neorg.headings.1.icon" },
{ fg = colors.yellow, bg = '#2a211c' })
highlight({ "@neorg.headings.2.title", "@neorg.headings.2.icon" },
{ fg = colors.blue, bg = '#201e25' })
highlight({ "@neorg.headings.3.title", "@neorg.headings.3.icon" },
{ fg = colors.cyan, bg = '#2b1b20' })
highlight({ "@neorg.headings.4.title", "@neorg.headings.4.icon" },
{ fg = colors.green, bg = '#1d201e' })
highlight({ "@neorg.headings.5.title", "@neorg.headings.5.icon" },
{ fg = colors.magenta, bg = '#251a21' })
highlight({ "@neorg.headings.6.title", "@neorg.headings.6.icon" },
{ fg = colors.white, bg = '#212126' })

13
extras/JavaVersion.java Normal file
View File

@ -0,0 +1,13 @@
/*
* JavaVersion returns the version of java interpreter running it. Inspired by
* "libraries/javacheck/JavaCheck.java" in PrismLauncher.
*/
public final class JavaVersion {
public static void main(String[] args) {
String p = System.getProperty("java.version");
if (p != null)
System.out.println(p);
else
System.exit(1);
}
}

58
init.lua
View File

@ -1,25 +1,39 @@
-- shorthands -----------------------------------------------------------------
o = vim.opt
a = vim.api
g = vim.g
c = vim.cmd
-- performance ----------------------------------------------------------------
-- enable performance stuff
vim.loader.enable()
-- main lua files -------------------------------------------------------------
misc = require('core.misc')
misc.include('bootstrap')
misc.include('conf')
-- core lua files -------------------------------------------------------------
misc.include('core.conf')
misc.include('core.context')
-- call all snippets in the lua/snippets directory ----------------------------
if pcall(require, "luasnip") then
misc.include('snippet.shorthands')
for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath('config')..'/lua/snippet',
[[v:val =~ '\.lua$']])) do
require('snippet.'..file:gsub('%.lua$', ''))
end
-- bootstrap plugin manager
local path = vim.fn.stdpath("data").."/site/pack/deps/opt/dep"
if vim.fn.empty(vim.fn.glob(path)) > 0 then
vim.fn.system({ "git", "clone", "--depth=1", "https://git.squi.bid/dep", path })
end
vim.cmd("packadd dep")
-- load miscellaneous utilities
local misc = require('core.misc')
-- load user config
misc.include('conf.opts') -- setup options
misc.include('conf.binds') -- setup keybinds
misc.include('conf.autos') -- setup autos
misc.include('conf.context') -- setup context menu
-- load plugins
require('dep') {
{ 'squibid/dep',
url = 'https://git.squi.bid/dep'
},
load = function()
-- aquire all plugin specs
local plugs = {}
for _, file in ipairs(vim.api.nvim_get_runtime_file("lua/conf/plugins/*.lua", true)) do
local ret = misc.include('conf.plugins.'..file:gsub('^.*/', ''):gsub('%.lua$', ''))
if type(ret) ~= "boolean" then
plugs[#plugs + 1] = ret
end
end
return plugs
end
}

9
lua/.luarc.json
View File

@ -1,9 +0,0 @@
{
"diagnostics.globals": [
"g",
"o",
"a",
"vim",
],
"workspace.checkThirdParty": false
}

5
lua/bootstrap.lua
View File

@ -1,5 +0,0 @@
local path = vim.fn.stdpath("data").."/site/pack/deps/opt/dep"
if vim.fn.empty(vim.fn.glob(path)) > 0 then
vim.fn.system({ "git", "clone", "--depth=1", "https://git.squi.bid/dep", path })
end
vim.cmd("packadd dep")

87
lua/conf/auto.lua
View File

@ -1,87 +0,0 @@
local function auto(event, opts)
a.nvim_create_autocmd(event, opts)
end
local function augroup(name, opts)
opts = opts or {}
opts['clear'] = true
a.nvim_create_augroup(name, opts)
end
local winchange = augroup('winchange')
local bufcheck = augroup('bufcheck')
local toggles = augroup('toggles')
auto({ "FocusGained", "TermClose", "TermLeave" }, {
group = bufcheck,
desc = 'Update contents of file.',
command = "checktime",
})
auto("VimResized", {
group = winchange,
desc = 'Resize splits when window is resized.',
callback = function()
local current_tab = vim.fn.tabpagenr()
vim.cmd("tabdo wincmd =")
vim.cmd("tabnext " .. current_tab)
end,
})
auto('TextYankPost', {
group = bufcheck,
pattern = '*',
desc = 'Highlight on yank.',
callback = function()
vim.highlight.on_yank{ timeout = 250 }
end
})
auto('BufRead', {
pattern = '*',
group = bufcheck,
desc = 'Return to the last place the buffer was closed in.',
callback = function() vim.cmd([[call setpos(".", getpos("'\""))]]) end
})
auto('FileType', {
pattern = { 'gitcommit', 'markdown' },
desc = 'Spell checking and wrapping in commit buffers and markdown files.',
callback = function()
vim.opt_local.wrap = true
vim.opt_local.spell = true
end
})
auto('BufWritePre', {
pattern = '*',
group = bufcheck,
desc = 'Basically mkdir -p.',
callback = function(ctx)
if ctx.match:match("^%w%w+://") then return end
local dir = vim.fn.fnamemodify(ctx.file, ':p:h')
vim.fn.mkdir(dir, 'p')
end
})
auto('WinLeave', {
desc = 'Unset cursorline',
group = toggles,
callback = function() vim.opt.cursorline = false end
})
auto('WinEnter', {
desc = 'Set cursorline',
group = toggles,
callback = function()
if vim.bo.filetype ~= 'alpha' then
vim.opt.cursorline = true
end
end
})
auto('ColorScheme', {
desc = 'Update statusline on colorscheme change',
group = winchange,
callback = function() require('el').reset_windows() end
})

50
lua/conf/autos.lua Normal file
View File

@ -0,0 +1,50 @@
local misc = require('core.misc')
local auto, augroup = misc.auto, misc.augroup
-- auto commands which interact with bufferes without modifying them
local bufcheck = augroup('bufcheck')
-- auto commands which modify things on the filesystem
local fsmod = augroup('fsmod')
auto('FocusGained', {
group = bufcheck,
desc = 'Update contents of file.',
command = 'checktime',
})
auto('TextYankPost', {
pattern = '*',
group = bufcheck,
desc = 'Highlight on yank.',
callback = function()
vim.highlight.on_yank { timeout = 250 }
end
})
auto('BufRead', {
pattern = '*',
group = bufcheck,
desc = 'Return to the last place the buffer was closed in.',
callback = function()
vim.cmd([[call setpos(".", getpos("'\""))]])
vim.api.nvim_input('zz')
end
})
auto('BufWritePre', {
pattern = '*',
group = fsmod,
desc = 'remove trailing spaces on file save',
command = [[%s/\s\+$//e]]
})
auto('BufWritePre', {
pattern = '*',
group = fsmod,
desc = 'Basically mkdir -p.',
callback = function(ctx)
if ctx.match:match("^%w%w+://") then return end
local dir = vim.fn.fnamemodify(ctx.file, ':p:h')
vim.fn.mkdir(dir, 'p')
end
})

165
lua/conf/binds.lua
View File

@ -1,25 +1,11 @@
local conf = require('core.conf')
local misc = require('core.misc')
local map, auto = misc.map, misc.auto
local function map(mode, bind, cmd, opts)
opts = opts or {}
opts['noremap'] = true
opts['silent'] = true
if type(bind) == 'table' then
for i in pairs(bind) do
vim.keymap.set(mode, bind[i], cmd, opts)
end
elseif type(bind) == 'string' then
vim.keymap.set(mode, bind, cmd, opts)
end
end
-- vim binds ------------------------------------------------------------------
g.mapleader = ' ' -- set leader key
-- vim binds
vim.g.mapleader = ' ' -- set leader key
map('x', '<leader>p', [["_dP]], { desc = 'Greatest remap of all time.' })
map('n', '<esc>', ':nohlsearch<Bar>:echo<CR>', { desc = 'Clear search.' })
map('t', '<esc>', '<C-\\><C-n>', { desc = 'make <esc> work in terminals.' })
-- move selected text up/down
map('v', '<S-k>', ":m '<-2<CR>gv=gv", { desc = 'Move selected text up.' })
map('v', '<S-j>', ":m '>+1<CR>gv=gv", { desc = 'Move selected text down.' })
@ -45,22 +31,7 @@ map('n', '<leader>x', function() -- execute order 111
else
vim.notify("File doesn't exist", vim.log.levels.INFO, { title = misc.appid })
end
end)
-- add some keybinds to the file view (netrw)
a.nvim_create_autocmd('FileType', {
pattern = 'netrw',
callback = function()
local function bind(lhs, rhs)
vim.keymap.set('n', lhs, rhs, { remap = true, buffer = true })
end
bind('h', '-^') -- Go up a directory
bind('l', '<CR>') -- Go down a directory / open a file
bind('.', 'gh') -- Toggle hidden files
bind('P', '<C-w>z') -- Close preview window
bind('<esc>', '<cmd>q<CR>') -- Close netrw
end
})
end, { desc = 'toggle executable flag of the file' })
-- tabs
map('n', '[]', '<cmd>tabnew<CR>')
@ -68,118 +39,22 @@ map('n', '][', '<cmd>tabc<CR>')
map('n', '[[', '<cmd>tabp<CR>')
map('n', ']]', '<cmd>tabn<CR>')
-- config binds ---------------------------------------------------------------
map('n', '<leader>m', conf.configmenu, { desc = 'Neovim config manager menu', })
-- plugin binds ---------------------------------------------------------------
-- pretty lsp view
map('n', 'gd', '<CMD>Glance definitions<CR>')
map('n', 'gr', '<CMD>Glance references<CR>')
map('n', 'gy', '<CMD>Glance type_definitions<CR>')
map('n', 'gi', '<CMD>Glance implementations<CR>')
if pcall(require, "treesj") then
local treesj = require('treesj') -- treesj
map('n', '<leader>j', treesj.toggle)
end
if pcall(require, "telescope") then
local telebuilt = require('telescope.builtin') -- telescope
-- local telexten = require('telescope').extensions
map('n', '<leader>sf', telebuilt.find_files, { desc = 'Find files.' })
map('n', '<leader>so', telebuilt.oldfiles, { desc = 'Find old files.' })
map('n', '<leader>sg', telebuilt.git_files, { desc = 'Find git files.' })
-- search urls in buffer
map('n', '<leader>su', '<Cmd>UrlView<CR>', { desc = 'Find urls in buffer.' })
-- search lsp symbols
map('n', '<leader>ss', telebuilt.lsp_document_symbols,
{ desc = 'Find LSP Symbols.' })
-- search for keybinds
map('n', '<leader>sk', telebuilt.keymaps,
{ desc = 'Find nvim Keymaps.' })
-- search for highlights
map('n', '<leader>sh', telebuilt.highlights,
{ desc = 'Find nvim Highlights.' })
-- search for autocommands
map('n', '<leader>sa', telebuilt.autocommands,
{ desc = 'Find nvim Autocommands.' })
-- search for vim options
map('n', '<leader>sv', telebuilt.vim_options, { desc = 'Find vim options.' })
-- search for string in project
map('n', '<leader>sp', telebuilt.live_grep, { desc = 'Find string in project.' })
-- Code Actions (requires telescope)
if pcall(require, "actions-preview") then
map({ "n", "v" }, "<leader>ca", require("actions-preview").code_actions, {
desc = 'preview code actions'
})
-- good spell suggestion ui
-- (stolen from https://github.com/neovim/neovim/pull/25833)
local spell_on_choice = vim.schedule_wrap(function(_, idx)
if type(idx) == 'number' then
vim.cmd('normal! ' .. idx .. 'z=')
end
end
end)
-- todo list
if pcall(require, "todo-comments") then
map("n", "<leader>td", "<cmd>TodoQuickFix<CR>", { desc = 'open up list of TODO\'s' })
end
-- harpoon
if (pcall(require, 'harpoon')) then
local harpoon = require("harpoon")
map("n", "<leader>a", function()
harpoon:list():append()
vim.notify('added new file to quickmarks', vim.log.levels.INFO, {
title = misc.appid,
})
end)
map('n', '<C-q>', function() harpoon:list():select(1) end)
map('n', '<C-g>', function() harpoon:list():select(2) end)
map('n', '<C-h>', function() harpoon:list():select(3) end)
map('n', '<C-i>', function() harpoon:list():select(4) end)
map("n", "<C-S-P>", function() harpoon:list():prev() end)
map("n", "<C-S-N>", function() harpoon:list():next() end)
map("n", "<C-e>", function() require("core.harpoon").switcher() end)
end
map('n', '<leader>u', '<cmd>UndotreeToggle<CR>', { desc = 'Open undo tree.' })
map('n', '<leader>f', '<cmd>SFMToggle<CR>', { desc = 'Open file tree view.' })
map('n', '<C-j>', '<cmd>JABSOpen<CR>', { desc = 'Switch between buffers.' })
if pcall(require, "smart-splits") then
local smartsplits = require('smart-splits') -- resizing buffers (toggleable)
map('n', '<leader>r', smartsplits.start_resize_mode)
end
-- neogen
if pcall(require, "neogen") then
map('n', '<leader>df', require("neogen").generate, {
desc = 'Generate anotations',
})
end
-- venn
function _G.Toggle_venn()
local mapb = vim.api.nvim_buf_set_keymap
local venn_enabled = vim.inspect(vim.b.venn_enabled)
if venn_enabled == "nil" then
vim.notify("Enabled venn mode", vim.log.levels.LOW, { title = misc.appid })
vim.b.venn_enabled = true
vim.cmd([[setlocal ve=all]])
-- draw a line on HJKL keystokes
mapb(0, "n", "J", "<C-v>j:VBox<CR>", { noremap = true })
mapb(0, "n", "K", "<C-v>k:VBox<CR>", { noremap = true })
mapb(0, "n", "L", "<C-v>l:VBox<CR>", { noremap = true })
mapb(0, "n", "H", "<C-v>h:VBox<CR>", { noremap = true })
-- draw a box by pressing "f" with visual selection
mapb(0, "v", "f", ":VBox<CR>", { noremap = true })
else
vim.notify("Disabled venn mode", vim.log.levels.LOW, { title = misc.appid })
vim.cmd[[setlocal ve=]]
vim.cmd[[mapclear <buffer>]]
vim.b.venn_enabled = nil
local spellsuggest_select = function()
if vim.v.count > 0 then
spell_on_choice(nil, vim.v.count)
return
end
local cword = vim.fn.expand('<cword>')
local prompt = 'Change ' .. vim.inspect(cword) .. ' to:'
vim.ui.select(vim.fn.spellsuggest(cword, vim.o.lines), { prompt = prompt }, spell_on_choice)
end
-- toggle keymappings for venn using <leader>v
map('n', '<leader>v', ":lua Toggle_venn()<CR>")
vim.keymap.set('n', 'z=', spellsuggest_select, { desc = 'Shows spelling suggestions' })

1
lua/core/context.lua → lua/conf/context.lua
View File

@ -7,6 +7,7 @@ vim.cmd([[:amenu PopUp.Save\ All\ Buffers <cmd>:wa<CR>]])
vim.cmd([[:nmenu PopUp.Select\ All ggVG]])
vim.cmd([[:nmenu PopUp.Undo u]])
vim.cmd([[:nmenu PopUp.Redo <C-r>]])
vim.cmd([[:nmenu PopUp.Inspect <cmd>Inspect<CR>]])
vim.cmd([[:amenu PopUp.-1- <nop>]]) -- dividers
vim.cmd([[:nmenu PopUp.Copy\ Line yy]])
vim.cmd([[:vmenu PopUp.Copy\ Selection y]])

4
lua/conf/init.lua
View File

@ -1,4 +0,0 @@
misc.include('conf.plugins') -- load plugins first to allow colorscheme to be set in opts
misc.include('conf.opts')
misc.include('conf.binds')
misc.include('conf.auto')

93
lua/conf/opts.lua
View File

@ -1,65 +1,50 @@
-- better ui ------------------------------------------------------------------
if pcall(require, "notify") then vim.notify = require("notify") end
o.colorcolumn = { 80 }
-- color stuff
if vim.fn.has("termguicolors") then
vim.opt.termguicolors = true
end
-- buffer
o.scrolloff = 5
o.wrap = true -- wraping lines
o.linebreak = true -- fix where line is wraped
o.cursorline = true
-- statusbar
o.laststatus = 3
o.cmdheight = 1
o.showmode = false -- stop vim from showing mode (we have a statusbar)
-- tabline
o.showtabline = 2
vim.opt.scrolloff = 5
vim.opt.wrap = true -- wraping lines
vim.opt.linebreak = true -- fix where line is wraped
vim.opt.cursorline = true
-- indents + tabs
local tabwidth = 2
o.expandtab = true
o.smarttab = true
o.cindent = true
o.autoindent = true
o.tabstop = tabwidth
o.shiftwidth = tabwidth
o.softtabstop = tabwidth
vim.opt.expandtab = true
vim.opt.smarttab = true
vim.opt.cindent = true
vim.opt.autoindent = true
vim.opt.tabstop = tabwidth
vim.opt.shiftwidth = tabwidth
vim.opt.softtabstop = tabwidth
-- colorscheme
if vim.fn.has("termguicolors") then
o.termguicolors = true
end
misc.colorscheme('mellow')
vim.opt.clipboard = 'unnamedplus' -- system clipboard
vim.opt.updatetime = 200
-- better editing -------------------------------------------------------------
o.clipboard = 'unnamedplus' -- system clipboard
o.splitkeep = "screen" -- keep same text on screen when spliting
o.updatetime = 200
-- file saving
vim.opt.swapfile = false
vim.opt.undofile = true
vim.opt.confirm = true
-- file saving ----------------------------------------------------------------
o.swapfile = false
o.undofile = true
o.confirm = true
-- searching
vim.opt.ignorecase = true
vim.opt.smartcase = true
vim.opt.wrapscan = true
vim.opt.showmatch = true
vim.opt.incsearch = true
-- searching ------------------------------------------------------------------
o.ignorecase = true
o.smartcase = true
o.wrapscan = true
o.showmatch = true
o.incsearch = true
-- wild menus
vim.opt.wildoptions = 'pum'
vim.opt.pumblend = 3
vim.opt.pumheight = 20
-- wild menus -----------------------------------------------------------------
o.wildoptions = 'pum'
o.pumblend = 3
o.pumheight = 20
vim.opt.wildignorecase = true
vim.opt.wildignore = '*.o'
o.wildignorecase = true
o.wildignore = '*.o'
-- netrw ----------------------------------------------------------------------
g.netrw_banner = 1
g.netrw_localcopydircmd = 'cp -r'
g.netrw_winsize = 30
g.netrw_liststyle = 1
g.netrw_preview = 1
-- netrw
vim.g.netrw_banner = 0
vim.g.netrw_winsize = 30
vim.g.netrw_liststyle = 1
vim.g.netrw_sizestyle = "H"
vim.g.netrw_hide = 1

167
lua/conf/plugins.lua
View File

@ -1,167 +0,0 @@
require('dep') {
-- dep manages dep ----------------------------------------------------------
{ 'squibid/dep',
url = 'https://git.squi.bid/dep',
pin = true,
-- branch = 'dev'
},
-- colorschemes -------------------------------------------------------------
{ 'mellow-theme/mellow.nvim',
requires = 'nvim-treesitter/nvim-treesitter'
},
-- ui -----------------------------------------------------------------------
{ 'lukas-reineke/indent-blankline.nvim' }, -- indentation indicators
{ 'folke/which-key.nvim' }, -- key map help
{ 'rcarriga/nvim-notify' }, -- notifications
{ 'tjdevries/express_line.nvim', -- status bar
requires = 'nvim-lua/plenary.nvim'
},
{ 'goolord/alpha-nvim' }, -- start page
{ 'dinhhuy258/sfm.nvim', -- tree view
deps = 'dinhhuy258/sfm-git.nvim'
},
{ 'matbme/JABS.nvim' }, -- buffer switcher
{ 'stevearc/dressing.nvim', -- nice ui selectors
requires = 'nvim-telescope/telescope.nvim'
},
{ 'lukas-reineke/headlines.nvim',
requires = 'nvim-neorg/neorg'
},
{ 'squibid/tar', -- tab bar
url = 'https://git.squi.bid/tar'
},
-- functional plugins -------------------------------------------------------
{ 'lewis6991/gitsigns.nvim' }, -- very helpful git things
{ 'chentoast/marks.nvim' }, -- marks in gutter
{ 'vidocqh/auto-indent.nvim' }, -- better tabbing into indents
{ 'mbbill/undotree' }, -- careful this one is written in vimscript
{ 'dhruvasagar/vim-table-mode' }, -- same with this one
{ 'altermo/ultimate-autopair.nvim', -- autopairs
branch = 'v0.6'
},
{ 'numToStr/Comment.nvim' },
{ 'ahmedkhalf/project.nvim' }, -- cd into root of project
{ 'mrjones2014/smart-splits.nvim'}, -- buffer resizing
{ 'ThePrimeagen/harpoon', -- super duper fast navigation through files
branch = 'harpoon2',
requires = 'nvim-lua/plenary.nvim'
},
-- note taking --------------------------------------------------------------
{ 'nvim-neorg/neorg',
branch = '*',
requires = {
'nvim-lua/plenary.nvim',
'nvim-treesitter/nvim-treesitter',
'folke/zen-mode.nvim',
{ 'vhyrro/luarocks.nvim',
config = function()
-- NOTE: you need the lua.h header file for lua version 5.1 and
-- luarocks on void linux run: xbps-install luarocks lua51-devel
local output = ""
local function cbstd(_, data, _)
data = table.concat(data)
data = data:gsub("\r", "\n")
output = output..data
end
-- actually start the build here
vim.fn.jobstart({ "nvim", "-l", "build.lua" }, {
on_stdout = cbstd,
on_stderr = cbstd,
on_exit = function()
-- return build status as a notification
vim.notify(output, vim.log.levels.INFO, { title = misc.appid })
end
})
end
}
},
deps = { 'nvim-neorg/neorg-telescope',
requires = 'nvim-telescope/telescope.nvim'
}
},
{ 'jbyuki/venn.nvim' },
-- fzf ----------------------------------------------------------------------
{ 'nvim-telescope/telescope.nvim',
requires = 'nvim-lua/plenary.nvim',
deps = {
'nvim-telescope/telescope-file-browser.nvim',
'nvim-telescope/telescope-symbols.nvim',
'axieax/urlview.nvim'
}
},
{ 'nvim-telescope/telescope-fzf-native.nvim',
config = function()
vim.cmd('make')
end,
requires = 'nvim-telescope/telescope.nvim'
},
-- treesitter + colorizing --------------------------------------------------
{ 'nvim-treesitter/nvim-treesitter',
deps = {
'Wansmer/treesj',
'nvim-treesitter/nvim-treesitter-context'
}
},
{ 'NvChad/nvim-colorizer.lua' },
{ 'folke/todo-comments.nvim',
requires = 'nvim-lua/plenary.nvim'
},
-- cmp ----------------------------------------------------------------------
{ 'hrsh7th/nvim-cmp',
deps = {
'lukas-reineke/cmp-under-comparator', -- better results
'hrsh7th/cmp-buffer', -- buffers
'FelipeLema/cmp-async-path', -- path
'hrsh7th/cmp-nvim-lsp', -- lsp
'hrsh7th/cmp-nvim-lua', -- nvim lua api
'hrsh7th/cmp-nvim-lsp-signature-help', -- completion information
{ 'L3MON4D3/cmp-luasnip-choice', -- luasnip
requires = 'L3MON4D3/LuaSnip'
}
},
},
-- snippets -----------------------------------------------------------------
{ 'L3MON4D3/LuaSnip',
deps = 'rafamadriz/friendly-snippets',
config = function()
vim.cmd('make install_jsregexp')
end
},
-- lsp ----------------------------------------------------------------------
{ 'neovim/nvim-lspconfig' }, -- setup lsp
{ 'j-hui/fidget.nvim', -- shows lsp progress
branch = 'legacy'
},
{ 'dnlhc/glance.nvim' }, -- diagnostic info at a glance
{ 'aznhe21/actions-preview.nvim', -- codeactions
requires = 'nvim-telescope/telescope.nvim'
},
{ 'danymat/neogen', -- generate lsp annotations
requires = 'nvim-treesitter/nvim-treesitter'
},
{ 'whynothugo/lsp_lines.nvim',
url = 'https://git.sr.ht/~whynothugo/lsp_lines.nvim'
},
-- mason --------------------------------------------------------------------
{ 'williamboman/mason.nvim',
deps = {
'WhoIsSethDaniel/mason-tool-installer.nvim',
'williamboman/mason-lspconfig.nvim'
}
}
}

1
lua/conf/plugins/biscuit.lua Normal file
View File

@ -0,0 +1 @@
return { 'Biscuit-Theme/nvim' }

170
lua/conf/plugins/cmp.lua Normal file
View File

@ -0,0 +1,170 @@
local function has_words_before()
unpack = unpack or table.unpack
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)
[1]:sub(col, col):match("%s") == nil
end
return { 'hrsh7th/nvim-cmp',
requires = {
'danymat/neogen',
'nvim-treesitter/nvim-treesitter',
'lukas-reineke/cmp-under-comparator' -- better results
},
-- suppliers for completions (they require nvim-cmp to be loaded before they are)
deps = {
'hrsh7th/cmp-buffer', -- buffers
'FelipeLema/cmp-async-path', -- path
'hrsh7th/cmp-nvim-lsp', -- lsp
'hrsh7th/cmp-nvim-lsp-signature-help', -- completion information
{ 'L3MON4D3/cmp-luasnip-choice', -- luasnip
requires = 'L3MON4D3/LuaSnip'
}
},
function()
local cmp = require('cmp')
local luasnip = require('luasnip')
local neogen = require('neogen')
cmp.setup {
-- disable when in comments
enabled = function()
local context = require('cmp.config.context')
if vim.api.nvim_get_mode().mode == 'c' then
return true
else
return not context.in_treesitter_capture("comment")
and not context.in_syntax_group("Comment")
end
end,
-- completion sources
sources = cmp.config.sources {
{ name = 'nvim_lsp', priority = 999 },
{ name = 'luasnip_choice', priority = 750 },
{ name = 'buffer', max_item_count = 3 },
{ name = 'async_path', max_item_count = 5 },
{ name = 'neorg' },
{ name = 'nvim_lsp_signature_help' }
},
-- how to sort results
sorting = {
comparators = {
cmp.config.compare.offset,
cmp.config.compare.exact,
cmp.config.compare.score,
require('cmp-under-comparator').under,
cmp.config.compare.kind,
cmp.config.compare.sort_text,
cmp.config.compare.length,
cmp.config.compare.order,
}
},
-- appearance of window
window = {
completion = {
scrollbar = false,
border = 'solid',
winhighlight = "Normal:WinBarNC,FloatBorder:WinBarNC,Search:WinBarNC",
},
documentation = {
border = 'solid',
winhighlight = "Normal:WinBarNC,FloatBorder:WinBarNC,Search:WinBarNC",
}
},
-- position of window
view = {
entries = {
name = 'custom',
selection_order = 'near_cursor'
}
},
-- formatting of content
formatting = {
fields = { 'menu', 'abbr', 'kind' },
format = function(entry, item)
local menu_icon = {
nvim_lsp = 'λ',
nvim_lua = 'v',
calc = '+',
luasnip = '%',
buffer = '@',
path = '#'
}
item.menu = menu_icon[entry.source.name]
return item
end
},
experimental = {
ghost_text = true
},
-- snippet integration
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end
},
-- mappings
mapping = cmp.mapping.preset.insert {
["<Tab>"] = cmp.mapping(function(fallback)
if #cmp.get_entries() == 1 then
cmp.confirm({ select = true })
elseif cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump()
elseif has_words_before() then
cmp.complete()
if #cmp.get_entries() == 1 then
cmp.confirm({ select = true })
end
elseif neogen.jumpable() then
neogen.jump_next()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
elseif neogen.jumpable(-1) then
neogen.jump_prev()
else
fallback()
end
end, { "i", "s" }),
['<CR>'] = cmp.mapping {
i = function(fallback)
if cmp.visible() and cmp.get_active_entry() then
cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
else
fallback()
end
end,
s = cmp.mapping.confirm({ select = true }),
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace,
select = true }),
},
["<C-u>"] = cmp.mapping.scroll_docs(-4),
["<C-d>"] = cmp.mapping.scroll_docs(4),
['<ESC>'] = cmp.mapping.close(),
["<C-e>"] = cmp.mapping.abort()
}
}
end
}

7
lua/conf/plugins/comment.lua Normal file
View File

@ -0,0 +1,7 @@
return { 'numToStr/Comment.nvim',
function()
require('Comment').setup {
ignore = '^$'
}
end
}

21
lua/conf/plugins/dressing.lua Normal file
View File

@ -0,0 +1,21 @@
local branch = nil
if vim.version().minor == 7 then
branch = 'nvim-0.7'
elseif vim.version().minor == 5 then
branch = 'nvim-0.5'
end
return { 'stevearc/dressing.nvim',
disable = vim.version().minor < 5,
branch = branch,
requires = 'nvim-telescope/telescope.nvim',
function()
require('dressing').setup {
input = {
title_pos = "center",
border = 'solid',
relative = "win"
}
}
end
}

34
lua/conf/plugins/fidget.lua Normal file
View File

@ -0,0 +1,34 @@
return { 'j-hui/fidget.nvim',
disable = vim.version().minor < 9,
function()
local notification_defaults = require("fidget.notification").default_config
notification_defaults["icon"] = ""
require('fidget').setup {
progress = {
display = {
progress_icon = {
pattern = "line",
period = 1
},
done_icon = ":)",
}
},
notification = {
override_vim_notify = true,
configs = {
default = notification_defaults,
},
view = {
icon_separator = " ",
group_separator = "---",
group_separator_hl = "Comment",
},
window = {
zindex = 44,
relative = "win"
}
}
}
end
}

78
lua/conf/plugins/gitsigns.lua Normal file
View File

@ -0,0 +1,78 @@
local misc = require('core.misc')
local map = misc.map
return { 'lewis6991/gitsigns.nvim',
disable = vim.version().minor < 9,
function()
local gs = require("gitsigns")
gs.setup {
signs = {
add = { text = '│' },
change = { text = '│' },
delete = { text = '-' },
topdelete = { text = '‾' },
changedelete = { text = '~' },
untracked = { text = '┆' }
},
signcolumn = true,
numhl = false,
linehl = false,
word_diff = false,
watch_gitdir = {
interval = 1000,
follow_files = true
},
attach_to_untracked = true,
current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
preview_config = { border = 'solid' },
on_attach = function(bufnr)
local opts = { buffer = bufnr }
-- Navigation
map('n', ']c', function()
if vim.wo.diff then
return ']c'
end
vim.schedule(function() gs.next_hunk() end)
return '<Ignore>'
end, { expr = true, buffer = bufnr })
map('n', '[c', function()
if vim.wo.diff then
return '[c'
end
vim.schedule(function() gs.prev_hunk() end)
return '<Ignore>'
end, { expr = true, buffer = bufnr })
-- Actions
map('n', '<leader>hs', gs.stage_hunk, opts)
map('n', '<leader>hr', gs.reset_hunk, opts)
map('v', '<leader>hs', function()
gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') }
end, opts)
map('v', '<leader>hr', function()
gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') }
end, opts)
map('n', '<leader>hS', gs.stage_buffer, opts)
map('n', '<leader>hu', gs.undo_stage_hunk, opts)
map('n', '<leader>hR', gs.reset_buffer, opts)
map('n', '<leader>hp', gs.preview_hunk, opts)
map('n', '<leader>hb', function() gs.blame_line { full=true } end, opts)
map('n', '<leader>tb', gs.toggle_current_line_blame, opts)
map('n', '<leader>hd', gs.diffthis, opts)
map('n', '<leader>hD', function() gs.diffthis('~') end, opts)
map('n', '<leader>td', gs.toggle_deleted, opts)
-- Text object
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', opts)
end
}
end
}

44
lua/conf/plugins/glance.lua Normal file
View File

@ -0,0 +1,44 @@
local misc = require('core.misc')
local map = misc.map
return { 'dnlhc/glance.nvim',
disable = vim.version().minor < 7,
function()
require('glance').setup {
border = {
enable = true,
top_char = '',
bottom_char = '─',
},
folds = {
fold_closed = '+',
fold_open = '-',
folded = true
},
theme = {
enable = false
},
hooks = {
before_open = function(results, open, jump, method)
local uri = vim.uri_from_bufnr(0)
if #results == 1 then
local target_uri = results[1].uri or results[1].targetUri
if target_uri == uri then
jump()
misc.timeout_highlight()
return
end
end
open()
end
}
}
map('n', 'gd', '<cmd>Glance definitions<CR>')
map('n', 'gr', '<cmd>Glance references<CR>')
map('n', 'gy', '<cmd>Glance type_definitions<CR>')
map('n', 'gi', '<cmd>Glance implementations<CR>')
end
}

31
lua/conf/plugins/harpoon.lua Normal file
View File

@ -0,0 +1,31 @@
local misc = require('core.misc')
local map = misc.map
return { 'ThePrimeagen/harpoon',
disable = vim.version().minor < 8,
branch = 'harpoon2',
requires = 'nvim-lua/plenary.nvim',
function()
local harpoon = require("harpoon")
harpoon:setup()
map("n", "<leader>a", function()
harpoon:list():add()
vim.notify("added "..vim.fn.expand("%:t").." to quickmarks", vim.log.levels.INFO, {
title = misc.appid,
})
end, { desc = "add current file to quickmarks" })
map("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
map("n", "<C-h>", function() harpoon:list():select(1) end)
map("n", "<C-t>", function() harpoon:list():select(2) end)
map("n", "<C-n>", function() harpoon:list():select(3) end)
map("n", "<C-s>", function() harpoon:list():select(4) end)
-- Toggle previous & next buffers stored within Harpoon list
map("n", "<C-S-P>", function() harpoon:list():prev() end)
map("n", "<C-S-N>", function() harpoon:list():next() end)
end
}

28
lua/conf/plugins/headlines.lua Normal file
View File

@ -0,0 +1,28 @@
return { 'lukas-reineke/headlines.nvim',
requires = 'nvim-treesitter/nvim-treesitter',
function()
require('headlines').setup {
norg = {
headline_highlights = {
"@neorg.headings.1.title",
"@neorg.headings.2.title",
"@neorg.headings.3.title",
"@neorg.headings.4.title",
"@neorg.headings.5.title",
"@neorg.headings.6.title"
},
bullets = { "", "", "", "" },
},
markdown = {
headline_highlights = {
"@neorg.headings.1.title",
"@neorg.headings.2.title",
"@neorg.headings.3.title",
"@neorg.headings.4.title",
"@neorg.headings.5.title",
"@neorg.headings.6.title"
}
}
}
end
}

12
lua/conf/plugins/incline.lua Normal file
View File

@ -0,0 +1,12 @@
return { 'b0o/incline.nvim',
function()
vim.cmd('set laststatus=3')
require('incline').setup {
hide = {
focused_win = true,
cursorline = true
}
}
end
}

3
lua/conf/plugins/jdtls.lua Normal file
View File

@ -0,0 +1,3 @@
return { 'mfussenegger/nvim-jdtls',
disable = vim.version().minor < 6
}

14
lua/conf/plugins/lsp_lines.lua Normal file
View File

@ -0,0 +1,14 @@
return { 'whynothugo/lsp_lines.nvim',
url = 'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
requires = 'neovim/nvim-lspconfig',
function()
require('lsp_lines').setup()
vim.diagnostic.config {
virtual_lines = {
highlight_whole_line = false,
only_current_line = true
}
}
end
}

18
lua/conf/plugins/lspconfig.lua Normal file
View File

@ -0,0 +1,18 @@
return { 'neovim/nvim-lspconfig',
disable = vim.version().minor < 8,
function()
vim.diagnostic.config {
virtual_text = false,
signs = true,
update_in_insert = false,
underline = true,
severity_sort = true
}
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
vim.lsp.handlers.hover, { border = 'solid' })
vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
vim.lsp.handlers.signature_help, { border = 'solid' })
end
}

52
lua/conf/plugins/luasnip.lua Normal file
View File

@ -0,0 +1,52 @@
local misc = require('core.misc')
local map = misc.map
return { 'L3MON4D3/LuaSnip',
branch = 'v2.3.0',
disable = vim.version().minor < 7,
config = function()
vim.cmd('make install_jsregexp')
end,
function()
local luasnip = require('luasnip')
local types = require("luasnip.util.types")
luasnip.config.set_config {
history = true, -- return back into snippet
updateevents = { "TextChanged", "TextChangedI" }, -- update on text insert
ext_opts = {
[types.choiceNode] = {
active = {
virt_text = {{ "●", "@boolean" }}
}
},
[types.insertNode] = {
active = {
virt_text = {{ "●", "@constant" }}
}
},
},
}
map({"i", "s"}, { "<C-e>", "<C-a>" }, function()
if luasnip.choice_active() then
luasnip.change_choice(1)
end
end)
map({"i", "s"}, "<C-k>", function()
if luasnip.expandable(-1) then
luasnip.expand(-1)
end
end)
-- load all snippets from snippet directory
for _, file in ipairs(vim.api.nvim_get_runtime_file("lua/snippets/*.lua", true)) do
local fn = file:gsub('^.*/', ''):gsub('%.lua$', '')
local ret = misc.include('snippets.'..fn)
if type(ret) ~= "boolean" then
luasnip.add_snippets(fn, ret, { key = fn })
end
end
end
}

369
lua/conf/plugins/mason-lspconfig.lua Normal file
View File

@ -0,0 +1,369 @@
local misc = require('core.misc')
local map, auto, augroup = misc.map, misc.auto, misc.augroup
return { 'williamboman/mason-lspconfig.nvim',
requires = {
'williamboman/mason.nvim',
'mfussenegger/nvim-jdtls',
'neovim/nvim-lspconfig'
},
function()
local util = require('lspconfig.util')
-- configure lsp when attached
local function lsp_attach(client, bufnr)
-- helper function(s)
local function set_lsp_sign(name, text)
vim.fn.sign_define(name, { text = text, texthl = name })
end
set_lsp_sign("DiagnosticSignError", "x")
set_lsp_sign("DiagnosticSignWarn" , "!")
set_lsp_sign("DiagnosticSignInfo" , "i")
set_lsp_sign("DiagnosticSignHint" , "h")
local opts = { buffer = bufnr }
-- LSP actions
map('n', 'K', vim.lsp.buf.hover, opts)
map('n', 'gD', vim.lsp.buf.definition, opts)
-- map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
map('n', 'gI', vim.lsp.buf.implementation, opts)
map('n', 'gY', vim.lsp.buf.type_definition, opts)
map('n', 'gR', vim.lsp.buf.references, opts)
map('n', '<S-Tab>', vim.lsp.buf.signature_help, opts)
map('n', '<leader>lr', vim.lsp.buf.rename, opts)
map('n', '<F2>', vim.lsp.buf.rename, opts)
map('n', 'gA', vim.lsp.buf.code_action, {
buffer = bufnr,
desc = 'check code actions',
})
map('n', '<F4>', vim.lsp.buf.code_action, {
buffer = bufnr,
desc = 'check code actions'
})
-- Diagnostics
map('n', '[d', vim.diagnostic.goto_prev)
map('n', ']d', vim.diagnostic.goto_next)
end
-- setup lsp capabilities
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem = {
documentationFormat = { "markdown", "plaintext" },
snippetSupport = true,
preselectSupport = true,
insertReplaceSupport = true,
labelDetailsSupport = true,
deprecatedSupport = true,
commitCharactersSupport = true,
tagSupport = {
valueSet = { 1 }
},
resolveSupport = {
properties = {
"documentation",
"detail",
"additionalTextEdits"
}
}
}
-- setup language servers
require('mason-lspconfig').setup {
ensure_installed = {
"lua_ls",
"clangd",
"jdtls",
"tsserver",
"phpactor",
"html",
"cssls",
"bashls",
"zls"
-- "asm-lsp", -- seems to be broken
}
}
require('mason-lspconfig').setup_handlers {
function(server_name)
require('lspconfig')[server_name].setup {
on_attach = lsp_attach,
capabilities = capabilities
}
end,
-- setup luals
["lua_ls"] = function(server_name)
local root_files = { '.luarc.json', '.luarc.jsonc', '.luacheckrc',
'.stylua.toml', 'stylua.toml', 'selene.toml', 'selene.yml',
'README.md'
}
-- FIXME: for some reason luals randomly resets the indentation of code
-- when pressing o or O. Right now this is a minor annoyance I will deal
-- with in exchange for really good lua lsp support.
--
-- FIXME: luals also seems to start up twice and sends back twice the
-- completions (one configured with the below settings and one without)
require('lspconfig')[server_name].setup {
on_attach = lsp_attach,
settings = {
Lua = {
diagnostics = {
globals = { "vim", 'mp' }
},
runtime = {
version = 'LuaJIT'
},
format = {
enable = false
},
workspace = {
checkThirdParty = false,
library = {
vim.env.VIMRUNTIME
}
}
}
},
root_dir = function(fname)
local root = util.root_pattern(unpack(root_files))(fname)
if root and root ~= vim.env.HOME then
return root
end
root = util.root_pattern('lua/')(fname)
if root then
return root
end
return util.find_git_ancestor(fname)
end
}
end,
-- setup clangd
["clangd"] = function(server_name)
require('lspconfig')[server_name].setup {
on_attach = function(client, bufnr)
lsp_attach(client, bufnr)
-- add some clangd specific mappings
local opts = { buffer = bufnr }
map("n", "<leader>o", "<cmd>ClangdSwitchSourceHeader<CR>", opts)
end,
capabilities = capabilities,
cmd = {
"clangd",
"--background-index",
"--clang-tidy",
"--header-insertion=iwyu",
"--completion-style=detailed",
"--function-arg-placeholders",
"--fallback-style=llvm"
},
init_options = {
usePlaceholders = true,
clangdFileStatus = true,
fallback_flags = {
"-xc" -- makes clangd think we're using c instead of c++
}
}
}
end,
-- setup jdtls
["jdtls"] = function(server_name)
auto("Filetype", {
pattern = "java",
callback = function()
-- must be a java interpreter of version 17 or greater
local java = "java"
local buffer = {}
---@type function
local startlsp
-- check if version of java in use is high enough
vim.fn.jobstart({ java, vim.fn.stdpath('config').."/extras/JavaVersion.java" }, {
stdin = nil,
on_stdout = function(_, data, _)
table.insert(buffer, table.concat(data))
end,
on_exit = function(_, exit_code, _)
local v = vim.version.parse(table.concat(buffer))
-- if there's an error, no version info, or the java version is
-- less than 17 stop the lsp from starting
if exit_code ~= 0 then
vim.notify(string.format(
"java version check failed: exit code %s", exit_code),
vim.log.levels.ERROR, { title = misc.appid })
return
elseif not v then
vim.notify("no java version info found", vim.log.levels.ERROR,
{ title = misc.appid })
return
elseif v.major < 17 then
vim.notify(string.format(
"java version %s < 17.0.0 Cannot run jdtls, bailing out",
v[1].."."..v[2].."."..v[3]),
vim.log.levels.ERROR, { title = misc.appid })
return
end
startlsp()
end
})
function startlsp()
local ok, jdtls = pcall(require, "jdtls")
if not ok then
vim.notify("jdtls not found, can't start java lsp",
vim.log.levels.ERROR, {})
return
end
local config = {}
config.on_attach = function(client, bufnr)
lsp_attach(client, bufnr)
-- add some jdtls specific mappings
local opts = { buffer = bufnr }
map('n', 'cri', jdtls.organize_imports, opts)
map('n', 'crv', jdtls.extract_variable, opts)
map('n', 'crc', jdtls.extract_constant, opts)
map('x', 'crv', "<esc><cmd>lua require('jdtls').extract_variable(true)<cr>", opts)
map('x', 'crc', "<esc><cmd>lua require('jdtls').extract_constant(true)<cr>", opts)
map('x', 'crm', "<esc><Cmd>lua require('jdtls').extract_method(true)<cr>", opts)
-- refresh the codelens every time after writing the file
local jdtls_cmds = augroup("jdtls_cmds")
pcall(vim.lsp.codelens.refresh)
auto('BufWritePost', {
buffer = bufnr,
group = jdtls_cmds,
desc = 'refresh codelens',
callback = function()
pcall(vim.lsp.codelens.refresh)
end
})
end
-- setup path stuff
local path = {}
local jdtls_install = require('mason-registry').get_package('jdtls'):get_install_path()
path.data_dir = vim.fn.stdpath('cache')..'/nvim-jdtls'
path.java_agent = jdtls_install..'/lombok.jar'
path.launcher_jar = vim.fn.glob(jdtls_install..'/plugins/org.eclipse.equinox.launcher_*.jar')
path.platform_config = jdtls_install..'/config_linux'
path.bundles = {}
-- data dir
local data_dir = path.data_dir..'/'..vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')
-- enable basic capabilities
config.capabilities = capabilities
-- enable some extended client capabilities
local extendedClientCapabilities = jdtls.extendedClientCapabilities
extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
-- command to start the lsp server
config.cmd = {
java, -- this has to be java17 or newer
'-Declipse.application=org.eclipse.jdt.ls.core.id1',
'-Dosgi.bundles.defaultStartLevel=4',
'-Declipse.product=org.eclipse.jdt.ls.core.product',
'-Dlog.protocol=true',
'-Dlog.level=ALL',
'-Xmx1G',
'--add-modules=ALL-SYSTEM',
'--add-opens', 'java.base/java.util=ALL-UNNAMED',
'--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'-jar', path.launcher_jar,
'-configuration', path.platform_config,
'-data', data_dir
}
-- settings
config.settings = {
java = {
eclipse = { downloadSources = true },
gradle = { enabled = true },
maven = { downloadSources = true },
implementationsCodeLens = { enabled = true },
referencesCodeLens = { enabled = true },
references = { includeDecompiledSources = true },
symbols = { includeSourceMethodDeclarations = true },
inlayHints = {
parameterNames = {
enabled = "all"
}
},
completion = {
favoriteStaticMembers = {
"org.hamcrest.MatcherAssert.assertThat",
"org.hamcrest.Matchers.*",
"org.hamcrest.CoreMatchers.*",
"org.junit.jupiter.api.Assertions.*",
"java.util.Objects.requireNonNull",
"java.util.Objects.requireNonNullElse",
"org.mockito.Mockito.*"
},
filteredTypes = {
"com.sun.*",
"io.micrometer.shaded.*",
"java.awt.*",
"jdk.*",
"sun.*"
},
importOrder = {
"java",
"javax",
"com",
"org"
}
},
sources = {
organizeImports = {
starThreshold = 9999,
staticStarThreshold = 9999
}
},
codeGeneration = {
toString = {
template = '${object.className}{${member.name()}=${member.value}, ${otherMembers}}'
},
hashCodeEquals = { useJava7Objects = true },
useBlocks = true,
}
}
}
config.signatureHelp = { enabled = true }
config.flags = { allow_incremental_sync = true }
-- disable all messages from printing
config.handlers = {
['language/status'] = function() end
}
config.init_options = {
extendedClientCapabilities = extendedClientCapabilities,
}
config.root_dir = vim.fs.root(0, { ".git", "mvnw", ".gradle",
"gradlew" })
-- start it up
jdtls.start_or_attach(config)
end
end
})
end
}
end
}

31
lua/conf/plugins/mason.lua Normal file
View File

@ -0,0 +1,31 @@
return { 'williamboman/mason.nvim',
disable = vim.version().minor < 7,
function()
local mason = require('mason')
mason.setup {
ui = {
border = "solid",
width = 0.8,
height = 0.9,
icons = {
package_installed = "+",
package_pending = "?",
package_uninstalled = "x"
}
},
keymaps = {
toggle_package_expand = "<CR>",
install_package = "i",
update_package = "u",
check_package_version = "c",
update_all_packages = "U",
check_outdated_packages = "C",
uninstall_package = "r",
cancel_installation = "<C-c>",
apply_language_filter = "<C-f>"
}
}
end
}

35
lua/conf/plugins/mellow.lua Normal file
View File

@ -0,0 +1,35 @@
return { 'mellow-theme/mellow.nvim',
requires = 'nvim-treesitter/nvim-treesitter',
function()
vim.g.mellow_variant = "dark"
local c = require("mellow.colors")[vim.g.mellow_variant]
vim.g.mellow_highlight_overrides = {
-- stop inactive windows from having a darker bg
["NormalNC"] = { link = "Normal" },
-- make floats darker
["NormalFloat"] = { fg = c.fg, bg = c.bg_dark },
["FloatBorder"] = { link = "NormalFloat" },
-- neorg headings, looks extra good with lukas-reineke/headlines.nvim
["@neorg.headings.1.title"] = { fg = c.yellow, bg = "#2a211c" },
["@neorg.headings.1.icon"] = { link = "@neorg.headings.1.title" },
["@neorg.headings.2.title"] = { fg = c.blue, bg = '#201e25' },
["@neorg.headings.2.icon"] = { link = "@neorg.headings.2.title" },
["@neorg.headings.3.title"] = { fg = c.cyan, bg = '#2b1b20' },
["@neorg.headings.3.icon"] = { link = "@neorg.headings.3.title" },
["@neorg.headings.4.title"] = { fg = c.green, bg = '#1d201e' },
["@neorg.headings.4.icon"] = { link = "@neorg.headings.4.title" },
["@neorg.headings.5.title"] = { fg = c.magenta, bg = '#251a21' },
["@neorg.headings.5.icon"] = { link = "@neorg.headings.5.title" },
["@neorg.headings.6.title"] = { fg = c.white, bg = '#212126' },
["@neorg.headings.6.icon"] = { link = "@neorg.headings.6.title" }
}
end
}

19
lua/conf/plugins/neogen.lua Normal file
View File

@ -0,0 +1,19 @@
local misc = require('core.misc')
local map = misc.map
return { 'danymat/neogen',
requires = {
'nvim-treesitter/nvim-treesitter',
'L3MON4D3/LuaSnip'
},
function()
local neogen = require('neogen')
neogen.setup {
enabled = true,
input_after_comment = true,
snippet_engine = "luasnip",
}
map('n', '<leader>d', neogen.generate)
end
}

135
lua/conf/plugins/neorg.lua Normal file
View File

@ -0,0 +1,135 @@
-- WARNING: neorg does some pretty stupid stuff when it comes to the plugins it
-- wants (using luarocks), in order to get around all that bullshit I've
-- manually added it's dependencies. Because I don't want this to randomly break
-- I've also pinned neorg to the latest working version that I've messed around
-- with.
--
-- NOTE: for my future self to update this thingy while not breaking
-- dependencies take a look at the build.lua for versioning info. Also make sure
-- to check the release notes on github for info on breaking changes.
local workspace_cache = vim.fs.joinpath(vim.fn.stdpath("data"), "neorg-workspace-cache.lua")
--- populate neorg workspaces from path or cache
---@param path string path to populate workspaces from
---@param cache boolean? if true will re populate the cache from the fs
---@return table workspaces
local function populate_workspaces(path, cache)
local workspaces = {}
cache = cache or false
if vim.fn.filereadable(workspace_cache) == 1 and not cache then
local ok, ret = pcall(dofile, workspace_cache)
if ok and type(ret) == "table" then
return ret
end
end
-- loop through all files in path if path is not empty
if vim.fn.empty(vim.fn.glob(path)) == 0 then
for n, t in vim.fs.dir(path) do
if string.sub(n, 1, 1) == "." or (t ~= "directory" and t ~= "link") then
goto continue
end
-- make sure this still works if the last charachter in the path isn't a '/'
workspaces[n] = (string.sub(path, #path, #path) == "/") and path..n or path.."/"..n
::continue::
end
end
-- write data to cachefile
local f = io.open(workspace_cache, "w+")
if not f then
return workspaces
end
f:write("return")
local ret = vim.inspect(workspaces)
if type(ret) == "string" then
f:write(ret)
else
f:write("false")
end
f:close()
return workspaces
end
return { 'nvim-neorg/neorg',
disable = vim.version.lt(vim.version(), { 0, 10, 0 }),
branch = 'v9.1.1',
requires = {
'nvim-lua/plenary.nvim',
'nvim-treesitter/nvim-treesitter',
'folke/zen-mode.nvim',
'hrsh7th/nvim-cmp',
{ 'nvim-neorg/neorg-telescope',
requires = 'nvim-telescope/telescope.nvim'
},
-- NOTE: these are usually installed by neorg via luarocks, the versions
-- were picked based on the build.lua found in the root of the neorg repo
{ 'nvim-neotest/nvim-nio',
branch = 'v1.7.0'
},
{ 'nvim-neorg/lua-utils.nvim',
branch = 'v1.0.2'
},
{ 'MunifTanjim/nui.nvim',
branch = '0.3.0'
},
{ 'pysan3/pathlib.nvim',
branch = 'v2.2.2'
}
},
function()
local wsphome = (os.getenv("XDG_DOCUMENTS_DIR") or
(os.getenv("HOME").."/Documents")).."/notes/"
require('neorg').setup {
load = {
-- not sure how to sort the modules so ima just put the empty ones first
["core.defaults"] = {},
["core.export"] = {},
["core.export.markdown"] = {},
["core.integrations.telescope"] = {},
["core.summary"] = {},
["core.ui.calendar"] = {},
["core.completion"] = {
config = {
engine = "nvim-cmp"
}
},
["core.concealer"] = {
config = {
folds = false
}
},
["core.dirman"] = {
config = {
-- a list of available workspaces are generated at runtime >:)
workspaces = populate_workspaces(wsphome)
}
},
["core.esupports.metagen"] = {
config = {
type = "auto"
}
},
["core.presenter"] = {
config = {
zen_mode = "zen-mode"
}
},
["core.qol.toc"] = {
config = {
close_after_use = true
}
}
}
}
end
}

11
lua/conf/plugins/nvim-colorizer.lua Normal file
View File

@ -0,0 +1,11 @@
return { 'NvChad/nvim-colorizer.lua',
disable = vim.version().minor < 7 and not vim.fn.has("termguicolors"),
function()
require('colorizer').setup {
user_default_options = {
names = false,
css = true
}
}
end
}

18
lua/conf/plugins/project.lua Normal file
View File

@ -0,0 +1,18 @@
return { 'ahmedkhalf/project.nvim',
disable = vim.version().minor < 5,
function()
require('project_nvim').setup {
patterns = {
".git",
"Makefile",
"_darcs",
".hg",
".bzr",
".svn",
"package.json",
"index.norg",
"README.md"
}
}
end
}

78
lua/conf/plugins/telescope.lua Normal file
View File

@ -0,0 +1,78 @@
local misc = require('core.misc')
local map = misc.map
return { 'nvim-telescope/telescope.nvim',
disable = vim.version().minor < 9,
requires = {
'nvim-lua/plenary.nvim',
{ 'nvim-telescope/telescope-fzf-native.nvim',
config = function()
vim.cmd('make')
end
}
},
function()
local telescope = require("telescope")
local actions = require('telescope.actions')
local action_layout = require("telescope.actions.layout")
local function telescopew()
if vim.o.columns <= 80 then
return vim.o.columns
else
return 0.8
end
end
telescope.setup {
defaults = {
borderchars = {
prompt = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
results = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
preview = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' },
},
winblend = 0,
layout_strategy = 'horizontal',
sorting_strategy = 'descending',
scroll_strategy = 'limit',
layout_config = {
horizontal = {
width = telescopew(),
height = 20,
prompt_position = 'bottom',
anchor = 'N',
}
},
mappings = {
i = {
["<esc>"] = actions.close,
['<C-j>'] = actions.move_selection_next,
['<C-k>'] = actions.move_selection_previous,
['<C-l>'] = actions.select_default,
['<C-u>'] = actions.preview_scrolling_up,
['<C-d>'] = actions.preview_scrolling_down,
["<C-p>"] = action_layout.toggle_preview
},
n = {
["gg"] = actions.move_to_top,
["G"] = actions.move_to_bottom,
}
}
}
}
local telebuilt = require('telescope.builtin')
map('n', '<leader>f', function()
telebuilt.fd { follow = true }
end, { desc = 'Find files.' })
map('n', '<leader>s', telebuilt.live_grep, { desc = 'Find string in project.' })
map('n', '<leader>b', telebuilt.current_buffer_fuzzy_find, {
desc = 'Find string in current buffer.',
})
-- enable previewing in the default colorscheme switcher
telebuilt.colorscheme = function()
require("telescope.builtin.__internal").colorscheme { enable_preview = true }
end
end
}

42
lua/conf/plugins/todo-comments.lua Normal file
View File

@ -0,0 +1,42 @@
local branch = nil
if vim.version().minor < 8 then
branch = 'neovim-pre-0.8.0'
end
return { 'folke/todo-comments.nvim',
requires = 'nvim-lua/plenary.nvim',
branch = branch,
function()
require('todo-comments').setup {
keywords = {
FIX = {
icon = "# ",
alt = { "FIXME", "BUG" },
},
HACK = {
icon = "* ",
color = "warning",
},
WARN = {
icon = "! ",
color = "warning",
alt = { "WARNING", "XXX" },
},
NOTE = {
icon = "i ",
color = "hint",
alt = { "INFO", "TODO" },
},
PERF = {
icon = "@ ",
alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" },
},
TEST = {
icon = "@ ",
color = "test",
alt = { "TESTING", "PASSED", "FAILED" },
},
},
}
end
}

40
lua/conf/plugins/treesitter-context.lua Normal file
View File

@ -0,0 +1,40 @@
local misc = require("core.misc")
local map = misc.map
local branch = nil
if vim.version().minor == 7 then
branch = 'compat/0.7'
end
return { 'nvim-treesitter/nvim-treesitter-context',
disable = vim.version().minor < 7,
branch = branch,
requires = 'nvim-treesitter/nvim-treesitter',
function()
local treesitter_context = require("treesitter-context")
treesitter_context.setup {
enable = true,
line_numbers = true,
separator = '─',
}
-- mapping to jump to the first closest line of context in buffer
map("n", "[j", function()
local lline = vim.api.nvim_win_get_cursor(0)[1];
local line
-- go to the first closest line of context and center it
treesitter_context.go_to_context()
vim.api.nvim_input('zz')
-- make sure we actually moved
line = vim.api.nvim_win_get_cursor(0)[1];
if line == lline then
return
end
misc.timeout_highlight()
end)
end
}

59
lua/conf/plugins/treesitter.lua Normal file
View File

@ -0,0 +1,59 @@
table.contains = function(self, string)
for _, v in pairs(self) do
if v == string then
return true
end
end
return false
end
return { 'nvim-treesitter/nvim-treesitter',
disable = vim.version.lt(vim.version(), { 0, 9, 2 }),
config = function()
vim.cmd("TSUpdate")
end,
function()
require('nvim-treesitter.configs').setup {
-- good default parsers
ensure_installed = { "c", "lua", "vim", "vimdoc", "markdown",
"markdown_inline", "java", "bash", "css", "html", "luadoc"
},
-- install missing parsers
auto_install = true,
-- indentation
indent = {
enable = true,
disable = function(lang, buf)
-- disable indenting in php (it's more broken with than without)
return table.contains({
"php"
}, lang)
end
},
-- enable highlighting
highlight = {
enable = true,
-- use vim highlighting in addition to treesitter
additional_vim_regex_highlighting = true,
disable = function(lang, buf)
-- disable in diff files
local langs = { "diff" }
if table.contains(langs, lang) then
return true
end
-- disable in big files
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > (1024 * 100 * 10) --[[1MB]] then
return true
end
end
}
}
end
}

14
lua/conf/plugins/treesj.lua Normal file
View File

@ -0,0 +1,14 @@
local misc = require('core.misc')
local map = misc.map
return { 'Wansmer/treesj',
disable = vim.version().minor < 9,
requires = 'nvim-treesitter/nvim-treesitter',
function()
require('treesj').setup {
use_default_keymaps = false,
}
map('n', '<leader>j', require('treesj').toggle, { desc = 'fold code' })
end
}

12
lua/conf/plugins/undotree.lua Normal file
View File

@ -0,0 +1,12 @@
local misc = require('core.misc')
local map = misc.map
return { 'mbbill/undotree',
function()
if (vim.g.loaded_undotree) then
vim.g.undotree_DiffAutoOpen = 0
end
map("n", "<leader>u", "<cmd>UndotreeToggle<CR>")
end
}

81
lua/core/conf.lua
View File

@ -1,81 +0,0 @@
local pickers = require("telescope.pickers")
local finders = require("telescope.finders")
local previewers = require("telescope.previewers")
local conf = require("telescope.config").values
local actions = require("telescope.actions")
local action_state = require("telescope.actions.state")
local M = {}
local function genmenu()
local list = {}
local function add(name, plug)
if not plug then
table.insert(list, name)
elseif package.loaded[plug] then
table.insert(list, name)
end
end
add('Edit Config', nil)
add('Update Plugins', 'dep')
add('Keybinds', 'telescope')
add('Colorscheme', 'telescope')
return list
end
function M.configmenu()
pickers.new({
prompt_title = "Nvim Config Menu",
finder = finders.new_table { results = genmenu() },
sorter = conf.generic_sorter(),
previewer = previewers.new_buffer_previewer {
define_preview = function(self, entry)
local lines = {
'a'
}
if entry.value == "Edit Config" then
lines = misc.readf(vim.fn.stdpath('config')..'/init.lua')
local ft = vim.filetype.match({
filename = os.getenv('XDG_CONFIG_HOME')..'/nvim/init.lua' })
require("telescope.previewers.utils").highlighter(self.state.bufnr, ft)
elseif entry.value == "Colorscheme" then
lines = vim.fn.getcompletion('', 'color')
for k, v in pairs(lines) do
if v.find(v, '.ext') then
table.remove(lines, k)
break
end
end
end
vim.api.nvim_buf_set_lines(self.state.bufnr, 0, -1, false, lines)
end
},
attach_mappings = function(bufnr, map)
actions.select_default:replace(function()
actions.close(bufnr)
local selection = action_state.get_selected_entry()
if selection[1] == 'Edit Config' then
vim.cmd('e '..vim.fn.stdpath('config')..'/init.lua')
elseif selection[1] == 'Update Plugins' then
require('dep').sync()
if package.loaded['nvim-treesitter'] then
vim.cmd('TSUpdate')
end
if package.loaded['mason'] then
require('mason.api.command').MasonUpdate()
end
elseif selection[1] == 'Keybinds' then
require('telescope.builtin').keymaps()
elseif selection[1] == 'Colorscheme' then
require('core.theme').switcher()
end
end)
return true
end,
}):find()
end
return M

61
lua/core/harpoon.lua
View File

@ -1,61 +0,0 @@
local pickers = require("telescope.pickers")
local finders = require("telescope.finders")
local conf = require("telescope.config").values
local actions = require("telescope.actions")
local action_set = require("telescope.actions.set")
local action_state = require("telescope.actions.state")
local harpoon = require('harpoon')
local M = {}
function M.switcher()
local filepaths = {}
for _, item in ipairs(harpoon:list().items) do
table.insert(filepaths, item.value)
end
pickers.new({
prompt_title = "Harpoon",
finder = finders.new_table { results = filepaths },
sorter = conf.generic_sorter(),
previewer = conf.file_previewer {},
attach_mappings = function(prompt_bufnr, map)
actions.move_selection_previous:replace(function()
action_set.shift_selection(prompt_bufnr, -1)
end)
actions.move_selection_next:replace(function()
action_set.shift_selection(prompt_bufnr, 1)
end)
-- remove harpoon item
vim.keymap.set("i", "<C-a>", function()
if action_state.get_selected_entry() then
for i, v in ipairs(filepaths) do
if v == action_state.get_selected_entry()[1] then
harpoon:list():removeAt(i)
actions.close(prompt_bufnr)
M.switcher()
end
end
end
end)
-- select items, and open buffer
vim.keymap.set("i", "<C-s>", function()
if action_state.get_selected_entry() then
actions.close(prompt_bufnr)
vim.cmd("split "..action_state.get_selected_entry()[1])
end
end, { buffer = true, remap = true })
actions.select_default:replace(function()
if action_state.get_selected_entry() then
actions.close(prompt_bufnr)
vim.cmd("e "..action_state.get_selected_entry()[1])
end
end)
return true
end
}):find()
end
return M

187
lua/core/misc.lua
View File

@ -1,43 +1,184 @@
local M = {}
--- vim.notify title
M.appid = "Nvim Config"
--- safe version of require
---@param fn string name of file to include
---@return any
function M.include(fn)
local ok, r = pcall(require, fn)
if not ok then
vim.notify('Could not find "'..fn..'": '..r, vim.log.levels.WARN, { title = M.appid })
return ok
end
return r
end
--- loop through files in directory
---@param path string absolute path of directory to be looped through
---@param body function function to use on every recursion of the loop
---@param ext string? desired file extension of files to be returned from directory
function M.loopf(path, body, ext)
ext = ext and [[v:val =~ '\.]]..ext..[[$']] or nil
for _, file in ipairs(vim.fn.readdir(path, ext)) do
body(file)
end
end
--- set colorscheme
---@param name string name of colorscheme
function M.colorscheme(name)
vim.cmd('colorscheme '..name)
for k, v in pairs(vim.fn.getcompletion('', 'color')) do
for _, v in pairs(vim.fn.getcompletion('', 'color')) do
if v == name..'.ext' then
vim.cmd('colorscheme '..name..'.ext')
end
end
end
function M.replaceword(old, new)
local conf = vim.fn.stdpath("config").."/lua/conf/".."opts.lua"
local f = io.open(conf, "r")
if not f then return end
local new_content = f:read("*all"):gsub(old, new)
f:close()
--- extend vim.kemap.set
---@param mode string|table mode for the keymap
---@param bind string|table keymap
---@param cmd function|string command to run
---@param opts table? keymap options
function M.map(mode, bind, cmd, opts)
opts = opts or {}
opts['noremap'] = true
opts['silent'] = true
f = io.open(conf, "w")
if not f then return end
f:write(new_content)
f:close()
end
function M.include(fn)
if not pcall(require, fn) then
vim.notify('Could not find "'..fn, vim.log.levels.WARN..'"', { title = M.appid })
if type(bind) == 'table' then
for i in pairs(bind) do
vim.keymap.set(mode, bind[i], cmd, opts)
end
elseif type(bind) == 'string' then
vim.keymap.set(mode, bind, cmd, opts)
end
end
function M.readf(fn)
local f = io.open(fn, "r")
if not f then return nil end
local tab = {}
for l in f:lines() do
table.insert(tab, l)
--- a small map wrapper to easily create local buffer mappings
---@param mode string|table mode for the keymap
---@param bind string|table keymap
---@param cmd function|string command to run
---@param opts table? keymap options
function M.map_local(mode, bind, cmd, opts)
opts = opts or {}
opts["buffer"] = 0
M.map(mode, bind, cmd, opts)
end
--- extend vim.api.nvim_create_autocmd
---@param event string|table event or events
---@param opts table options
function M.auto(event, opts)
vim.api.nvim_create_autocmd(event, opts)
end
--- extend auto group
---@param name string name of the autogroup
---@param opts table? table of options
function M.augroup(name, opts)
opts = opts or {}
vim.api.nvim_create_augroup(name, opts)
end
--- extend vim.api.nvim_set_hl
---@param group string|table highlight group
---@param opts table highlight options
---@param namespace? number highlight space
function M.highlight(group, opts, namespace)
namespace = namespace or 0
if type(group) == 'table' then
for i in pairs(group) do
vim.api.nvim_set_hl(namespace, group[i], opts)
end
elseif type(group) == 'string' then
vim.api.nvim_set_hl(namespace, group, opts)
end
return tab
end
--- copy highlight group
---@param hlgroup string highlight group to copy
---@param namespace? number highlight space
---@return table
function M.cpyhl(hlgroup, namespace)
namespace = namespace or 0
local ok, hl = pcall(vim.api.nvim_get_hl, namespace, {
name = hlgroup,
create = false
})
if not ok then
return {}
end
for _, key in pairs({"foreground", "background", "special"}) do
if hl[key] then
hl[key] = string.format("#%06x", hl[key])
end
end
return hl
end
--- highlight something with some highlight group for a certain amount of time
---@param opts table? options
--- example:
--- ```lua
--- {
--- -- highlight group to use
--- hl = "IncSearch",
---
--- -- # of ms to stay highlighted for
--- timeout = 250,
---
--- -- line to highlight
--- line = vim.api.nvim_win_get_cursor(0)[1],
---
--- -- range to highlight if this is used line will be ignored
--- range = {
--- { 0, 0 },
--- { 0, 0 }
--- }
--- }
--- ```
--- opts is optional and if empty will simply highlight the current line for
--- 250ms using IncSearch as the highlight group
function M.timeout_highlight(opts)
opts = opts or {}
opts.hl = opts.hl or "IncSearch"
opts.timeout = opts.timeout or 250
if type(opts.range) ~= "table" or type(opts.range[1]) ~= "table" or
type(opts.range[2]) ~= "table" then
local curline = opts.line or vim.api.nvim_win_get_cursor(0)[1]
opts.range = {
{ curline - 1, 0 },
{ curline, 0 }
}
end
local namespaceid = vim.api.nvim_create_namespace("timeout_highlight")
-- timer code was happily stolen from neovim/runtime/lua/vim/highlight.lua :)
local timer, timer_cancel
if timer then
timer:close()
assert(timer_cancel)
timer_cancel()
end
-- set the highlight
vim.highlight.range(0, namespaceid, opts.hl, opts.range[1], opts.range[2], {})
timer_cancel = function()
timer = nil
timer_cancel = nil
pcall(vim.api.nvim_buf_clear_namespace, 0, namespaceid, 0, -1)
pcall(vim.api.nvim_win_remove_ns, 0, namespaceid)
end
timer = vim.defer_fn(timer_cancel, opts.timeout)
end
return M

22
lua/core/snippets/shorthands.lua Normal file
View File

@ -0,0 +1,22 @@
luasnip = require('luasnip')
s = luasnip.snippet
sn = luasnip.snippet_node
t = luasnip.text_node
i = luasnip.insert_node
f = luasnip.function_node
c = luasnip.choice_node
d = luasnip.dynamic_node
r = luasnip.restore_node
l = require("luasnip.extras").lambda
rep = require("luasnip.extras").rep
p = require("luasnip.extras").partial
m = require("luasnip.extras").match
n = require("luasnip.extras").nonempty
dl = require("luasnip.extras").dynamic_lambda
fmt = require("luasnip.extras.fmt").fmt
fmta = require("luasnip.extras.fmt").fmta
types = require("luasnip.util.types")
conds = require("luasnip.extras.conditions")
conds_expand = require("luasnip.extras.conditions.expand")
ts_postfix = require("luasnip.extras.treesitter_postfix").treesitter_postfix

325
lua/core/statusbar/components.lua
View File

@ -1,325 +0,0 @@
if not pcall(require, "el") then return end
local job = require "plenary.job"
local el_sub = require "el.subscribe"
local M = {}
function M.extract_hl(spec)
if not spec or vim.tbl_isempty(spec) then return end
local hl_name, hl_opts = { "El" }, {}
for attr, val in pairs(spec) do
if type(val) == "table" then
table.insert(hl_name, attr)
assert(vim.tbl_count(val) == 1)
local hl, what = next(val)
local hlID = vim.fn.hlID(hl)
if hlID > 0 then
table.insert(hl_name, hl)
local col = vim.fn.synIDattr(hlID, what)
if col and #col > 0 then
table.insert(hl_name, what)
hl_opts[attr] = col
end
end
else
-- bold, underline, etc
hl_opts[attr] = val
end
end
hl_name = table.concat(hl_name, "_")
-- if highlight exists, verify it has
-- the correct colorscheme highlights
local newID = vim.fn.hlID(hl_name)
if newID > 0 then
for what, expected in pairs(hl_opts) do
local res = vim.fn.synIDattr(newID, what)
if type(expected) == "boolean" then
-- synIDattr returns '1' for boolean
res = res and res == "1" and true
end
if res ~= expected then
-- need to regen the highlight
-- print("color mismatch", hl_name, what, "e:", expected, "c:", res)
newID = 0
end
end
end
if newID == 0 then
vim.api.nvim_set_hl(0, hl_name, hl_opts)
end
return hl_name
end
local function set_hl(hls, s)
if not hls or not s then return s end
hls = type(hls) == "string" and { hls } or hls
for _, hl in ipairs(hls) do
if vim.fn.hlID(hl) > 0 then
return ("%%#%s#%s%%0*"):format(hl, s)
end
end
return s
end
local function wrap_fnc(opts, fn)
return function(window, buffer)
-- buf_autocmd doesn't send win
if not window and buffer then
window = { win_id = vim.fn.bufwinid(buffer.bufnr) }
end
if opts.hide_inactive and window and
window.win_id ~= vim.api.nvim_get_current_win() then
return ""
end
return fn(window, buffer)
end
end
function M.mode(opts)
opts = opts or {}
return wrap_fnc(opts, function(_, _)
local fmt = opts.fmt or "%s%s"
local mode = vim.api.nvim_get_mode().mode
local mode_data = opts.modes and opts.modes[mode]
local hls = mode_data and mode_data[3]
local icon = opts.hl_icon_only and set_hl(hls, opts.icon) or opts.icon
mode = mode_data and mode_data[1]:upper() or mode
mode = (fmt):format(icon or "", mode)
return not opts.hl_icon_only and set_hl(hls, mode) or mode
end)
end
function M.git_branch(opts)
opts = opts or {}
return el_sub.buf_autocmd("el_git_branch", "BufEnter",
wrap_fnc(opts, function(_, buffer)
-- Try fugitive first as it's most reliable
local branch = vim.g.loaded_fugitive == 1 and
vim.fn.FugitiveHead() or nil
-- buffer can be null and code will crash with:
-- E5108: Error executing lua ... 'attempt to index a nil value'
if not buffer or not (buffer.bufnr > 0) then
return
end
-- fugitive is empty or not loaded, try gitsigns
if not branch or #branch == 0 then
local ok, res = pcall(vim.api.nvim_buf_get_var,
buffer.bufnr, "gitsigns_head")
if ok then branch = res end
end
-- last resort run git command
if not branch then
local j = job:new {
command = "git",
args = { "branch", "--show-current" },
cwd = vim.fn.fnamemodify(buffer.name, ":h"),
}
local ok, result = pcall(function()
return vim.trim(j:sync()[1])
end)
if ok then
branch = result
end
end
if branch and #branch > 0 then
local fmt = opts.fmt or "%s %s"
local icon = opts.icon or ""
return set_hl(opts.hl, (fmt):format(icon, branch))
end
end))
end
local function git_changes_formatter(opts)
local specs = {
insert = {
regex = "(%d+) insertions?",
icon = opts.icon_insert or "+",
hl = opts.hl_insert,
},
change = {
regex = "(%d+) files? changed",
icon = opts.icon_change or "~",
hl = opts.hl_change,
},
delete = {
regex = "(%d+) deletions?",
icon = opts.icon_delete or "-",
hl = opts.hl_delete,
},
}
return function(_, _, s)
local result = {}
for k, v in pairs(specs) do
local count = nil
if type(s) == "string" then
-- 'git diff --shortstat' output
-- from 'git_changes_all'
count = tonumber(string.match(s, v.regex))
else
-- map from 'git_changes_buf'
count = s[k]
end
if count and count > 0 then
table.insert(result, set_hl(v.hl, ("%s%d"):format(v.icon, count)))
end
end
return table.concat(result, " ")
end
end
-- requires gitsigns
function M.git_changes_buf(opts)
opts = opts or {}
local formatter = opts.formatter or git_changes_formatter(opts)
return wrap_fnc(opts, function(window, buffer)
local stats = {}
if buffer and buffer.bufnr > 0 then
local ok, res = pcall(vim.api.nvim_buf_get_var,
buffer.bufnr, "vgit_status")
if ok then stats = res end
end
if buffer and buffer.bufnr > 0 then
local ok, res = pcall(vim.api.nvim_buf_get_var,
buffer.bufnr, "gitsigns_status_dict")
if ok then stats = res end
end
local counts = {
insert = stats.added > 0 and stats.added or nil,
change = stats.changed > 0 and stats.changed or nil,
delete = stats.removed > 0 and stats.removed or nil,
}
if not vim.tbl_isempty(counts) then
local fmt = opts.fmt or "%s"
local out = formatter(window, buffer, counts)
return out and fmt:format(out) or nil
else
-- el functions that return a
-- string must not return nil
return ""
end
end)
end
function M.git_changes_all(opts)
opts = opts or {}
local formatter = opts.formatter or git_changes_formatter(opts)
return el_sub.buf_autocmd("el_git_changes", "BufWritePost",
wrap_fnc(opts, function(window, buffer)
if not buffer or
not (buffer.bufnr > 0) or
vim.bo[buffer.bufnr].bufhidden ~= "" or
vim.bo[buffer.bufnr].buftype == "nofile" or
vim.fn.filereadable(buffer.name) ~= 1 then
return
end
local j = job:new {
command = "git",
args = { "diff", "--shortstat" },
-- makes no sense to run for one file as
-- 'file(s) changed' will always be 1
-- args = { "diff", "--shortstat", buffer.name },
cwd = vim.fn.fnamemodify(buffer.name, ":h"),
}
local ok, git_changes = pcall(function()
return formatter(window, buffer, vim.trim(j:sync()[1]))
end)
if ok then
local fmt = opts.fmt or "%s"
return git_changes and fmt:format(git_changes) or nil
end
end))
end
function M.lsp_srvname(opts)
local fmt = opts.fmt or "%s"
local icon = opts.icon or ""
local names = ""
vim.lsp.for_each_buffer_client(0, function(client)
if names ~= "" then names = names..", " end
names = names..client.name
end)
return icon..fmt:format(names)
end
local function diag_formatter(opts)
return function(_, buffer, counts)
local items = {}
local icons = {
["errors"] = { opts.icon_err or "x", opts.hl_err or "DiagnosticError"},
["warnings"] = { opts.icon_warn or "!", opts.hl_warn or "DiagnosticWarn"},
["infos"] = { opts.icon_info or "i", opts.hl_info or "DiagnosticInfo"},
["hints"] = { opts.icon_hint or "h", opts.hl_hint or "DiagnosticHint"},
}
for _, k in ipairs({ "errors", "warnings", "infos", "hints" }) do
if counts[k] > 0 then
table.insert(items,
set_hl(icons[k][2], ("%s:%s"):format(icons[k][1], counts[k])))
end
end
local fmt = opts.fmt or "%s"
if vim.tbl_isempty(items) then
return ""
else
return fmt:format(table.concat(items, " "))
end
end
end
local function get_buffer_counts(diagnostic, _, buffer)
local counts = { 0, 0, 0, 0 }
local diags = diagnostic.get(buffer.bufnr)
if diags and not vim.tbl_isempty(diags) then
for _, d in ipairs(diags) do
if tonumber(d.severity) then
counts[d.severity] = counts[d.severity] + 1
end
end
end
return {
errors = counts[1],
warnings = counts[2],
infos = counts[3],
hints = counts[4],
}
end
function M.diagnostics(opts)
opts = opts or {}
local formatter = opts.formatter or diag_formatter(opts)
return el_sub.buf_autocmd("el_buf_diagnostic", "LspAttach,DiagnosticChanged",
wrap_fnc(opts, function(window, buffer)
return formatter(window, buffer, get_buffer_counts(vim.diagnostic, window, buffer))
end))
end
function M.line(opts)
opts = opts or {}
local fmt = opts.fmt or "%s"
return wrap_fnc(opts, function(_, _)
local al = vim.api.nvim_buf_line_count(0)
local cl = vim.api.nvim_win_get_cursor(0)[1]
return (fmt):format(cl.."/"..al.." "..math.floor((cl / al) * 100).."%%")
end)
end
function M.fn_tail(opts)
opts = opts or {}
local fmt = opts.fmt or "%s"
local hl_exec = opts.hl_exec or "Character"
local fn = vim.fn.expand("%:t")
if vim.fn.getftype(fn) == "file" then
if string.match(vim.fn.getfperm(fn), 'x', 3) then
return (fmt):format(set_hl(hl_exec, fn))
end
end
return (fmt):format(fn)
end
return M

80
lua/core/theme.lua
View File

@ -1,80 +0,0 @@
local pickers = require("telescope.pickers")
local finders = require("telescope.finders")
local previewers = require("telescope.previewers")
local conf = require("telescope.config").values
local actions = require("telescope.actions")
local action_set = require("telescope.actions.set")
local action_state = require("telescope.actions.state")
local misc = require('core.misc')
local M = {}
function M.switcher()
local bufnr = vim.api.nvim_get_current_buf()
-- show current buffer content in previewer
local colors = vim.fn.getcompletion('', 'color')
for k, v in pairs(colors) do
if v.find(v, '.ext') then
table.remove(colors, k)
break
end
end
-- our picker function: colors
pickers.new({
prompt_title = "Set Nvim Colorscheme",
finder = finders.new_table { results = colors },
sorter = conf.generic_sorter(),
previewer = previewers.new_buffer_previewer {
define_preview = function(self, entry)
-- add content
local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
vim.api.nvim_buf_set_lines(self.state.bufnr, 0, -1, false, lines)
-- add syntax highlighting in previewer
local ft = (vim.filetype.match { buf = bufnr } or "diff"):match "%w+"
require("telescope.previewers.utils").highlighter(self.state.bufnr, ft)
end
},
attach_mappings = function(prompt_bufnr, map)
-- reload theme while typing
vim.schedule(function()
vim.api.nvim_create_autocmd("TextChangedI", {
buffer = prompt_bufnr,
callback = function()
if action_state.get_selected_entry() then
misc.colorscheme(action_state.get_selected_entry()[1])
end
end,
})
end)
-- reload theme on cycling
actions.move_selection_previous:replace(function()
action_set.shift_selection(prompt_bufnr, -1)
misc.colorscheme(action_state.get_selected_entry()[1])
end)
actions.move_selection_next:replace(function()
action_set.shift_selection(prompt_bufnr, 1)
misc.colorscheme(action_state.get_selected_entry()[1])
end)
-- reload theme on selection
actions.select_default:replace(function()
if action_state.get_selected_entry() then
actions.close(prompt_bufnr)
misc.colorscheme(action_state.get_selected_entry()[1])
-- make the colorscheme swap persistant
misc.replaceword("misc.colorscheme%(.+%)",
"misc.colorscheme('"..action_state.get_selected_entry()[1].."')")
end
end)
return true
end,
}):find()
end
return M

79
lua/snippet/c.lua
View File

@ -1,79 +0,0 @@
ls.add_snippets('c', {
s('trip', {
-- cond ? then : else statment
i(1, 'cond'), t(' ? '), i(2, 'then'), t(' : '), i(3, 'else')
}),
s('stdlibs', {
-- the normal stuff
t('#include <stdio.h>'),
t({'', '#include <stdlib.h>'})
}),
s('die', {
-- message provieder when program is exiting
t({
'void die(const char *fmt, ...) {', '',
'va_list ap;',
'',
'va_start(ap, fmt);',
'vfprintf(stderr, fmt, ap);',
'va_end(ap);',
'',
[[if (fmt[0] && fmt[strlen(fmt)-1] == ':') {]],
[[ fputc(' ', stderr);]],
' perror(NULL);',
'} else',
[[ fputc('\n', stderr);]],
' exit(1);',
'}',
})
}),
s({
name = 'get them opts!',
trig = 'getopt',
dscr = 'standard argument parser',
},
fmta(
[[
int c;
while ((c = getopt(argc, argv, "<OPTS>")) != -1) {
switch (c) {
case '<OPT1>': <OPT1RUN> break;
default: <DEFRUN> break;
}
}
]],
{
OPTS = i(1, 'h'),
OPT1 = i(2, 'h'),
OPT1RUN = i(3, 'printf("help text\\n");'),
DEFRUN = i(4, 'printf("run %s -h for help\\n", argv[0]); return 1;'),
}
)
),
s({
name = 'Variadic function parser',
trig = 'infinite vars',
dscr = 'Parse an infinite number of arguments passed to a function',
},
{
t({
"/*",
" * NOTE: the function must have a int before the ... argument",
" * and you need to include <stdarg.h> for this to work",
" */",
"va_list ptr;",
"va_start(ptr, ", i(1, "n"),
");",
"for (int i = 0; i < ", ri(1),
"; i++) {",
i(2),
"}",
"va_end(ptr);",
}),
}
)
})

14
lua/snippet/lua.lua
View File

@ -1,14 +0,0 @@
ls.add_snippets('lua', {
s({
name = "local require",
trig = "req",
dscr = "simple lua require"
},
fmt("local {} = require('{}')",
{
i(1, "default"),
ri(1),
}
)
)
})

41
lua/snippet/makefile.lua
View File

@ -1,41 +0,0 @@
ls.add_snippets('make', {
s({
name = "Start Makefile",
trig = "make",
dscr = "simple starter make file"
},
fmta(
[[
# flags and incs
CFLAGS = <FLAGS>
INCS = <MAIN>.c
PREFIX = <PREFIX>
# compiler and linker
CC = cc
all: <MAINA>
<MAINA>: <MAINA>.o
$(CC) <MAINA>.o $(CFLAGS) -o $@
<MAINA>.o: $(INCS)
clean:
rm -f <MAINA> *.o
install: <MAINA>
mkdir -p $(PREFIX)/bin
cp -f <MAINA> $(PREFIX)/bin
chmod 755 $(PREFIX)/bin/<MAINA>
uninstall: <MAINA>
rm -f $(PREFIX)/bin/<MAINA>
]],
{
FLAGS = i(1, "-Wall"),
MAIN = i(2, "main"),
PREFIX = i(3, "/usr/local"),
MAINA = ri(2),
}
)
),
})

31
lua/snippet/shorthands.lua
View File

@ -1,31 +0,0 @@
ls = require("luasnip")
s = ls.snippet
sn = ls.snippet_node
isn = ls.indent_snippet_node
t = ls.text_node
i = ls.insert_node
f = ls.function_node
c = ls.choice_node
d = ls.dynamic_node
r = ls.restore_node
events = require("luasnip.util.events")
ai = require("luasnip.nodes.absolute_indexer")
extras = require("luasnip.extras")
l = extras.lambda
rep = extras.rep
p = extras.partial
m = extras.match
n = extras.nonempty
dl = extras.dynamic_lambda
fmt = require("luasnip.extras.fmt").fmt
fmta = require("luasnip.extras.fmt").fmta
conds = require("luasnip.extras.expand_conditions")
postfix = require("luasnip.extras.postfix").postfix
types = require("luasnip.util.types")
parse = require("luasnip.util.parser").parse_snippet
-- Repeat Insernode text
-- @param insert_node_id The id of the insert node to repeat (the first line from)
ri = function (insert_node_id)
return f(function (args) return args[1][1] end, insert_node_id)
end

48
lua/snippets/c.lua Normal file
View File

@ -0,0 +1,48 @@
require('core.snippets.shorthands')
return {
-- method snippet
s("main", {
c(1, {
t(""),
t("static "),
}),
t("int "),
t("main"),
t("("),
c(2, {
t("int argc, char *argv[]"),
i(1, "void"),
}),
t(")"),
t({ " {", "\t" }),
i(0),
t({ "", "}" }),
}),
-- function snippet
s("fn", {
c(1, {
t("void"),
t("char"),
t("int"),
t("short"),
t("long"),
t("double"),
t("float"),
i(nil, "myType"),
}),
t({ "", "" }),
c(2, {
t(""),
t("*")
}),
i(3, "myFunc");
t("("),
i(4),
t(")"),
t({ "", "{", "\t" }),
i(0),
t({ "", "}" }),
})
}

110
lua/snippets/java.lua Normal file
View File

@ -0,0 +1,110 @@
require('core.snippets.shorthands')
local function file_name(args, parent, user_args)
return vim.fn.expand("%:t:r")
end
return {
-- method snippet
s("fn", {
c(1, {
t("public "),
t("private "),
}),
c(2, {
t("void"),
t("String"),
t("char"),
t("int"),
t("double"),
t("boolean"),
i(nil, "myType"),
}),
t(" "),
i(3, "myFunc"),
t("("),
i(4),
t(")"),
c(5, {
t(""),
sn(nil, {t({ "", " throws " }), i(1)}),
}),
t({ " {", "\t" }),
i(0),
t({ "", "}" }),
}),
-- constructor snippet
s("constr", {
c(1, {
t("public "),
t("private "),
t("protected ")
}),
f(file_name, {}),
t("("),
i(2),
t(")"),
c(3, {
t(""),
sn(nil, {t({ "", " throws " }), i(1)}),
}),
t({ " {", "\t" }),
i(0),
t({ "", "}" }),
}),
-- class snippet
s("class", {
c(1, {
t("public "),
t("private "),
t("protected ")
}),
c(2, {
t("class "),
t("interface ")
}),
f(file_name, {}),
c(3, {
t(" "),
sn(nil, { t({" implements "}), i(1), t(" ") }),
sn(nil, { t({" extends "}), i(1), t(" ") }),
}),
t({ "{", "\t" }),
i(0),
t({ "", "}" }),
}),
-- pacakge snippet
s("package", {
t("package "),
f(function(args, parent, user_args)
-- get path
local dir = vim.fn.expand("%:h")
-- remove prefix
dir = dir:gsub("src/main/java/", "")
-- convert to package path
dir = dir:gsub("/", ".")
return dir
end, {}),
t(";"),
t({ "", "", "" })
}),
-- try, catch, finally snippet
s("try", {
t({"try {", "\t"}),
i(1),
t({"", "} catch ("}),
i(2, "Error e"),
t({") {", "\t"}),
i(3),
t({"", "}"}),
c(4, {
t(""),
sn(nil, { t({" finally {", "\t"}), i(1), t({"", "}"}) })
})
})
}

Some files were not shown because too many files have changed in this diff Show More