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