Compare commits

4 Commits
40 changed files with 737 additions and 718 deletions
@@ -0,0 +1,29 @@
function! neoformat#formatters#powershell#enabled() abort
return ['pwshfmt']
endfunction
function! neoformat#formatters#powershell#pwshfmt() abort
"if has('win32') || has('win64')
" let l:args = [
" \ '-NoProfile',
" \ '-Command',
" \ 'Import-Module PSScriptAnalyzer; Invoke-Formatter -ScriptDefinition (\$input | Out-String)',
" \ ]
"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': [
\ '-NoProfile',
\ '-Command',
\ 'Import-Module PSScriptAnalyzer; Invoke-Formatter -ScriptDefinition ($input | Out-String)'
\ ],
\ 'stdin': 1,
\ }
endfunction
+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
-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
+58 -58
View File
@@ -27,82 +27,82 @@ 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 = "#121318",
bg_alt = "#1A1B20",
bg_float = "#1E1F25",
bg_popup = "#292A2F",
bg_cursorline = pick("#292A2F", "#33343A"),
bg_fold = "#1A1B20",
bg_visual = "#3E4867",
bg_search = pick("#C177BE", "#3E4867"),
bg_incsearch = "#718EDF",
bg_selection = "#718EDF",
bg_statusline = pick("#292A2F", "#1E1F25"),
bg_statusline_nc = "#1A1B20",
bg_tabline = "#1A1B20",
bg_tabsel = "#292A2F",
fg = "#EBDFE6",
fg_muted = "#D2C2CE",
fg_subtle = "#9B8C98",
fg_comment = pick("#9B8C98", "#4F434D"),
fg = "#E3E2E9",
fg_muted = "#C4C6D3",
fg_subtle = "#8E909C",
fg_comment = pick("#8E909C", "#444651"),
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 = "#444651",
accent = "#B3C5FF",
accent_container = "#718EDF",
accent_fg = "#001748",
accent_solid_fg = "#002B75",
secondary = "#E2BADE",
secondary_container = "#5D3F5C",
secondary_fg = "#D3ADCF",
secondary_solid_fg = "#422742",
secondary = "#BBC5EA",
secondary_container = "#3E4867",
secondary_fg = "#ADB7DB",
secondary_solid_fg = "#252F4D",
tertiary = "#B2D266",
tertiary_container = "#8CAB44",
tertiary_fg = "#2C3C00",
tertiary_solid_fg = "#263500",
tertiary = "#FCACF7",
tertiary_container = "#C177BE",
tertiary_fg = "#360039",
tertiary_solid_fg = "#531356",
error = "#FFB4AB",
error_container = "#93000A",
error_fg = "#FFDAD6",
error_solid_fg = "#690005",
ok = "#FFBAC2",
warn = "#FFDDEA",
info = "#B3A2D5",
hint = "#FFBA93",
add = "#FFBAC2",
change = "#B3A2D5",
delete = "#F248D2",
ok = "#44DEF5",
warn = "#FFDCF2",
info = "#90ACD5",
hint = "#9BCEFE",
add = "#44DEF5",
change = "#90ACD5",
delete = "#947DFF",
cursor_fg = "#53115A",
cursor_bg = "#FCABFC",
match_bg = "#8CAB44",
match_fg = "#2C3C00",
todo_bg = "#8CAB44",
todo_fg = "#2C3C00",
cursor_fg = "#002B75",
cursor_bg = "#B3C5FF",
match_bg = "#C177BE",
match_fg = "#360039",
todo_bg = "#C177BE",
todo_fg = "#360039",
-- 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_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_keyword = "#A6A3EE",
code_func = "#9BCEFE",
code_string = "#44DEF5",
code_number = "#FFDCF2",
code_const = "#947DFF",
code_type = "#B3C5FF",
code_special = "#FCACF7",
code_preproc = "#BBC5EA",
code_builtin = "#B3C5FF",
code_param = "#FFDCF2",
code_field = "#BBC5EA",
code_namespace = "#FCACF7",
code_operator = pick("#B3C5FF", "#BBC5EA"),
line_current = pick("#232428", "#E7E7EC"),
ref_bg = pick("#3A3338", "#2E282D"),
ref_bg = pick("#33343A", "#292A2F"),
}
-- Core UI -------------------------------------------------------------------
-12
View File
@@ -1,12 +0,0 @@
local gen_hook = MiniSplitjoin.gen_hook
local curly = { brackets = { "%b{}" }, separator = ";" }
local curly_semi = { brackets = { "%b{}" }, separator = ";" }
local add_semicolon_curly = gen_hook.add_trailing_separator(curly)
local remove_semicolon_curly = gen_hook.del_trailing_separator(curly)
local pad_curly = gen_hook.pad_brackets(curly_semi)
vim.b.minisplitjoin_config = {
split = { hooks_post = { remove_semicolon_curly } },
join = { hooks_pre = { add_semicolon_curly }, hooks_post = { pad_curly } },
}
+26 -28
View File
@@ -1,42 +1,40 @@
local autocmd = vim.api.nvim_create_autocmd
autocmd("LspAttach", {
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client then
vim.lsp.document_color.enable(false, { bufnr = args.buf })
end
end,
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client then
vim.lsp.document_color.enable(false, { bufnr = args.buf })
end
end,
})
autocmd("VimLeave", {
command = "set guicursor=a:ver25-Cursor",
command = "set guicursor=a:ver25-Cursor",
})
autocmd("BufWritePre", {
callback = function()
local ok = pcall(function()
vim.cmd "undojoin"
end)
vim.cmd "Neoformat"
end,
pattern = "*",
callback = function(args)
require("conform").format({ bufnr = args.buf })
end,
})
-- fWindows
autocmd("VimLeavePre", {
group = vim.api.nvim_create_augroup("fuck_shada_temp", { clear = true }),
pattern = { "*" },
callback = function()
local status = 0
for _, f in ipairs(vim.fn.globpath(vim.fn.stdpath "data" .. "/shada", "*tmp*", false, true)) do
if vim.tbl_isempty(vim.fn.readfile(f)) then
status = status + vim.fn.delete(f)
end
end
if status ~= 0 then
vim.notify("Could not delete empty temporary ShaDa files.", vim.log.levels.ERROR)
vim.fn.getchar()
end
end,
desc = "Delete empty temp ShaDa files",
group = vim.api.nvim_create_augroup("fuck_shada_temp", { clear = true }),
pattern = { "*" },
callback = function()
local status = 0
for _, f in ipairs(vim.fn.globpath(vim.fn.stdpath "data" .. "/shada", "*tmp*", false, true)) do
if vim.tbl_isempty(vim.fn.readfile(f)) then
status = status + vim.fn.delete(f)
end
end
if status ~= 0 then
vim.notify("Could not delete empty temporary ShaDa files.", vim.log.levels.ERROR)
vim.fn.getchar()
end
end,
desc = "Delete empty temp ShaDa files",
})
+18
View File
@@ -0,0 +1,18 @@
require("conform").setup {
formatters_by_ft = {
lua = { "stylua" },
python = { "ruff" },
rust = { "rustfmt" },
javascript = { "prettier" },
typescript = { "prettier" },
qml = { "qmlformat" },
go = { "gofmt" },
sh = { "shfmt" },
bash = { "shfmt" },
zsh = { "shfmt" },
ps1 = {},
},
format_on_save = {
lsp_fallback = true,
},
}
+266 -249
View File
@@ -3,296 +3,313 @@ 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",
automatic_enable = false,
ensure_installed = {
"lua_ls",
"qmlls",
"rust_analyzer",
"gopls",
},
handlers = {
function(server_name) -- default handler (optional)
require("lspconfig")[server_name].setup {
capabilities = capabilities,
}
end,
"rust_analyzer",
},
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,
},
["rust_analyzer"] = function()
local lspconfig = require "lspconfig"
lspconfig.rust_analyzer.setup {
capabilities = capabilities,
settings = {
["rust-analyzer"] = {
cargo = { allFeatures = true },
checkOnSave = { command = "clippy" },
},
},
}
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 = {
["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-n>"] = cmp.mapping.select_next_item(),
["<C-d>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Insert,
select = true,
},
["<Tab>"] = 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" }),
["<S-Tab>"] = 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 = {
["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-n>"] = cmp.mapping.select_next_item(),
["<C-d>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Insert,
select = true,
},
["<Tab>"] = 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" }),
["<S-Tab>"] = 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" },
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("powershell_es", {
settings = {
powershell = {
codeFormatting = {
preset = "Custom",
openBraceOnSameLine = true,
newLineAfterOpenBrace = false,
newLineAfterCloseBrace = true,
whitespaceBeforeOpenBrace = true,
whitespaceBeforeOpenParen = true,
whitespaceAroundOperator = true,
whitespaceAfterSeparator = true,
ignoreOneLineBlock = true,
pipelineIndentationStyle = "NoIndentation",
},
},
},
})
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)
if client.name == "typos_lsp" or client.name == "copilot" then
return
end
end,
capabilities = capabilities,
})
lspenable(server)
end
-20
View File
@@ -1,20 +0,0 @@
local M = {}
M.plugin = {
"sbdchd/neoformat",
config = function()
vim.g.neoformat_enabled_lua = { "luaformatter" }
vim.g.neoformat_enabled_python = { "black" }
vim.g.neoformat_enabled_javascript = { "prettier" }
vim.g.neoformat_enabled_typescript = { "prettier" }
vim.g.neoformat_enabled_qml = { "qmlformat" }
vim.g.neoformat_enabled_go = { "gofmt" }
vim.g.neoformat_enabled_sh = { "shfmt" }
vim.g.neoformat_enabled_bash = { "shfmt" }
vim.g.neoformat_enabled_zsh = { "shfmt" }
vim.g.neoformat_enabled_rust = { "rustfmt" }
vim.g.neoformat_enabled_pwsh = { "pwshfmt" }
end,
}
return M
+20
View File
@@ -0,0 +1,20 @@
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", -- is defined for both undotree and preview buffers, so it works as a toggle
["quit"] = "q", -- is defined for both undotree and preview buffers
["update_undotree_view"] = "S",
},
}
+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
@@ -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', ' ')
-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
-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",
},
})
+10 -10
View File
@@ -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 = "#121318",
bg_alt = "#1A1B20",
bg_mid = pick("#292A2F", "#1E1F25"),
fg = "#E3E2E9",
fg_muted = "#C4C6D3",
fg_strong = pick("#15161A", "#F4F4F8"),
normal = "#D285D3",
insert = "#5D3F5C",
visual = "#8CAB44",
normal = "#718EDF",
insert = "#3E4867",
visual = "#C177BE",
replace = "#93000A",
command = pick("#FFDDEA", "#B3A2D5"),
inactive = "#201A1F",
command = pick("#FFDCF2", "#90ACD5"),
inactive = "#1A1B20",
normal_fg = pick("#15161A", "#F4F4F8"),
insert_fg = pick("#15161A", "#F4F4F8"),
+29 -12
View File
@@ -3,7 +3,7 @@ local map = vim.keymap.set
-- Base nvim mappings, you need this.
map("n", "<Tab>", "<Cmd>BufferLineCycleNext<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("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" })
@@ -11,11 +11,24 @@ map("n", "<C-a>", "ggVG", { noremap = true, silent = true })
map("n", "<C-j>", "<C-d>zz")
map("n", "<C-k>", "<C-u>zz")
map("n", "<A-->", ":bdelete<CR>")
map("", "=", function()
require("conform").format({ async = true, lsp_fallback = true }, function(err)
if not err then
local mode = vim.api.nvim_get_mode().mode
if vim.startswith(string.lower(mode), "v") then
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true)
end
end
end)
end, { desc = "Format code" })
-- map("n", "<SA-->", ":BufferRestore<CR>")
map('n', '<leader>e', function() Snacks.explorer() end)
map('n', '<leader>u', require('undotree').toggle, { noremap = true, silent = true })
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>e", function()
Snacks.explorer()
end)
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("undotree").toggle, { noremap = true, silent = true })
-- Copilot Chat buffer
map("n", "<A-c>", vim.cmd.CopilotChatToggle)
@@ -27,17 +40,21 @@ map("n", "<leader>zig", "<cmd>LspRestart<cr>")
-- Why?
map("x", "<leader>p", [["_dP]])
map({"n", "v"}, "<leader>y", [["+y]])
map({"n", "v"}, "<leader>d", "\"_d")
map("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");
map({ "n", "v" }, "<leader>y", [["+y]])
map({ "n", "v" }, "<leader>d", '"_d')
map("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>")
map("n", "<leader><leader>", function()
vim.cmd("so")
vim.cmd "so"
end)
-- Greatest remap
map("n", "<leader>Y", [["+Y]])
map("n", "<A-q>", function() Snacks.terminal.toggle() end, { desc = "Toggle Terminal" })
map("n", "<leader>gb", function() Snacks.gitbrowse.open() end )
map("n", "<A-q>", function()
Snacks.terminal.toggle()
end, { desc = "Toggle Terminal" })
map("n", "<leader>gb", function()
Snacks.gitbrowse.open()
end)
map("n", "K", require("pretty_hover").hover)
-- Might delete later
@@ -46,7 +63,7 @@ map("n", "<A-v>", "<cmd>ChatGPT<CR>")
-- Notif history
map("n", "<leader>n", function()
Snacks.notifier.show_history()
Snacks.notifier.show_history()
end)
-- Actions Previewer
+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.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
+20 -14
View File
@@ -1,17 +1,23 @@
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,
},
{
"stevearc/conform.nvim",
config = function()
require "config.format.conform"
end,
},
}
+6 -6
View File
@@ -1,8 +1,8 @@
return {
{
"lewis6991/gitsigns.nvim",
config = function()
require("config.gitsigns")
end
}
{
"lewis6991/gitsigns.nvim",
config = function()
require "config.other.gitsigns"
end,
},
}
+220 -241
View File
@@ -1,248 +1,227 @@
return {
{
require "config.snacks",
},
{
"nvim-mini/mini.nvim",
version = false,
modules = function()
require "config.mini-modules"
end,
},
{
"nvim-treesitter/nvim-treesitter",
lazy = false,
build = ":TSUpdate",
branch = "main",
config = function()
require "config.treesitter"
end,
},
{
"sainnhe/edge",
lazy = false,
priority = 1000,
config = function()
vim.g.edge_enable_italic = 1
vim.g.edge_style = "default"
vim.g.edge_menu_selection_background = "purple"
end,
},
{
"rmagatti/auto-session",
config = function()
require "config.autosession"
end,
},
{
"lambdalisue/vim-suda",
init = function()
vim.g.suda_smart_edit = 1
end,
},
{
"nvim-tree/nvim-web-devicons",
},
{
"akinsho/bufferline.nvim",
event = "VeryLazy",
config = function()
require "config.barbar"
end,
},
{
"mawkler/modicator.nvim",
config = function()
require "config.modicator"
end,
},
{
"shinchu/lightline-gruvbox.vim",
},
{
"jiaoshijie/undotree",
config = function()
require "config.undotree"
end,
},
{
"hiphish/rainbow-delimiters.nvim",
enabled = true,
},
{
"windwp/nvim-autopairs",
event = "InsertEnter",
config = function()
require "config.autopairs"
end,
},
{
"tpope/vim-fugitive",
},
{
"rcarriga/nvim-notify",
config = function()
require "config.notify"
end,
},
{
"zbirenbaum/copilot.lua",
cmd = "Copilot",
event = "InsertEnter",
config = function()
require "config.ai.copilot"
end,
},
{
"CopilotC-Nvim/CopilotChat.nvim",
dependencies = {
{ "zbirenbaum/copilot.lua" },
{ "nvim-lua/plenary.nvim", branch = "master" },
{
require "config.snacks",
},
build = "make tiktoken",
config = function()
require "config.ai.copilotchat"
end,
},
{
"mfussenegger/nvim-dap",
config = function()
require "config.dapconf"
end,
},
{
"mason-org/mason-lspconfig.nvim",
opts = {},
dependencies = {
{ "mason-org/mason.nvim", opts = {} },
"neovim/nvim-lspconfig",
{
"nvim-treesitter/nvim-treesitter",
lazy = false,
build = ":TSUpdate",
branch = "main",
config = function()
require "config.modules.treesitter"
end,
},
},
{
"folke/lazydev.nvim",
ft = "lua",
opts = function()
require "config.lazydev"
end,
},
{
"neovim/nvim-lspconfig",
enabled = true,
dependencies = {
-- "williamboman/mason.nvim",
-- "williamboman/mason-lspconfig.nvim",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-cmdline",
"hrsh7th/nvim-cmp",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
"j-hui/fidget.nvim",
"b0o/schemastore.nvim",
{
"sainnhe/edge",
lazy = false,
priority = 1000,
config = function()
vim.g.edge_enable_italic = 1
vim.g.edge_style = "default"
vim.g.edge_menu_selection_background = "purple"
end,
},
config = function()
require "config.format.lspconfig"
end,
},
{
"smolck/command-completion.nvim",
opts = {
border = nil,
highlight_selection = true,
use_matchfuzzy = true,
tab_completion = true,
{
"rmagatti/auto-session",
config = function()
require "config.modules.autosession"
end,
},
},
{
"andweeb/presence.nvim",
},
{
"mfussenegger/nvim-jdtls",
},
{
"ziglang/zig.vim",
},
{
"mg979/vim-visual-multi",
branch = "master",
},
{
"elkowar/yuck.vim",
},
{
"f3fora/nvim-texlabconfig",
config = function()
require "config.format.texlab"
end,
build = "go build",
},
{
"lancewilhelm/horizon-extended.nvim",
},
{
"vimpostor/vim-tpipeline",
},
{
"yazeed1s/minimal.nvim",
config = function()
vim.g.minimal_italic_comments = true
end,
},
{
"Yazeed1s/minimal.nvim",
config = function()
vim.g.minimal_italic_comments = true
vim.g.minimal_italic_functions = true
end,
},
{
"aserowy/tmux.nvim",
config = function()
require "config.terminal.tmux"
end,
},
{
"rachartier/tiny-inline-diagnostic.nvim",
config = function()
require "config.format.TID"
end,
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = {
"nvim-lua/plenary.nvim",
{
"lambdalisue/vim-suda",
init = function()
vim.g.suda_smart_edit = 1
end,
},
{
"nvim-tree/nvim-web-devicons",
},
{
"akinsho/bufferline.nvim",
event = "VeryLazy",
config = function()
require "config.other.barbar"
end,
},
{
"mawkler/modicator.nvim",
config = function()
require "config.gui.modicator"
end,
},
{
"jiaoshijie/undotree",
config = function()
require "config.modules.undotree"
end,
},
{
"hiphish/rainbow-delimiters.nvim",
enabled = true,
},
{
"windwp/nvim-autopairs",
event = "InsertEnter",
config = function()
require "config.other.autopairs"
end,
},
{
"tpope/vim-fugitive",
},
{
"rcarriga/nvim-notify",
config = function()
require "config.other.notify"
end,
},
{
"zbirenbaum/copilot.lua",
cmd = "Copilot",
event = "InsertEnter",
config = function()
require "config.ai.copilot"
end,
},
{
"CopilotC-Nvim/CopilotChat.nvim",
dependencies = {
{ "zbirenbaum/copilot.lua" },
{ "nvim-lua/plenary.nvim", branch = "master" },
},
build = "make tiktoken",
config = function()
require "config.ai.copilotchat"
end,
},
{
"mfussenegger/nvim-dap",
config = function()
require "config.other.dapconf"
end,
},
{
"mason-org/mason-lspconfig.nvim",
dependencies = {
{ "mason-org/mason.nvim", opts = {} },
"neovim/nvim-lspconfig",
},
},
{
"folke/lazydev.nvim",
ft = "lua",
opts = function()
require "config.lazydev"
end,
},
{
"neovim/nvim-lspconfig",
enabled = true,
dependencies = {
-- "williamboman/mason.nvim",
-- "williamboman/mason-lspconfig.nvim",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-cmdline",
"hrsh7th/nvim-cmp",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
"j-hui/fidget.nvim",
"b0o/schemastore.nvim",
},
config = function()
require "config.format.lspconfig"
end,
},
{
"smolck/command-completion.nvim",
opts = {
border = nil,
highlight_selection = true,
use_matchfuzzy = true,
tab_completion = true,
},
},
{
"andweeb/presence.nvim",
},
{
"mfussenegger/nvim-jdtls",
},
{
"ziglang/zig.vim",
},
{
"mg979/vim-visual-multi",
branch = "master",
},
{
"elkowar/yuck.vim",
},
{
"f3fora/nvim-texlabconfig",
config = function()
require "config.format.texlab"
end,
build = "go build",
},
{
"lancewilhelm/horizon-extended.nvim",
},
{
"vimpostor/vim-tpipeline",
},
{
"Yazeed1s/minimal.nvim",
config = function()
vim.g.minimal_italic_comments = true
vim.g.minimal_italic_functions = true
end,
},
{
"aserowy/tmux.nvim",
config = function()
require "config.terminal.tmux"
end,
},
{
"rachartier/tiny-inline-diagnostic.nvim",
config = function()
require "config.format.TID"
end,
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = {
"nvim-lua/plenary.nvim",
},
config = function()
require "config.other.harpoon"
end,
},
{
"aznhe21/actions-preview.nvim",
config = function()
require "config.other.actions-preview"
end,
},
{
"Zacharias-Brohn/zterm-navigator.nvim",
config = function()
require "config.terminal.zterm-navigator"
end,
},
{
"Fildo7525/pretty_hover",
event = "LspAttach",
opts = {},
},
{
"jiaoshijie/undotree",
config = function()
require "config.modules.undotree"
end,
},
config = function()
require "config.harpoon"
end,
},
{
"aznhe21/actions-preview.nvim",
config = function()
require "config.actions-preview"
end,
},
{
"sbdchd/neoformat",
config = function()
require "config.format.neoformat"
end,
},
{
"Zacharias-Brohn/zterm-navigator.nvim",
config = function()
require "config.terminal.zterm-navigator"
end,
},
{
"Fildo7525/pretty_hover",
event = "LspAttach",
opts = {},
},
{
"artemave/workspace-diagnostics.nvim",
},
}
+1 -1
View File
@@ -5,7 +5,7 @@ return {
"nvim-lua/plenary.nvim",
},
config = function()
require("config.telescope")
require("config.modules.telescope")
end,
},
{
+3 -3
View File
@@ -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,
},
}