From 76a93bf0b10c3f3148930ee36e003ce7299288d1 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Fri, 7 Jun 2024 16:54:47 +0200 Subject: [PATCH] nvim: onward --- .config/fish/fish_variables | 2 +- .config/nvim/lazy-lock.json | 10 +- .config/nvim/lazyvim.json | 27 ++ .config/nvim/lua/config/keymaps.lua | 3 + .config/nvim/lua/config/lazy.lua | 20 +- .config/nvim/lua/config/options.lua | 21 +- .config/nvim/lua/plugins/colorscheme.lua | 479 +---------------------- .config/nvim/lua/plugins/extras.lua | 5 +- .config/nvim/lua/plugins/incline.lua | 14 +- .config/nvim/lua/plugins/lsp.lua | 3 + .config/nvim/lua/plugins/treesitter.lua | 41 ++ .config/nvim/lua/plugins/ui.lua | 13 +- .config/nvim/spell/en.utf-8.add | 10 + .config/nvim/spell/en.utf-8.add.spl | Bin 0 -> 144 bytes 14 files changed, 143 insertions(+), 505 deletions(-) create mode 100644 .config/nvim/lazyvim.json create mode 100644 .config/nvim/lua/plugins/treesitter.lua create mode 100644 .config/nvim/spell/en.utf-8.add create mode 100644 .config/nvim/spell/en.utf-8.add.spl diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index df4d543..e265762 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,7 +1,7 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3400 -SETUVAR fish_color_autosuggestion:\x2d\x2ditalics\x1e\x2d\x2dbold\x1e\x2d\x2ddim +SETUVAR fish_color_autosuggestion:\x2d\x2ditalics\x1e\x2d\x2dbold\x1ered SETUVAR fish_color_cancel:\x1d SETUVAR fish_color_command:\x2d\x2dbold SETUVAR fish_color_comment:\x2d\x2ditalic\x1e\x2d\x2ddim diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 0bdb87e..32b5f3e 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -10,8 +10,10 @@ "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, "crates.nvim": { "branch": "main", "commit": "0c8436cb10e9ac62354baa5874a4a3413f2432c1" }, "dashboard-nvim": { "branch": "master", "commit": "5346d023afc4bfc7ff63d05c70bcdb0784bb657a" }, + "diagflow.nvim": { "branch": "main", "commit": "4a03e94e1bf6d18feaac44476cfcb78b403bd609" }, "direnv.vim": { "branch": "master", "commit": "ab2a7e08dd630060cd81d7946739ac7442a4f269" }, "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, + "edgy.nvim": { "branch": "main", "commit": "de79b7d92a5979cd71a9a1d8b6282515345e5055" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "fzf": { "branch": "master", "commit": "590060a16b85270c19c605e8758cda16c4517086" }, "fzfx.nvim": { "branch": "main", "commit": "be147216edf164a1739430c7fda210f9876cc430" }, @@ -24,6 +26,7 @@ "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" }, "modes.nvim": { "branch": "main", "commit": "326cff3282419b3bcc745061978c1e592cae055d" }, @@ -35,19 +38,24 @@ "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap-go": { "branch": "main", "commit": "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1" }, + "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, "nvim-lint": { "branch": "master", "commit": "cf6ffafe158441b8c5e2051ab0fe5b1983527ba7" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, + "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-snippets": { "branch": "main", "commit": "cff37a199a92f3c3cd52bb1593a7d01669b35d23" }, "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" }, + "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "overseer.nvim": { "branch": "master", "commit": "bd9cc6d2cc2317b6b70b3bfb956c88d4e00c7837" }, "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "rustaceanvim": { "branch": "master", "commit": "2fa45427c01ded4d3ecca72e357f8a60fd8e46d4" }, "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" }, "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json new file mode 100644 index 0000000..21757d1 --- /dev/null +++ b/.config/nvim/lazyvim.json @@ -0,0 +1,27 @@ +{ + "extras": [ + "lazyvim.plugins.extras.coding.codeium", + "lazyvim.plugins.extras.coding.yanky", + "lazyvim.plugins.extras.dap.core", + "lazyvim.plugins.extras.formatting.prettier", + "lazyvim.plugins.extras.lang.go", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.nix", + "lazyvim.plugins.extras.lang.rust", + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.typescript", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.lsp.none-ls", + "lazyvim.plugins.extras.lsp.none-ls", + "lazyvim.plugins.extras.test.core", + "lazyvim.plugins.extras.ui.edgy", + "lazyvim.plugins.extras.ui.treesitter-context", + "lazyvim.plugins.extras.util.gitui" + ], + "news": { + "NEWS.md": "5204" + }, + "version": 6 +} \ No newline at end of file diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index cc87217..84bc508 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -9,3 +9,6 @@ vim.api.nvim_set_keymap("v", "", "gc", {}) vim.api.nvim_set_keymap("n", "", "gcgc", {}) vim.api.nvim_set_keymap("n", "", ",", {}) vim.api.nvim_set_keymap("n", "zz", "zt", {}) + +vim.api.nvim_set_keymap("n", "[d", ":lua vim.diagnostic.goto_prev { float = false }", {}) +vim.api.nvim_set_keymap("n", "]d", ":lua vim.diagnostic.goto_next { float = false }", {}) diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index 8fbe1ba..cb2fc79 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -11,18 +11,14 @@ require("lazy").setup({ -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here - -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, - -- { import = "lazyvim.plugins.extras.coding.copilot" }, - { import = "lazyvim.plugins.extras.coding.codeium" }, - { import = "lazyvim.plugins.extras.coding.yanky" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, - { import = "lazyvim.plugins.extras.lang.go" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, - { import = "lazyvim.plugins.extras.lang.rust" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.yaml" }, - { import = "lazyvim.plugins.extras.lsp.none-ls" }, + -- { import = "lazyvim.plugins.extras.coding.codeium" }, + -- { import = "lazyvim.plugins.extras.formatting.prettier" }, + -- { import = "lazyvim.plugins.extras.lang.go" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.lang.markdown" }, + -- { import = "lazyvim.plugins.extras.lang.rust" }, + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lsp.none-ls" }, -- import/override with your plugins { import = "plugins" }, }, diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index eaa296d..1e2b623 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -4,7 +4,24 @@ vim.opt.number = true vim.opt.relativenumber = false -vim.opt.clipboard = "unnamed" --"unnamedplus" +-- vim.opt.clipboard = "" +function no_paste(reg) + return function(lines) + -- Do nothing! We can't paste with OSC52 + end +end + +vim.g.clipboard = { + name = "OSC 52", + copy = { + ["+"] = require("vim.ui.clipboard.osc52").copy("+"), + ["*"] = require("vim.ui.clipboard.osc52").copy("*"), + }, + paste = { + ["+"] = no_paste("+"), -- Pasting disabled + ["*"] = no_paste("*"), -- Pasting disabled + }, +} vim.g.do_filetype_lua = 1 vim.g.root_spec = { { ".git", "lua" }, "lsp", "cwd" } @@ -37,5 +54,5 @@ vim.api.nvim_create_autocmd("dirchanged", { vim.opt.laststatus = 0 vim.api.nvim_set_hl(0, "Statusline", { link = "Normal" }) vim.api.nvim_set_hl(0, "StatuslineNC", { link = "Normal" }) -local line = string.rep("▁", vim.api.nvim_win_get_width(0)) +local line = string.rep("▔", vim.api.nvim_win_get_width(0)) vim.opt.statusline = "%#WinSeparator#" .. line .. "%*" diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index 0ca5ff3..59cf784 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -1,7 +1,7 @@ return { { - "shelmangroup/sumi-e.nvim", - dir = "/home/dln/src/git.shelman.io/shelmangroup/sumi-e.nvim", + "shelmangroup/dieter.nvim", + dir = "/home/dln/src/git.shelman.io/shelmangroup/dieter.nvim", version = false, lazy = false, priority = 1000, @@ -10,480 +10,7 @@ return { { "LazyVim/LazyVim", opts = { - colorscheme = "sumi-e", + colorscheme = "dieter", }, }, - - --[=====[ - { - "jesseleite/nvim-noirbuddy", - lazy = false, - dependencies = { - { "tjdevries/colorbuddy.nvim" }, - }, - }, - - { - "LazyVim/LazyVim", - opts = { - colorscheme = function() - require("noirbuddy").setup({ - preset = "slate", - styles = { - italic = true, - bold = true, - underline = true, - undercurl = true, - }, - colors = { - background = "#11171d", - primary = "#FFECD3", - secondary = "#B0BEC5", - -- - diagnostic_info = "#00d992", - diagnostic_hint = "#00d992", - }, - }) - -- - local colorbuddy = require("colorbuddy") - local Color = colorbuddy.Color - local colors = colorbuddy.colors - local Group = colorbuddy.Group - local groups = colorbuddy.groups - local styles = colorbuddy.styles - - Color.new("ColorColumn", "#171e26") - Group.new("ColorColumn", nil, colors.ColorColumn) - - Color.new("normal", "#e3e0cd") - Group.new("Normal", colors.normal, nil) - - Color.new("Visual", "#440066") - Group.new("ModesVisualVisual", nil, colors.Visual) - Group.new("Visual", nil, colors.Visual) - Group.new("VisualNOS", nil, colors.Visual) - Group.new("MatchParen", nil, colors.Visual) - - Color.new("NeoCodeiumLabelBg", "#eda92d") - Color.new("NeoCodeiumLabelFg", "#000000") - Group.new("NeoCodeiumLabel", colors.NeoCodeiumLabelFg, colors.NeoCodeiumLabelBg) - - Color.new("NeoCodeiumSuggestion", "#996611") - Group.new("NeoCodeiumSuggestion", colors.NeoCodeiumSuggestion, nil, styles.italic) - - Color.new("NoiceCmdLineBg", "#112233") - Color.new("NoiceCmdLineFg", "#99ccff") - Group.new("NoiceCmdLine", colors.NoiceCmdLineFg, colors.NoiceCmdLineBg) - - Color.new("NoiceFormatProgressTodo", "#223344") - Group.new("NoiceFormatProgressTodo", nil, colors.NoiceFormatProgressTodo) - Color.new("NoiceFormatProgressDone", "#446699") - Group.new("NoiceFormatProgressDone", nil, colors.NoiceFormatProgressDone) - - Color.new("WinSeparator", "#223344") - Group.new("WinSeparator", colors.WinSeparator, nil) - - Color.new("string", "#D7CCC8") - Color.new("symbol", "#ECEFF1") - - Color.new("comment", "#E57373", nil, styles.italic) - Color.new("hlargs", "#FFF8E1") - - Color.new("illuminate_bg", "#112210") - Color.new("illuminate_fg", "#00d992") - - Color.new("search_bg", "#223311") - Color.new("search_fg", "#CCFF33") - - Color.new("MiniIndentscopeSymbol", "#00d992") - Group.new("MiniIndentscopeSymbol", colors.MiniIndentscopeSymbol) - - Color.new("CursorFg", "#000000", styles.nocombine) - Color.new("CursorBg", "#23fdb6", styles.nocombine) - Group.new("Cursor", colors.CursorFg, colors.CursorBg) - Color.new("CursorLine", "#141b23") - Group.new("CursorLine", nil, colors.CursorLine) - - -- Color.new("TroubleBg", "#171e26") - Color.new("TroubleFg", "#e1d4c1") - Color.new("TroubleBg", "#10161d") - -- Color.new("TroubleBg", "#1d140f") - Group.new("TroubleNormal", colors.TroubleFg, colors.TroubleBg) - - Color.new("NavicTextFg", "#5fbf9f") - Color.new("NavicTextBg", "#333333") - Color.new("NavicIcon", "#5fbf9f") - - Group.new("NavicText", colors.NavicTextFg, colors.NavicTextBg) - Group.new("NavicIcon", colors.NavicIcon, colors.NavicTextBg) - Group.link("NavicIconsFile", groups.NavicIcon) - Group.link("NavicIconsModule", groups.NavicIcon) - Group.link("NavicIconsNamespace", groups.NavicIcon) - Group.link("NavicIconsPackage", groups.NavicIcon) - Group.link("NavicIconsClass", groups.NavicIcon) - Group.link("NavicIconsMethod", groups.NavicIcon) - Group.link("NavicIconsProperty", groups.NavicIcon) - Group.link("NavicIconsField", groups.NavicIcon) - Group.link("NavicIconsConstructor", groups.NavicIcon) - Group.link("NavicIconsEnum", groups.NavicIcon) - Group.link("NavicIconsInterface", groups.NavicIcon) - Group.link("NavicIconsFunction", groups.NavicIcon) - Group.link("NavicIconsVariable", groups.NavicIcon) - Group.link("NavicIconsConstant", groups.NavicIcon) - Group.link("NavicIconsString", groups.NavicIcon) - Group.link("NavicIconsNumber", groups.NavicIcon) - Group.link("NavicIconsBoolean", groups.NavicIcon) - Group.link("NavicIconsArray", groups.NavicIcon) - Group.link("NavicIconsObject", groups.NavicIcon) - Group.link("NavicIconsKey", groups.NavicIcon) - Group.link("NavicIconsNull", groups.NavicIcon) - Group.link("NavicIconsEnumMember", groups.NavicIcon) - Group.link("NavicIconsStruct", groups.NavicIcon) - Group.link("NavicIconsEvent", groups.NavicIcon) - Group.link("NavicIconsOperator", groups.NavicIcon) - Group.link("NavicIconsTypeParameter", groups.NavicIcon) - - Color.new("NormalFloatFg", "#b8d1ef", styles.nocombine) - -- Color.new("NormalFloatBg", "#335a88", styles.nocombine) - Color.new("NormalFloatBg", "#242d38", styles.nocombine) - Color.new("NormalFloatBorder", "#00d992", styles.nocombine) - Group.new("NormalFloat", colors.NormalFloatFg, colors.NormalFloatBg) - Group.new("FloatBorder", colors.NormalFloatBorder, colors.NormalFloatBg) - - -- Color.new("PmenuSelFg", "#f3d390", styles.nocombine) - -- Color.new("PmenuSelBg", "#335a88", styles.nocombine) - Color.new("PmenuSelFg", "#52ffb5", styles.nocombine) - Color.new("PmenuSelBg", "#003322", styles.nocombine) - Group.new("PmenuSel", colors.PmenuSelFg, colors.PmenuSelBg, styles.bold) - - -- Color.new("PmenuSelBg", "#335a88", styles.nocombine) - -- Group.new("PmenuSel", colors.PmenuSelFg, colors.PmenuSelBg) - - Color.new("TreesitterContext", "#242e38", styles.nocombine) - Group.new("TreesitterContext", nil, colors.TreesitterContext) - - -- Color.new("NonText", "#955252", styles.nocombine) - Color.new("NonText", "#955252", styles.nocombine) - - Color.new("comment2", "#51a0cf") - Group.new("Comment", colors.NonText, nil, styles.italic + styles.bold) - Group.new("LspInlayHint", colors.comment2, nil, styles.italic) - - Group.new("NonText", colors.NonText, nil, styles.italic) - Group.new("NonText", colors.NonText, nil, styles.italic) - - Color.new("spelling", "#ffce60") - Group.new("SpellBad", colors.spelling, nil, styles.undercurl) - - -- Color.new("LuaLineFg", "#aebed0") - Color.new("InclineFg", "#aebed0") - Color.new("InclineBg", "#242e38") - Group.new("InclineNormal", colors.InclineFg, colors.InclineBg) - Group.new("InclineNormalNC", colors.InclineFg, colors.InclineBg) - - Color.new("LspInfoTitle", "#955252") - Group.new("LspInfoTitle", colors.LspInfoTitle, nil, styles.italic) - -- Group.new("DiagnosticHint", colors.LspInfoTitle, nil, styles.italic) - -- - -- Color.new("TroubleFg", "#ffce60", styles.nocombine) - -- Color.new("TroubleFg", "#ffce60", styles.nocombine) - -- Color.new("TroubleBg", "#260200", styles.nocombine) - -- Group.new("TroubleNormal", colors.TroubleFg, colors.TroubleBg) - -- Group.link("TroubleText", groups.TroubleNormal) - -- Group.link("TroubleSource", groups.TroubleNormal) - -- - Color.new("Error", "#ffce60", styles.nocombine) - Group.new("ErrorMsg", colors.Error) - - Color.new("FlashLabelFg", "#220011") - Color.new("FlashLabelBg", "#EA1199") - Group.new("FlashLabel", colors.FlashLabelFg, colors.FlashLabelBg) - - Color.new("TelescopeBorder", "#23fdb6") - Group.new("TelescopeTitle", colors.TelescopeBorder) - Group.new("telescopeborder", colors.TelescopeBorder) - - Color.new("TelescopeBorder", "#23fdb6") - - Color.new("TelescopeNormal", "#b6c5bd") - Group.new("telescoperesultsnormal", colors.TelescopeNormal) - - Color.new("TelescopeSelectionBg", "#003f29") - Color.new("TelescopeSelectionFg", "#f6fb2d") - Group.new( - "TelescopeSelection", - colors.TelescopeSelectionFg, - colors.TelescopeSelectionBg, - styles.nocombine + styles.bold - ) - - Group.new("@comment", colors.comment, nil, styles.italic + styles.bold) - Group.new("@string", colors.string, nil, styles.italic) - - Group.new("@keyword", colors.noir_2) - Group.new("@keyword.function", colors.noir_2) - Group.new("@keyword.return", colors.noir_1) - - Group.new("@operator", colors.noir_1) - Group.new("@keyword.operator", colors.noir_1) - -- Group.new("Hlargs", colors.noir_3, nil, styles.italic) - Group.new("@type.builtin", colors.noir_2) - - Group.new("@variable", colors.symbol, nil) - Group.new("Hlargs", colors.hlargs, nil) - - Group.new("@function", colors.noir_1, nil, styles.bold) - Group.new("@method", colors.noir_1, nil, styles.bold) - - Group.new("@punctuation", colors.noir_4) - Group.new("@punctuation.bracket", colors.noir_4) - Group.new("@punctuation.delimiter", colors.noir_4) - - Group.new("IlluminatedWordText", colors.illuminate_fg, colors.illuminate_bg) - - Group.new("Search", colors.search_fg, colors.search_bg, styles.italic + styles.undercurl) - Group.new("IncSearch", colors.search_fg, colors.search_bg) - end, -||||||| parent of 1c239cb (nvim: use sumi-e colorscheme) - colorscheme = "alabaster", - }, - }, - - --]=====] - - { - "jesseleite/nvim-noirbuddy", - lazy = false, - dependencies = { - { "tjdevries/colorbuddy.nvim" }, - }, - }, - - { - "LazyVim/LazyVim", - opts = { - colorscheme = function() - require("noirbuddy").setup({ - preset = "slate", - styles = { - italic = true, - bold = true, - underline = true, - undercurl = true, - }, - colors = { - background = "#11171d", - primary = "#FFECD3", - secondary = "#B0BEC5", - -- - diagnostic_info = "#00d992", - diagnostic_hint = "#00d992", - }, - }) - -- - local colorbuddy = require("colorbuddy") - local Color = colorbuddy.Color - local colors = colorbuddy.colors - local Group = colorbuddy.Group - local groups = colorbuddy.groups - local styles = colorbuddy.styles - - Color.new("ColorColumn", "#171e26") - Group.new("ColorColumn", nil, colors.ColorColumn) - - Color.new("normal", "#e3e0cd") - Group.new("Normal", colors.normal, nil) - - Color.new("Visual", "#440066") - Group.new("ModesVisualVisual", nil, colors.Visual) - Group.new("Visual", nil, colors.Visual) - Group.new("VisualNOS", nil, colors.Visual) - Group.new("MatchParen", nil, colors.Visual) - - Color.new("NeoCodeiumLabelBg", "#eda92d") - Color.new("NeoCodeiumLabelFg", "#000000") - Group.new("NeoCodeiumLabel", colors.NeoCodeiumLabelFg, colors.NeoCodeiumLabelBg) - - Color.new("NeoCodeiumSuggestion", "#996611") - Group.new("NeoCodeiumSuggestion", colors.NeoCodeiumSuggestion, nil, styles.italic) - - Color.new("NoiceCmdLineBg", "#112233") - Color.new("NoiceCmdLineFg", "#99ccff") - Group.new("NoiceCmdLine", colors.NoiceCmdLineFg, colors.NoiceCmdLineBg) - - Color.new("NoiceFormatProgressTodo", "#223344") - Group.new("NoiceFormatProgressTodo", nil, colors.NoiceFormatProgressTodo) - Color.new("NoiceFormatProgressDone", "#446699") - Group.new("NoiceFormatProgressDone", nil, colors.NoiceFormatProgressDone) - - Color.new("WinSeparator", "#223344") - Group.new("WinSeparator", colors.WinSeparator, nil) - - Color.new("string", "#D7CCC8") - Color.new("symbol", "#ECEFF1") - - Color.new("comment", "#E57373", nil, styles.italic) - Color.new("hlargs", "#FFF8E1") - - Color.new("illuminate_bg", "#112210") - Color.new("illuminate_fg", "#00d992") - - Color.new("search_bg", "#223311") - Color.new("search_fg", "#CCFF33") - - Color.new("MiniIndentscopeSymbol", "#00d992") - Group.new("MiniIndentscopeSymbol", colors.MiniIndentscopeSymbol) - - Color.new("CursorFg", "#000000", styles.nocombine) - Color.new("CursorBg", "#23fdb6", styles.nocombine) - Group.new("Cursor", colors.CursorFg, colors.CursorBg) - Color.new("CursorLine", "#141b23") - Group.new("CursorLine", nil, colors.CursorLine) - - -- Color.new("TroubleBg", "#171e26") - Color.new("TroubleFg", "#e1d4c1") - Color.new("TroubleBg", "#10161d") - -- Color.new("TroubleBg", "#1d140f") - Group.new("TroubleNormal", colors.TroubleFg, colors.TroubleBg) - - Color.new("NavicTextFg", "#5fbf9f") - Color.new("NavicTextBg", "#333333") - Color.new("NavicIcon", "#5fbf9f") - - Group.new("NavicText", colors.NavicTextFg, colors.NavicTextBg) - Group.new("NavicIcon", colors.NavicIcon, colors.NavicTextBg) - Group.link("NavicIconsFile", groups.NavicIcon) - Group.link("NavicIconsModule", groups.NavicIcon) - Group.link("NavicIconsNamespace", groups.NavicIcon) - Group.link("NavicIconsPackage", groups.NavicIcon) - Group.link("NavicIconsClass", groups.NavicIcon) - Group.link("NavicIconsMethod", groups.NavicIcon) - Group.link("NavicIconsProperty", groups.NavicIcon) - Group.link("NavicIconsField", groups.NavicIcon) - Group.link("NavicIconsConstructor", groups.NavicIcon) - Group.link("NavicIconsEnum", groups.NavicIcon) - Group.link("NavicIconsInterface", groups.NavicIcon) - Group.link("NavicIconsFunction", groups.NavicIcon) - Group.link("NavicIconsVariable", groups.NavicIcon) - Group.link("NavicIconsConstant", groups.NavicIcon) - Group.link("NavicIconsString", groups.NavicIcon) - Group.link("NavicIconsNumber", groups.NavicIcon) - Group.link("NavicIconsBoolean", groups.NavicIcon) - Group.link("NavicIconsArray", groups.NavicIcon) - Group.link("NavicIconsObject", groups.NavicIcon) - Group.link("NavicIconsKey", groups.NavicIcon) - Group.link("NavicIconsNull", groups.NavicIcon) - Group.link("NavicIconsEnumMember", groups.NavicIcon) - Group.link("NavicIconsStruct", groups.NavicIcon) - Group.link("NavicIconsEvent", groups.NavicIcon) - Group.link("NavicIconsOperator", groups.NavicIcon) - Group.link("NavicIconsTypeParameter", groups.NavicIcon) - - Color.new("NormalFloatFg", "#b8d1ef", styles.nocombine) - -- Color.new("NormalFloatBg", "#335a88", styles.nocombine) - Color.new("NormalFloatBg", "#242d38", styles.nocombine) - Color.new("NormalFloatBorder", "#00d992", styles.nocombine) - Group.new("NormalFloat", colors.NormalFloatFg, colors.NormalFloatBg) - Group.new("FloatBorder", colors.NormalFloatBorder, colors.NormalFloatBg) - - -- Color.new("PmenuSelFg", "#f3d390", styles.nocombine) - -- Color.new("PmenuSelBg", "#335a88", styles.nocombine) - Color.new("PmenuSelFg", "#52ffb5", styles.nocombine) - Color.new("PmenuSelBg", "#003322", styles.nocombine) - Group.new("PmenuSel", colors.PmenuSelFg, colors.PmenuSelBg, styles.bold) - - -- Color.new("PmenuSelBg", "#335a88", styles.nocombine) - -- Group.new("PmenuSel", colors.PmenuSelFg, colors.PmenuSelBg) - - Color.new("TreesitterContext", "#242e38", styles.nocombine) - Group.new("TreesitterContext", nil, colors.TreesitterContext) - - -- Color.new("NonText", "#955252", styles.nocombine) - Color.new("NonText", "#955252", styles.nocombine) - - Color.new("comment2", "#51a0cf") - Group.new("Comment", colors.NonText, nil, styles.italic + styles.bold) - Group.new("LspInlayHint", colors.comment2, nil, styles.italic) - - Group.new("NonText", colors.NonText, nil, styles.italic) - Group.new("NonText", colors.NonText, nil, styles.italic) - - Color.new("spelling", "#ffce60") - Group.new("SpellBad", colors.spelling, nil, styles.undercurl) - - -- Color.new("LuaLineFg", "#aebed0") - Color.new("InclineFg", "#aebed0") - Color.new("InclineBg", "#242e38") - Group.new("InclineNormal", colors.InclineFg, colors.InclineBg) - Group.new("InclineNormalNC", colors.InclineFg, colors.InclineBg) - - Color.new("LspInfoTitle", "#955252") - Group.new("LspInfoTitle", colors.LspInfoTitle, nil, styles.italic) - -- Group.new("DiagnosticHint", colors.LspInfoTitle, nil, styles.italic) - -- - -- Color.new("TroubleFg", "#ffce60", styles.nocombine) - -- Color.new("TroubleFg", "#ffce60", styles.nocombine) - -- Color.new("TroubleBg", "#260200", styles.nocombine) - -- Group.new("TroubleNormal", colors.TroubleFg, colors.TroubleBg) - -- Group.link("TroubleText", groups.TroubleNormal) - -- Group.link("TroubleSource", groups.TroubleNormal) - -- - Color.new("Error", "#ffce60", styles.nocombine) - Group.new("ErrorMsg", colors.Error) - - Color.new("FlashLabelFg", "#220011") - Color.new("FlashLabelBg", "#EA1199") - Group.new("FlashLabel", colors.FlashLabelFg, colors.FlashLabelBg) - - Color.new("TelescopeBorder", "#23fdb6") - Group.new("TelescopeTitle", colors.TelescopeBorder) - Group.new("telescopeborder", colors.TelescopeBorder) - - Color.new("TelescopeBorder", "#23fdb6") - - Color.new("TelescopeNormal", "#b6c5bd") - Group.new("telescoperesultsnormal", colors.TelescopeNormal) - - Color.new("TelescopeSelectionBg", "#003f29") - Color.new("TelescopeSelectionFg", "#f6fb2d") - Group.new( - "TelescopeSelection", - colors.TelescopeSelectionFg, - colors.TelescopeSelectionBg, - styles.nocombine + styles.bold - ) - - Group.new("@comment", colors.comment, nil, styles.italic + styles.bold) - Group.new("@string", colors.string, nil, styles.italic) - - Group.new("@keyword", colors.noir_2) - Group.new("@keyword.function", colors.noir_2) - Group.new("@keyword.return", colors.noir_1) - - Group.new("@operator", colors.noir_1) - Group.new("@keyword.operator", colors.noir_1) - -- Group.new("Hlargs", colors.noir_3, nil, styles.italic) - Group.new("@type.builtin", colors.noir_2) - - Group.new("@variable", colors.symbol, nil) - Group.new("Hlargs", colors.hlargs, nil) - - Group.new("@function", colors.noir_1, nil, styles.bold) - Group.new("@method", colors.noir_1, nil, styles.bold) - - Group.new("@punctuation", colors.noir_4) - Group.new("@punctuation.bracket", colors.noir_4) - Group.new("@punctuation.delimiter", colors.noir_4) - - Group.new("IlluminatedWordText", colors.illuminate_fg, colors.illuminate_bg) - - Group.new("Search", colors.search_fg, colors.search_bg, styles.italic + styles.undercurl) - Group.new("IncSearch", colors.search_fg, colors.search_bg) - end, -======= - colorscheme = "sumi-e", ->>>>>>> 1c239cb (nvim: use sumi-e colorscheme) - }, - }, - --]=====] } diff --git a/.config/nvim/lua/plugins/extras.lua b/.config/nvim/lua/plugins/extras.lua index f894c32..159bcec 100644 --- a/.config/nvim/lua/plugins/extras.lua +++ b/.config/nvim/lua/plugins/extras.lua @@ -52,6 +52,7 @@ return { { "mrcjkb/rustaceanvim", + enabled = false, version = "^4", -- Recommended ft = { "rust" }, opts = { @@ -77,10 +78,6 @@ return { loadOutDirsFromCheck = true, runBuildScripts = true, targetDir = true, - -- extraEnv = { - -- RUSTC_LINKER = "clang", - -- RUSTFLAGS = "-Clink-arg=-fuse-ld=mold", - -- }, }, -- Add clippy lints for Rust. checkOnSave = { diff --git a/.config/nvim/lua/plugins/incline.lua b/.config/nvim/lua/plugins/incline.lua index dde16dd..c594785 100644 --- a/.config/nvim/lua/plugins/incline.lua +++ b/.config/nvim/lua/plugins/incline.lua @@ -40,7 +40,7 @@ return { end local function get_diagnostic_label() - local icons = { error = "󰅜 ", warn = " ", info = " ", hint = " " } + local icons = { error = " ", warn = " ", info = " ", hint = " " } local label = {} for severity, icon in pairs(icons) do @@ -59,13 +59,11 @@ return { end return { - -- { "" }, - { " ", gui = "reverse" }, - { get_diagnostic_label(), guibg = "fg", guifg = "bg" }, - { get_git_diff(), gui = "reverse" }, - { filename, gui = "reverse" }, - { " ", gui = "reverse" }, - -- { "" }, + { " " }, + { get_diagnostic_label() }, + { get_git_diff() }, + { filename, group = "Label" }, + { " " }, } end, }) diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 93920d8..24a6969 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -2,6 +2,9 @@ return { { "neovim/nvim-lspconfig", opts = { + diagnostics = { + virtual_text = false, + }, inlay_hints = { enabled = false }, -- codelens = { -- enabled = true, diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..0aea1c4 --- /dev/null +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,41 @@ +return { + { + "nvim-treesitter/nvim-treesitter-context", + opts = { + enable = false, + }, + }, + + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + vim.list_extend(opts.ensure_installed, { + "bash", + "c", + "diff", + "go", + "html", + "javascript", + "jsdoc", + "json", + "jsonc", + "lua", + "luadoc", + "luap", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "rust", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "xml", + "yaml", + }) + end, + }, +} diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua index b6c08af..b9eb9c2 100644 --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -22,6 +22,18 @@ return { }, }, + { + "dgagn/diagflow.nvim", + -- event = 'LspAttach', This is what I use personnally and it works great + opts = { + scope = "line", + gap_size = 0, + max_width = 50, + max_height = 20, + show_borders = true, + }, + }, + { "akinsho/bufferline.nvim", enabled = false, @@ -94,7 +106,6 @@ return { opts = { stages = "fade_in_slide_out", timeout = 1000, - background_colour = "#1e2835", render = "wrapped-compact", top_down = false, }, diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add new file mode 100644 index 0000000..ab924f2 --- /dev/null +++ b/.config/nvim/spell/en.utf-8.add @@ -0,0 +1,10 @@ +#rytographically +crytographically/! +OIDC +Kubernetes +auth +JWT +PKCE +OPA +#askfile +Taskfile/! diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl new file mode 100644 index 0000000000000000000000000000000000000000..b8cee884173101bb32cd424d8b1775876e9c6e10 GIT binary patch literal 144 zcmXAi!3qK~3`FyS;8pw-*`M&>)qAaVty|n;E3#j&qb6jSNhZm0e`qz8vU{6ZUWa&_ z=GuAExnew6#AZgZKvgdj#foylH@r0VmHa1?Ja=JNHQYT{&R{mg9|k7ves$7?CUw!Z KBDZh#{2w1Nz8e$( literal 0 HcmV?d00001