zach/nvimdots
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10 aug 2026

Browse Source
This commit is contained in:
Inorishio
2026-08-10 13:18:23 +02:00
parent 91773e0a00
commit a775122059
36 changed files with 433 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoload/neoformat/formatters/ps1.vim
+12
View File
@@ -0,0 +1,12 @@
function! neoformat#formatters#ps1#enabled() abort
return ['pwshfmt']
endfunction
function! neoformat#formatters#ps1#pwshfmt() abort
return {
\ 'exe': 'pwsh',
\ 'args': ['-NoProfile', '-Command',
\ '"Import-Module (Resolve-Path \"/opt/powershell-editor-services/PSScriptAnalyzer/*/PSScriptAnalyzer.psd1\" | Select-Object -ExpandProperty Path); Invoke-Formatter -ScriptDefinition (\$input | Out-String)"'],
\ 'stdin': 1
\ }
endfunction
autoload/neoformat/formatters/pwsh.vim
-25
View File
@@ -1,25 +0,0 @@
function! neoformat#formatters#pwsh#enabled() abort
return ['pwshfmt']
endfunction
function! neoformat#formatters#pwsh#pwshfmt() abort
if has('win32') || has('win64')
let l:args = [
\ '-NoProfile',
\ '-Command',
\ 'Invoke-Formatter',
\ ]
else
let l:args = [
\ '-NoProfile',
\ '-Command',
\ '"Import-Module (Resolve-Path \"/opt/powershell-editor-services/PSScriptAnalyzer/*/PSScriptAnalyzer.psd1\" | Select-Object -ExpandProperty Path); Invoke-Formatter -ScriptDefinition (\$input | Out-String)"'
\ ]
endif
return {
\ 'exe': 'pwsh',
\ 'args': l:args,
\ 'stdin': 1,
\ }
endfunction
colors/zshell.lua
+55 -55
View File
@@ -27,43 +27,43 @@ local function pick(light, dark)
end end
local c = { local c = {
bg = "#171216", bg = "#141219",
bg_alt = "#201A1F", bg_alt = "#1C1B21",
bg_float = "#241E23", bg_float = "#201F25",
bg_popup = "#2E282D", bg_popup = "#2B2930",
bg_cursorline = pick("#2E282D", "#3A3338"), bg_cursorline = pick("#2B2930", "#36343B"),
bg_fold = "#201A1F", bg_fold = "#1C1B21",
bg_visual = "#5D3F5C", bg_visual = "#4A4169",
bg_search = pick("#8CAB44", "#5D3F5C"), bg_search = pick("#882F73", "#4A4169"),
bg_incsearch = "#D285D3", bg_incsearch = "#5840A7",
bg_selection = "#D285D3", bg_selection = "#5840A7",
bg_statusline = pick("#2E282D", "#241E23"), bg_statusline = pick("#2B2930", "#201F25"),
bg_statusline_nc = "#201A1F", bg_statusline_nc = "#1C1B21",
bg_tabline = "#201A1F", bg_tabline = "#1C1B21",
bg_tabsel = "#2E282D", bg_tabsel = "#2B2930",
fg = "#EBDFE6", fg = "#E6E0EA",
fg_muted = "#D2C2CE", fg_muted = "#CAC4D4",
fg_subtle = "#9B8C98", fg_subtle = "#938E9D",
fg_comment = pick("#9B8C98", "#4F434D"), fg_comment = pick("#938E9D", "#484552"),
fg_strong = pick("#1A1B1F", "#F2F2F7"), fg_strong = pick("#1A1B1F", "#F2F2F7"),
fg_on_soft = pick("#17181C", "#F4F4F8"), fg_on_soft = pick("#17181C", "#F4F4F8"),
border = "#4F434D", border = "#484552",
accent = "#FCABFC", accent = "#CCBDFF",
accent_container = "#D285D3", accent_container = "#5840A7",
accent_fg = "#5B1961", accent_fg = "#CCBDFF",
accent_solid_fg = "#53115A", accent_solid_fg = "#351783",
secondary = "#E2BADE", secondary = "#CBC0F0",
secondary_container = "#5D3F5C", secondary_container = "#4A4169",
secondary_fg = "#D3ADCF", secondary_fg = "#BAAFDD",
secondary_solid_fg = "#422742", secondary_solid_fg = "#332B51",
tertiary = "#B2D266", tertiary = "#FFADE3",
tertiary_container = "#8CAB44", tertiary_container = "#882F73",
tertiary_fg = "#2C3C00", tertiary_fg = "#FFACE3",
tertiary_solid_fg = "#263500", tertiary_solid_fg = "#5E044E",
error = "#FFB4AB", error = "#FFB4AB",
error_container = "#93000A", error_container = "#93000A",
@@ -71,38 +71,38 @@ local c = {
error_solid_fg = "#690005", error_solid_fg = "#690005",
ok = "#FFBAC2", ok = "#FFBAC2",
warn = "#FFDDEA", warn = "#FFDCF2",
info = "#B3A2D5", info = "#9FA8D8",
hint = "#FFBA93", hint = "#9DCEFF",
add = "#FFBAC2", add = "#FFBAC2",
change = "#B3A2D5", change = "#9FA8D8",
delete = "#F248D2", delete = "#BF68FF",
cursor_fg = "#53115A", cursor_fg = "#351783",
cursor_bg = "#FCABFC", cursor_bg = "#CCBDFF",
match_bg = "#8CAB44", match_bg = "#882F73",
match_fg = "#2C3C00", match_fg = "#FFACE3",
todo_bg = "#8CAB44", todo_bg = "#882F73",
todo_fg = "#2C3C00", todo_fg = "#FFACE3",
-- Syntax accents must stay dynamic. These come from your generated palette -- Syntax accents must stay dynamic. These come from your generated palette
-- instead of fixed hex values, so foregrounds change with the wallpaper too. -- instead of fixed hex values, so foregrounds change with the wallpaper too.
code_keyword = "#D994CF", code_keyword = "#BE9CE6",
code_func = "#FFBA93", code_func = "#9DCEFF",
code_string = "#FFBAC2", code_string = "#FFBAC2",
code_number = "#FFDDEA", code_number = "#FFDCF2",
code_const = "#F248D2", code_const = "#BF68FF",
code_type = "#FCABFC", code_type = "#CCBDFF",
code_special = "#B2D266", code_special = "#FFADE3",
code_preproc = "#E2BADE", code_preproc = "#CBC0F0",
code_builtin = "#FCABFC", code_builtin = "#CCBDFF",
code_param = "#FFDDEA", code_param = "#FFDCF2",
code_field = "#E2BADE", code_field = "#CBC0F0",
code_namespace = "#B2D266", code_namespace = "#FFADE3",
code_operator = pick("#FCABFC", "#E2BADE"), code_operator = pick("#CCBDFF", "#CBC0F0"),
line_current = pick("#232428", "#E7E7EC"), line_current = pick("#232428", "#E7E7EC"),
ref_bg = pick("#3A3338", "#2E282D"), ref_bg = pick("#36343B", "#2B2930"),
} }
-- Core UI ------------------------------------------------------------------- -- Core UI -------------------------------------------------------------------
lua/config/format/lspconfig.lua
+236 -250
View File
@@ -3,296 +3,282 @@ local cmp_lsp = require "cmp_nvim_lsp"
local cmp_kinds = require("assets.icons").icons.kinds local cmp_kinds = require("assets.icons").icons.kinds
local function flatten_to_array(t) local function flatten_to_array(t)
local res = {} local res = {}
local function _flatten(tbl) local function _flatten(tbl)
for _, v in ipairs(tbl) do for _, v in ipairs(tbl) do
if type(v) == "table" then if type(v) == "table" then
_flatten(v) _flatten(v)
else else
table.insert(res, v) table.insert(res, v)
end end
end end
end end
_flatten(t) _flatten(t)
return res return res
end end
local capabilities = vim.tbl_deep_extend( local capabilities =
"force", vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities())
{},
vim.lsp.protocol.make_client_capabilities(),
cmp_lsp.default_capabilities()
)
require("fidget").setup {} require("fidget").setup {}
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup { require("mason-lspconfig").setup {
automatic_enable = true, automatic_enable = true,
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"qmlls", "qmlls",
"rust_analyzer", "rust_analyzer",
"gopls", "gopls",
}, },
handlers = { handlers = {
function(server_name) -- default handler (optional) function(server_name) -- default handler (optional)
require("lspconfig")[server_name].setup { require("lspconfig")[server_name].setup {
capabilities = capabilities, capabilities = capabilities,
} }
end, end,
["tailwindcss"] = function() ["tailwindcss"] = function()
local lspconfig = require "lspconfig" local lspconfig = require "lspconfig"
lspconfig.tailwindcss.setup { lspconfig.tailwindcss.setup {
capabilities = capabilities, capabilities = capabilities,
} }
end, end,
["css-lsp"] = function() ["css-lsp"] = function()
local lspconfig = require "lspconfig" local lspconfig = require "lspconfig"
lspconfig.cssls.setup { lspconfig.cssls.setup {
capabilities = capabilities, capabilities = capabilities,
} }
end, end,
zls = function() zls = function()
local lspconfig = require "lspconfig" local lspconfig = require "lspconfig"
lspconfig.zls.setup { lspconfig.zls.setup {
capabilities = capabilities, capabilities = capabilities,
root_dir = lspconfig.util.root_pattern( root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
".git", settings = {
"build.zig", zls = {
"zls.json" enable_inlay_hints = true,
), enable_snippets = true,
settings = { warn_style = true,
zls = { },
enable_inlay_hints = true, },
enable_snippets = true, }
warn_style = true, vim.g.zig_fmt_parse_errors = 0
}, vim.g.zig_fmt_autosave = 0
}, end,
} ["lua_ls"] = function()
vim.g.zig_fmt_parse_errors = 0 local lspconfig = require "lspconfig"
vim.g.zig_fmt_autosave = 0 lspconfig.lua_ls.setup {
end, capabilities = capabilities,
["lua_ls"] = function() settings = {
local lspconfig = require "lspconfig" Lua = {
lspconfig.lua_ls.setup { runtime = { version = "Lua 5.1" },
capabilities = capabilities, diagnostics = {
settings = { globals = {
Lua = { "bit",
runtime = { version = "Lua 5.1" }, "vim",
diagnostics = { "it",
globals = { "describe",
"bit", "before_each",
"vim", "after_each",
"it", },
"describe", },
"before_each", },
"after_each", },
}, }
}, end,
}, },
},
}
end,
},
} }
cmp.setup { cmp.setup {
preselect = "None", preselect = "None",
formatting = { formatting = {
fields = { "kind", "abbr" }, fields = { "kind", "abbr" },
format = function(entry, vim_item) format = function(entry, vim_item)
vim_item.kind = cmp_kinds[vim_item.kind] or "" vim_item.kind = cmp_kinds[vim_item.kind] or ""
if entry.completion_item.detail then if entry.completion_item.detail then
vim_item.menu = entry.completion_item.detail vim_item.menu = entry.completion_item.detail
end end
return vim_item return vim_item
end, end,
}, },
completion = { completeopt = "menu,menuone" }, completion = { completeopt = "menu,menuone" },
snippet = { snippet = {
expand = function(args) expand = function(args)
require("luasnip").lsp_expand(args.body) require("luasnip").lsp_expand(args.body)
end, end,
}, },
window = { window = {
completion = cmp.config.window.bordered(), completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(), documentation = cmp.config.window.bordered(),
}, },
view = { view = {
entries = "custom", entries = "custom",
}, },
mapping = { mapping = {
["<C-p>"] = cmp.mapping.select_prev_item(), ["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-n>"] = cmp.mapping.select_next_item(), ["<C-n>"] = cmp.mapping.select_next_item(),
["<C-d>"] = cmp.mapping.scroll_docs(-4), ["<C-d>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(), ["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm { ["<CR>"] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Insert, behavior = cmp.ConfirmBehavior.Insert,
select = true, select = true,
}, },
["<Tab>"] = cmp.mapping(function(fallback) ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
elseif require("luasnip").expand_or_jumpable() then elseif require("luasnip").expand_or_jumpable() then
require("luasnip").expand_or_jump() require("luasnip").expand_or_jump()
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback) ["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
elseif require("luasnip").jumpable(-1) then elseif require("luasnip").jumpable(-1) then
require("luasnip").jump(-1) require("luasnip").jump(-1)
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
}, },
sources = cmp.config.sources { sources = cmp.config.sources {
{ name = "path" }, { name = "path" },
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, { name = "luasnip" },
{ name = "buffer" }, { name = "buffer" },
{ name = "nvim_lua" }, { name = "nvim_lua" },
{ name = "copilot" }, { name = "copilot" },
}, },
} }
vim.diagnostic.config { vim.diagnostic.config {
virtual_text = false, virtual_text = false,
virtual_lines = false, virtual_lines = false,
signs = true, signs = true,
underline = true, underline = true,
float = { float = {
focusable = false, focusable = false,
style = "minimal", style = "minimal",
border = "rounded", border = "rounded",
source = true, source = true,
header = "", header = "",
prefix = "", prefix = "",
}, },
} }
local lspconfig = vim.lsp.config local lspconfig = vim.lsp.config
lspconfig("texlab", { lspconfig("texlab", {
cmd = { "texlab" }, cmd = { "texlab" },
filetypes = { "tex", "bib", "plaintex" }, filetypes = { "tex", "bib", "plaintex" },
root_markers = { root_markers = {
".git", ".git",
".latexmkrc", ".latexmkrc",
"latexmkrc", "latexmkrc",
".texlabroot", ".texlabroot",
"texlabroot", "texlabroot",
"Tectonic.toml", "Tectonic.toml",
}, },
settings = { settings = {
texlab = { texlab = {
rootDirectory = nil, rootDirectory = nil,
build = { build = {
executable = "latexmk", executable = "latexmk",
args = { args = {
"-pdf", "-pdf",
"-interaction=nonstopmode", "-interaction=nonstopmode",
"-synctex=1", "-synctex=1",
"%f", "%f",
}, },
onSave = true, onSave = true,
forwardSearchAfter = true, forwardSearchAfter = true,
}, },
forwardSearch = { forwardSearch = {
executable = "zathura", executable = "zathura",
args = { args = {
"--synctex-editor-command", "--synctex-editor-command",
[[ nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] [[ nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
.. vim.v.servername, "--synctex-forward",
"--synctex-forward", "%l:1:%f",
"%l:1:%f", "%p",
"%p", },
}, },
}, chktex = {
chktex = { onEdit = false,
onEdit = false, onOpenAndSave = true,
onOpenAndSave = true, },
}, diagnosticsDelay = 300,
diagnosticsDelay = 300, latexFormatter = "latexindent",
latexFormatter = "latexindent", latexindent = {
latexindent = { ["local"] = nil,
["local"] = nil, modifyLineBreaks = false,
modifyLineBreaks = false, },
}, bibtexFormatter = "texlab",
bibtexFormatter = "texlab", formatterLineLength = 80,
formatterLineLength = 80, },
}, },
},
}) })
lspconfig("qmlls", { lspconfig("qmlls", {
cmd = { "qmlls6", "qmlls" }, cmd = { "qmlls6", "qmlls" },
filetypes = { "qml", "qmljs" }, filetypes = { "qml", "qmljs" },
root_markers = { ".git" }, root_markers = { ".git" },
}) })
lspconfig("jsonls", { lspconfig("jsonls", {
settings = { settings = {
json = { json = {
schemas = require("schemastore").json.schemas(), schemas = require("schemastore").json.schemas(),
validate = { enable = true }, validate = { enable = true },
}, },
}, },
}) })
lspconfig("yamlls", { lspconfig("yamlls", {
settings = { settings = {
yaml = { yaml = {
schemaStore = { schemaStore = {
enable = false, enable = false,
url = "", url = "",
}, },
schemas = require("schemastore").yaml.schemas(), schemas = require("schemastore").yaml.schemas(),
}, },
}, },
}) })
local lspenable = vim.lsp.enable local lspenable = vim.lsp.enable
local servers = { local servers = {
"html", "html",
"bashls", "bashls",
"pyright", "pyright",
"ts_ls", "ts_ls",
"texlab", "texlab",
"sourcekit", "sourcekit",
"qmlls", "qmlls",
"tailwindcss", "tailwindcss",
"systemd-lsp", "systemd-lsp",
require("mason-lspconfig").get_installed_servers(), require("mason-lspconfig").get_installed_servers(),
} }
local flat_servers = flatten_to_array(servers) local flat_servers = flatten_to_array(servers)
for _, server in ipairs(flat_servers) do for _, server in ipairs(flat_servers) do
lspconfig(server, { lspconfig(server, {
on_attach = function(client, bufnr) on_attach = function(client, bufnr)
if client.name == "typos_lsp" or client.name == "copilot" then if client.name == "typos_lsp" or client.name == "copilot" then
return return
end end
end,
require("workspace-diagnostics").populate_workspace_diagnostics( capabilities = capabilities,
client, })
bufnr lspenable(server)
)
end,
capabilities = capabilities,
})
lspenable(server)
end end
lua/config/format/neoformat.lua
+1 -1
View File
@@ -13,7 +13,7 @@ M.plugin = {
vim.g.neoformat_enabled_bash = { "shfmt" } vim.g.neoformat_enabled_bash = { "shfmt" }
vim.g.neoformat_enabled_zsh = { "shfmt" } vim.g.neoformat_enabled_zsh = { "shfmt" }
vim.g.neoformat_enabled_rust = { "rustfmt" } vim.g.neoformat_enabled_rust = { "rustfmt" }
vim.g.neoformat_enabled_pwsh = { "pwshfmt" } vim.g.neoformat_enabled_ps1 = { "pwshfmt" }
end, end,
} }
lua/config/theme/colorizer.lua → lua/config/gui/colorizer.lua
View File
lua/config/theme/lualine.lua → lua/config/gui/lualine.lua
View File
lua/config/ministatusline.lua → lua/config/gui/ministatusline.lua
View File
lua/config/modicator.lua → lua/config/gui/modicator.lua
View File
lua/config/theme/gruvbox-baby.lua → lua/config/gui/themes/gruvbox-baby.lua
View File
lua/config/theme/gruvbox.lua → lua/config/gui/themes/gruvbox.lua
View File
lua/config/theme/onedarkpro-light.lua → lua/config/gui/themes/onedarkpro-light.lua
View File
lua/config/autosession.lua → lua/config/modules/autosession.lua
View File
lua/config/telescope.lua → lua/config/modules/telescope.lua
View File
lua/config/treesitter.lua → lua/config/modules/treesitter.lua
View File
lua/config/modules/undotree.lua
+30
View File
@@ -0,0 +1,30 @@
require("undotree").setup {
float_diff = true,
layout = "left_bottom",
position = "left",
ignore_filetype = { "undotree", "undotreeDiff", "qf", "TelescopePrompt", "spectre_panel", "tsplayground" },
window = {
winblend = 30,
},
keymaps = {
["move_next"] = "j",
["move_prev"] = "k",
["move2parent"] = "gj",
["move_change_next"] = "J",
["move_change_prev"] = "K",
["action_enter"] = "<cr>",
["enter_diffbuf"] = "p",
["quit"] = "q",
},
-- Deprecated
-- keymaps = {
-- ['j'] = "move_next",
-- ['k'] = "move_prev",
-- ['gj'] = "move2parent",
-- ['J'] = "move_change_next",
-- ['K'] = "move_change_prev",
-- ['<cr>'] = "action_enter",
-- ['p'] = "enter_diffbuf",
-- ['q'] = "quit",
-- },
}
lua/config/neovide.lua
+11
View File
@@ -0,0 +1,11 @@
vim.g.neovide_cursor_trail_size = 0
vim.g.neovide_floating_corner_radius = 0.4
vim.o.guifont = "0xProto Nerd Font Mono:h12"
vim.g.neovide_refresh_rate = 144
vim.g.neovide_refresh_rate_idle = 144
vim.g.neovide_no_idle = true
vim.g.neovide_floating_blur_amount_x = 0
vim.g.neovide_floating_blur_amount_y = 0
vim.g.neovide_cursor_animation_length = 0.08
vim.g.neovide_cursor_short_animation_length = 0.04
vim.g.neovide_scroll_animation_length = 0.15
lua/config/actions-preview.lua → lua/config/other/actions-preview.lua
View File
lua/config/autopairs.lua → lua/config/other/autopairs.lua
View File
lua/config/barbar.lua → lua/config/other/barbar.lua
View File
lua/config/dapconf.lua → lua/config/other/dapconf.lua
View File
lua/config/gitsigns.lua → lua/config/other/gitsigns.lua
View File
lua/config/harpoon.lua → lua/config/other/harpoon.lua
View File
lua/config/notify.lua → lua/config/other/notify.lua
+7 -4
View File
@@ -1,20 +1,23 @@
vim.notify = require('notify') vim.notify = require('notify')
local icons = require("assets.icons").icons
local dap = require('dap') local dap = require('dap')
require('notify').setup({ require('notify').setup({
-- background_colour = "#000000",
render = "wrapped-default", render = "wrapped-default",
animation = "slide",
timeout = 6000, timeout = 6000,
max_width = 50, max_width = 50,
minimum_width = 50, minimum_width = 50,
level = "info", level = "info",
fps = 60, fps = 60,
icons = { icons = {
ERROR = "", ERROR = icons.diagnostics.Error,
WARN = "", WARN = icons.diagnostics.Warn,
INFO = "", INFO = icons.diagnostics.Info,
DEBUG = "", DEBUG = "",
TRACE = "✎", TRACE = "✎",
}, },
on_open = function(win) on_open = function(win)
-- vim.api.nvim_win_set_option(win, 'wrap', true) -- vim.api.nvim_win_set_option(win, 'wrap', true)
vim.api.nvim_win_set_option(win, 'breakat', ' ') vim.api.nvim_win_set_option(win, 'breakat', ' ')
lua/config/nui.lua → lua/config/other/nui.lua
View File
lua/config/region-folding.lua → lua/config/other/region-folding.lua
View File
lua/config/testfold.lua
-15
View File
@@ -1,15 +0,0 @@
local i = {}
function M.foldexpr()
local lnum = vim.v.lnum
local line = vim.fn.getline( lnum )
if line:find( "<think>", 1, true ) then
return "a1"
elseif line:find( "</think>", 1, true ) then
return "s1"
else
return "="
end
end
return M
lua/config/undotree.lua
-19
View File
@@ -1,19 +0,0 @@
require('undotree').setup({
float_diff = true,
layout = "left_bottom",
position = "left",
ignore_filetype = { 'undotree', 'undotreeDiff', 'qf', 'TelescopePrompt', 'spectre_panel', 'tsplayground' },
window = {
winblend = 30,
},
keymaps = {
['j'] = "move_next",
['k'] = "move_prev",
['gj'] = "move2parent",
['J'] = "move_change_next",
['K'] = "move_change_prev",
['<cr>'] = "action_enter",
['p'] = "enter_diffbuf",
['q'] = "quit",
},
})
lua/lualine/themes/zshell.lua
+10 -10
View File
@@ -6,19 +6,19 @@ local function pick(light, dark)
end end
local c = { local c = {
bg = "#171216", bg = "#141219",
bg_alt = "#201A1F", bg_alt = "#1C1B21",
bg_mid = pick("#2E282D", "#241E23"), bg_mid = pick("#2B2930", "#201F25"),
fg = "#EBDFE6", fg = "#E6E0EA",
fg_muted = "#D2C2CE", fg_muted = "#CAC4D4",
fg_strong = pick("#15161A", "#F4F4F8"), fg_strong = pick("#15161A", "#F4F4F8"),
normal = "#D285D3", normal = "#5840A7",
insert = "#5D3F5C", insert = "#4A4169",
visual = "#8CAB44", visual = "#882F73",
replace = "#93000A", replace = "#93000A",
command = pick("#FFDDEA", "#B3A2D5"), command = pick("#FFDCF2", "#9FA8D8"),
inactive = "#201A1F", inactive = "#1C1B21",
normal_fg = pick("#15161A", "#F4F4F8"), normal_fg = pick("#15161A", "#F4F4F8"),
insert_fg = pick("#15161A", "#F4F4F8"), insert_fg = pick("#15161A", "#F4F4F8"),
lua/mappings.lua
+18 -12
View File
@@ -3,7 +3,7 @@ local map = vim.keymap.set
-- Base nvim mappings, you need this. -- Base nvim mappings, you need this.
map("n", "<Tab>", "<Cmd>BufferLineCycleNext<CR>") map("n", "<Tab>", "<Cmd>BufferLineCycleNext<CR>")
map("n", "<S-Tab>", "<Cmd>BufferLineCyclePrev<CR>") map("n", "<S-Tab>", "<Cmd>BufferLineCyclePrev<CR>")
map({"n", "v"}, "<leader>ap", require("actions-preview").code_actions) map({ "n", "v" }, "<leader>ap", require("actions-preview").code_actions)
map("n", ";", ":", { desc = "CMD enter command mode" }) map("n", ";", ":", { desc = "CMD enter command mode" })
map("v", "<C-Up>", ":m '<-2<CR>gv=gv", { desc = "Move selected text up" }) map("v", "<C-Up>", ":m '<-2<CR>gv=gv", { desc = "Move selected text up" })
map("v", "<C-Down>", ":m '>+1<CR>gv=gv", { desc = "Move selected text down" }) map("v", "<C-Down>", ":m '>+1<CR>gv=gv", { desc = "Move selected text down" })
@@ -12,10 +12,12 @@ map("n", "<C-j>", "<C-d>zz")
map("n", "<C-k>", "<C-u>zz") map("n", "<C-k>", "<C-u>zz")
map("n", "<A-->", ":bdelete<CR>") map("n", "<A-->", ":bdelete<CR>")
-- map("n", "<SA-->", ":BufferRestore<CR>") -- map("n", "<SA-->", ":BufferRestore<CR>")
map('n', '<leader>e', function() Snacks.explorer() end) map("n", "<leader>e", function()
map('n', '<leader>u', require('undotree').toggle, { noremap = true, silent = true }) Snacks.explorer()
map("n", "<leader>g", require("telescope.builtin").live_grep, {desc = "Telescope grep" }) end)
map("n", "<leader>f", require("telescope.builtin").find_files, {desc = "Telescope find files" }) map("n", "<leader>g", require("telescope.builtin").live_grep, { desc = "Telescope grep" })
map("n", "<leader>f", require("telescope.builtin").find_files, { desc = "Telescope find files" })
-- map("n", "<leader>u", require("config.modules.undotree").toggle, { noremap = true, silent = true })
-- Copilot Chat buffer -- Copilot Chat buffer
map("n", "<A-c>", vim.cmd.CopilotChatToggle) map("n", "<A-c>", vim.cmd.CopilotChatToggle)
@@ -27,17 +29,21 @@ map("n", "<leader>zig", "<cmd>LspRestart<cr>")
-- Why? -- Why?
map("x", "<leader>p", [["_dP]]) map("x", "<leader>p", [["_dP]])
map({"n", "v"}, "<leader>y", [["+y]]) map({ "n", "v" }, "<leader>y", [["+y]])
map({"n", "v"}, "<leader>d", "\"_d") map({ "n", "v" }, "<leader>d", '"_d')
map("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>"); map("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>")
map("n", "<leader><leader>", function() map("n", "<leader><leader>", function()
vim.cmd("so") vim.cmd "so"
end) end)
-- Greatest remap -- Greatest remap
map("n", "<leader>Y", [["+Y]]) map("n", "<leader>Y", [["+Y]])
map("n", "<A-q>", function() Snacks.terminal.toggle() end, { desc = "Toggle Terminal" }) map("n", "<A-q>", function()
map("n", "<leader>gb", function() Snacks.gitbrowse.open() end ) Snacks.terminal.toggle()
end, { desc = "Toggle Terminal" })
map("n", "<leader>gb", function()
Snacks.gitbrowse.open()
end)
map("n", "K", require("pretty_hover").hover) map("n", "K", require("pretty_hover").hover)
-- Might delete later -- Might delete later
@@ -46,7 +52,7 @@ map("n", "<A-v>", "<cmd>ChatGPT<CR>")
-- Notif history -- Notif history
map("n", "<leader>n", function() map("n", "<leader>n", function()
Snacks.notifier.show_history() Snacks.notifier.show_history()
end) end)
-- Actions Previewer -- Actions Previewer
lua/options.lua
+1 -1
View File
@@ -29,11 +29,11 @@ vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,
vim.o.clipboard = "unnamedplus" vim.o.clipboard = "unnamedplus"
vim.o.cursorline = true vim.o.cursorline = true
vim.o.cursorlineopt = "number" vim.o.cursorlineopt = "number"
vim.o.number = true
vim.opt.fillchars = { eob = " " } vim.opt.fillchars = { eob = " " }
vim.o.ignorecase = true vim.o.ignorecase = true
vim.o.smartcase = true vim.o.smartcase = true
vim.o.mouse = "a" vim.o.mouse = "a"
vim.o.number = true
vim.o.numberwidth = 3 vim.o.numberwidth = 3
vim.o.ruler = false vim.o.ruler = false
vim.o.showmode = false vim.o.showmode = false
lua/plugins/formatter.lua
+23 -14
View File
@@ -1,17 +1,26 @@
return { return {
{ {
"MeanderingProgrammer/render-markdown.nvim", "MeanderingProgrammer/render-markdown.nvim",
dependencies = { dependencies = {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
"nvim-mini/mini.nvim", "nvim-mini/mini.nvim",
},
---@module 'render-markdown'
---@type render.md.UserConfig
opts = require "config.format.markdown",
},
{
'mrcjkb/rustaceanvim',
version = '^9',
-- lazy = false,
}, },
---@module 'render-markdown'
---@type render.md.UserConfig
opts = require "config.format.markdown",
},
{
"mrcjkb/rustaceanvim",
version = "^9",
-- lazy = false,
},
{
"sbdchd/neoformat",
config = function()
require "config.format.neoformat"
end,
-- init = function()
-- vim.cmd("source" .. vim.fn.stdpath "config" .. "/lua/config/test.vim")
-- end,
},
} }
lua/plugins/git.lua
+6 -6
View File
@@ -1,8 +1,8 @@
return { return {
{ {
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
config = function() config = function()
require("config.gitsigns") require "config.other.gitsigns"
end end,
} },
} }
lua/plugins/init.lua
+19 -45
View File
@@ -1,14 +1,6 @@
return { return {
{ {
require "config.snacks", require("config.snacks")
},
{
"nvim-mini/mini.nvim",
version = false,
modules = function()
require "config.mini-modules"
end,
}, },
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
@@ -16,7 +8,7 @@ return {
build = ":TSUpdate", build = ":TSUpdate",
branch = "main", branch = "main",
config = function() config = function()
require "config.treesitter" require("config.modules.treesitter")
end, end,
}, },
{ {
@@ -32,7 +24,7 @@ return {
{ {
"rmagatti/auto-session", "rmagatti/auto-session",
config = function() config = function()
require "config.autosession" require("config.modules.autosession")
end, end,
}, },
{ {
@@ -48,22 +40,19 @@ return {
"akinsho/bufferline.nvim", "akinsho/bufferline.nvim",
event = "VeryLazy", event = "VeryLazy",
config = function() config = function()
require "config.barbar" require("config.other.barbar")
end, end,
}, },
{ {
"mawkler/modicator.nvim", "mawkler/modicator.nvim",
config = function() config = function()
require "config.modicator" require("config.gui.modicator")
end, end,
}, },
{
"shinchu/lightline-gruvbox.vim",
},
{ {
"jiaoshijie/undotree", "jiaoshijie/undotree",
config = function() config = function()
require "config.undotree" require("config.modules.undotree")
end, end,
}, },
{ {
@@ -74,7 +63,7 @@ return {
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
event = "InsertEnter", event = "InsertEnter",
config = function() config = function()
require "config.autopairs" require("config.other.autopairs")
end, end,
}, },
{ {
@@ -83,7 +72,7 @@ return {
{ {
"rcarriga/nvim-notify", "rcarriga/nvim-notify",
config = function() config = function()
require "config.notify" require("config.other.notify")
end, end,
}, },
{ {
@@ -91,7 +80,7 @@ return {
cmd = "Copilot", cmd = "Copilot",
event = "InsertEnter", event = "InsertEnter",
config = function() config = function()
require "config.ai.copilot" require("config.ai.copilot")
end, end,
}, },
{ {
@@ -102,13 +91,13 @@ return {
}, },
build = "make tiktoken", build = "make tiktoken",
config = function() config = function()
require "config.ai.copilotchat" require("config.ai.copilotchat")
end, end,
}, },
{ {
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
config = function() config = function()
require "config.dapconf" require("config.other.dapconf")
end, end,
}, },
{ {
@@ -123,7 +112,7 @@ return {
"folke/lazydev.nvim", "folke/lazydev.nvim",
ft = "lua", ft = "lua",
opts = function() opts = function()
require "config.lazydev" require("config.lazydev")
end, end,
}, },
{ {
@@ -143,7 +132,7 @@ return {
"b0o/schemastore.nvim", "b0o/schemastore.nvim",
}, },
config = function() config = function()
require "config.format.lspconfig" require("config.format.lspconfig")
end, end,
}, },
{ {
@@ -174,7 +163,7 @@ return {
{ {
"f3fora/nvim-texlabconfig", "f3fora/nvim-texlabconfig",
config = function() config = function()
require "config.format.texlab" require("config.format.texlab")
end, end,
build = "go build", build = "go build",
}, },
@@ -184,12 +173,6 @@ return {
{ {
"vimpostor/vim-tpipeline", "vimpostor/vim-tpipeline",
}, },
{
"yazeed1s/minimal.nvim",
config = function()
vim.g.minimal_italic_comments = true
end,
},
{ {
"Yazeed1s/minimal.nvim", "Yazeed1s/minimal.nvim",
config = function() config = function()
@@ -200,13 +183,13 @@ return {
{ {
"aserowy/tmux.nvim", "aserowy/tmux.nvim",
config = function() config = function()
require "config.terminal.tmux" require("config.terminal.tmux")
end, end,
}, },
{ {
"rachartier/tiny-inline-diagnostic.nvim", "rachartier/tiny-inline-diagnostic.nvim",
config = function() config = function()
require "config.format.TID" require("config.format.TID")
end, end,
}, },
{ {
@@ -216,25 +199,19 @@ return {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
}, },
config = function() config = function()
require "config.harpoon" require("config.other.harpoon")
end, end,
}, },
{ {
"aznhe21/actions-preview.nvim", "aznhe21/actions-preview.nvim",
config = function() config = function()
require "config.actions-preview" require("config.other.actions-preview")
end,
},
{
"sbdchd/neoformat",
config = function()
require "config.format.neoformat"
end, end,
}, },
{ {
"Zacharias-Brohn/zterm-navigator.nvim", "Zacharias-Brohn/zterm-navigator.nvim",
config = function() config = function()
require "config.terminal.zterm-navigator" require("config.terminal.zterm-navigator")
end, end,
}, },
{ {
@@ -242,7 +219,4 @@ return {
event = "LspAttach", event = "LspAttach",
opts = {}, opts = {},
}, },
{
"artemave/workspace-diagnostics.nvim",
},
} }
lua/plugins/telescope.lua
+1 -1
View File
@@ -5,7 +5,7 @@ return {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
}, },
config = function() config = function()
require("config.telescope") require("config.modules.telescope")
end, end,
}, },
{ {
lua/plugins/themes.lua
+3 -3
View File
@@ -16,13 +16,13 @@ return {
}) })
vim.o.laststatus = 0 vim.o.laststatus = 0
end end
require("config.theme.lualine") require("config.gui.lualine")
end, end,
}, },
{ {
"catgoose/nvim-colorizer.lua", "catgoose/nvim-colorizer.lua",
config = function() config = function()
require("config.theme.colorizer") require("config.gui.colorizer")
end, end,
}, },
{ {
@@ -30,7 +30,7 @@ return {
enabled = false, enabled = false,
priority = 1000, priority = 1000,
config = function() config = function()
require("config.theme.onedarkpro-light") require("config.gui.themes.onedarkpro-light")
end, end,
}, },
} }