diff --git a/configs/helix/.gitignore b/configs/helix/.gitignore new file mode 100644 index 0000000..e4d05d9 --- /dev/null +++ b/configs/helix/.gitignore @@ -0,0 +1 @@ +runtime diff --git a/configs/helix/config.toml b/configs/helix/config.toml new file mode 100644 index 0000000..79c4798 --- /dev/null +++ b/configs/helix/config.toml @@ -0,0 +1,15 @@ +theme = "catppuccin_mocha" + +[editor] +line-number = "relative" +mouse = false + +[editor.cursor-shape] +insert = "bar" +normal = "block" +select = "underline" + +[editor.file-picker] +hidden = false + + diff --git a/configs/helix/themes/catppuccin_mocha.toml b/configs/helix/themes/catppuccin_mocha.toml new file mode 100644 index 0000000..62a6fd6 --- /dev/null +++ b/configs/helix/themes/catppuccin_mocha.toml @@ -0,0 +1,146 @@ +# Syntax highlighting +# ------------------- +"type" = "yellow" + +"constructor" = "sapphire" + +"constant" = "peach" +"constant.builtin" = "peach" +"constant.character" = "teal" +"constant.character.escape" = "pink" + +"string" = "green" +"string.regexp" = "peach" +"string.special" = "blue" + +"comment" = { fg = "overlay1", modifiers = ["italic"] } + +"variable" = "text" +"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } +"variable.builtin" = "red" +"variable.other.member" = "teal" + +"label" = "sapphire" # used for lifetimes + +"punctuation" = "overlay2" +"punctuation.special" = "sky" + +"keyword" = "mauve" +"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } + +"operator" = "sky" + +"function" = "blue" +"function.macro" = "mauve" + +"tag" = "mauve" +"attribute" = "blue" + +"namespace" = { fg = "blue", modifiers = ["italic"] } + +"special" = "blue" # fuzzy highlight + +"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] } +"markup.heading.1" = "lavender" +"markup.heading.2" = "mauve" +"markup.heading.3" = "green" +"markup.heading.4" = "yellow" +"markup.heading.5" = "pink" +"markup.heading.6" = "teal" +"markup.list" = "mauve" +"markup.bold" = { modifiers = ["bold"] } +"markup.italic" = { modifiers = ["italic"] } +"markup.link.url" = { fg = "rosewater", modifiers = ["italic", "underlined"] } +"markup.link.text" = "blue" +"markup.raw" = "flamingo" + +"diff.plus" = "green" +"diff.minus" = "red" +"diff.delta" = "blue" + +# User Interface +# -------------- +"ui.background" = { fg = "text" } + +"ui.linenr" = { fg = "surface1" } +"ui.linenr.selected" = { fg = "lavender" } + +"ui.statusline" = { fg = "subtext1", bg = "mantle" } +"ui.statusline.inactive" = { fg = "surface2", bg = "mantle" } +"ui.statusline.normal" = { fg = "base", bg = "lavender", modifiers = ["bold"] } +"ui.statusline.insert" = { fg = "base", bg = "green", modifiers = ["bold"] } +"ui.statusline.select" = { fg = "base", bg = "flamingo", modifiers = ["bold"] } + +"ui.popup" = { fg = "text", bg = "surface0" } +"ui.window" = { fg = "crust" } +"ui.help" = { fg = "overlay2", bg = "surface0" } + +"ui.bufferline" = { fg = "subtext0", bg = "mantle" } +"ui.bufferline.active" = { fg = "mauve", bg = "base", underline = { color = "mauve", style = "line" } } +"ui.bufferline.background" = { bg = "crust" } + +"ui.text" = "text" +"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } + +"ui.virtual" = "overlay0" +"ui.virtual.ruler" = { bg = "surface0" } +"ui.virtual.indent-guide" = "surface0" +"ui.virtual.inlay-hint" = { fg = "surface1", bg = "mantle" } + +"ui.selection" = { bg = "surface1" } + +"ui.cursor" = { fg = "base", bg = "secondary_cursor" } +"ui.cursor.primary" = { fg = "base", bg = "rosewater" } +"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] } + +"ui.cursorline.primary" = { bg = "cursorline" } + +"ui.highlight" = { bg = "surface1", modifiers = ["bold"] } + +"ui.menu" = { fg = "overlay2", bg = "surface0" } +"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } + +"diagnostic.error" = { underline = { color = "red", style = "curl" } } +"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } } +"diagnostic.info" = { underline = { color = "sky", style = "curl" } } +"diagnostic.hint" = { underline = { color = "teal", style = "curl" } } + +error = "red" +warning = "yellow" +info = "sky" +hint = "teal" + +[palette] +# catppuccin palette colors +rosewater = "#f5e0dc" +flamingo = "#f2cdcd" +pink = "#f5c2e7" +mauve = "#cba6f7" +red = "#f38ba8" +maroon = "#eba0ac" +peach = "#fab387" +yellow = "#f9e2af" +green = "#a6e3a1" +teal = "#94e2d5" +sky = "#89dceb" +sapphire = "#74c7ec" +blue = "#89b4fa" +lavender = "#b4befe" + +text = "#cdd6f4" +subtext1 = "#bac2de" +subtext0 = "#a6adc8" +overlay2 = "#9399b2" +overlay1 = "#7f849c" +overlay0 = "#6c7086" +surface2 = "#585b70" +surface1 = "#45475a" +surface0 = "#313244" + +base = "#1e1e2e" +mantle = "#181825" +crust = "#11111b" + +# derived colors by blending existing palette colors +cursorline = "#2a2b3c" +secondary_cursor = "#b5a6a8" diff --git a/configs/nvim/ftplugin/http.lua b/configs/nvim/ftplugin/http.lua new file mode 100644 index 0000000..21eb939 --- /dev/null +++ b/configs/nvim/ftplugin/http.lua @@ -0,0 +1,11 @@ +local map = vim.api.nvim_set_keymap; +local function run(verbose) + return require("rest-nvim").run(verbose); +end + +local preview = function() + return run(true) +end + +map("n", "r", run, { noremap = true }); +map("n", "p", preview, { noremap = true }); diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index c61c975..97bcf07 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -8,4 +8,4 @@ require("max.core.autocommands") require("max.core.keymappings") -vim.cmd("colorscheme catppuccin") +vim.cmd("colorscheme " .. require("max.theme").name); diff --git a/configs/nvim/lazy-lock.json b/configs/nvim/lazy-lock.json index 2c2d1bd..afcb1d5 100644 --- a/configs/nvim/lazy-lock.json +++ b/configs/nvim/lazy-lock.json @@ -1,11 +1,10 @@ { - "ChatGPT.nvim": { "branch": "main", "commit": "8820b99ca1f2cd229578d104ea57aa3a8029113d" }, + "ChatGPT.nvim": { "branch": "main", "commit": "8797871b5d11d256834b1c474ca9016dd0137dcb" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "e650efa2255990193454f43af828a3d8f4fe66ba" }, - "alpha-nvim": { "branch": "main", "commit": "4b0ba68022d8612b04b26844f1ce5e708c0d23b0" }, + "LuaSnip": { "branch": "master", "commit": "025886915e7a1442019f467e0ae2847a7cf6bf1a" }, + "alpha-nvim": { "branch": "main", "commit": "dafa11a6218c2296df044e00f88d9187222ba6b0" }, "autolist.nvim": { "branch": "main", "commit": "f8b4c11b79b0fef77a64b03810839a1abbbc67d5" }, "boole.nvim": { "branch": "main", "commit": "f4f9996f91159e54b8f1893b20e2e599c91bc1bd" }, - "catppuccin": { "branch": "main", "commit": "5e2c9cf8277c42fb634007126c36d765fd176f4a" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, @@ -13,60 +12,59 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "copilot-cmp": { "branch": "master", "commit": "92535dfd9c430b49ca7d9a7da336c5db65826b65" }, - "copilot.lua": { "branch": "master", "commit": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f" }, + "copilot.lua": { "branch": "master", "commit": "db62371b6eac73954c194f3c8faee36cffee8135" }, + "everblush": { "branch": "main", "commit": "c568a0eb165fef10d43cafb5c10cd6023be23218" }, "flit.nvim": { "branch": "main", "commit": "4c1739137acd3e7f03e2065a7be8a4dc41c7e461" }, - "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" }, - "git-conflict.nvim": { "branch": "main", "commit": "2957f747e1a34f1854e4e0efbfbfa59a1db04af5" }, - "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" }, - "lazy.nvim": { "branch": "main", "commit": "e89acede13f46a5db229133cf0c87aee74938c56" }, - "leap.nvim": { "branch": "main", "commit": "d34680b16af977928228e57c68e5a162f1649e3c" }, + "friendly-snippets": { "branch": "main", "commit": "25ddcd96540a2ce41d714bd7fea2e7f75fea8ead" }, + "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" }, + "gitsigns.nvim": { "branch": "main", "commit": "ca473e28382f1524aa3d2b6f04bcf54f2e6a64cb" }, + "lazy.nvim": { "branch": "main", "commit": "a80422f21750fcbf0e90b26da877d4024d76f116" }, + "leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" }, "lsp-format.nvim": { "branch": "master", "commit": "ca0df5c8544e51517209ea7b86ecc522c98d4f0a" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lspsaga.nvim": { "branch": "main", "commit": "109286f8def4187c3a35494b8760fd14105e9d8c" }, + "lspsaga.nvim": { "branch": "main", "commit": "04617d1f5b1cfbdd2a99d9765ef04fc6ae415622" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a31e011135a79d63c71254c250c9158e1056a1cb" }, - "mason.nvim": { "branch": "main", "commit": "add6d1d63d8b86af951ba64b4157fe6b0af173d4" }, - "mini.nvim": { "branch": "main", "commit": "c65901227e5a3671dbcb054745566a1c78f9f0c8" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4" }, - "neotest": { "branch": "master", "commit": "95f95e346090ad96c657f021ad4d47f93c915598" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2b811031febe5f743e07305738181ff367e1e452" }, + "mason.nvim": { "branch": "main", "commit": "210865d77cce5546876aec63dee1c36526491513" }, + "mini.nvim": { "branch": "main", "commit": "9f8b92998a9964e03535c2c7e0708958e23e261a" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, + "neotest": { "branch": "master", "commit": "bbbfa55d850f1aaa6707ea85fb5230ac866459c6" }, "neotest-jest": { "branch": "main", "commit": "821bb227e31259307db30c88671a1c3724f78637" }, "neotest-vitest": { "branch": "main", "commit": "d6577b191e16c174bffbec1eadfcd65c22fdcc0d" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "1e46896d9096a878355cc5163624f4ae9217c5d6" }, - "noice.nvim": { "branch": "main", "commit": "c22651651da01239fc4afac4cdb7261797d5f02e" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "d9be19ad02edb98fc7f47f407415bf1285c43811" }, + "noice.nvim": { "branch": "main", "commit": "f8b1a72a7bce56d9e9ed054708dc855d57dec085" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "null-ls.nvim": { "branch": "main", "commit": "900c38cfa91eb7ff2716da70f2f2c1d33741cf0a" }, - "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, + "null-ls.nvim": { "branch": "main", "commit": "0180603b6f3cee40f83c6fc226b9ac5f85e691c4" }, + "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "75a94b8b577a970c0cad25a54a64dc40fc6fa0ea" }, + "nvim-dap": { "branch": "master", "commit": "7e81998e31277c7a33b6c34423640900c5c2c776" }, "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "f3e6c034d103e3476821af596a67df71d76f85a9" }, - "nvim-notify": { "branch": "master", "commit": "281e4d793c550c866bea3fb85d39de1f0188fb50" }, + "nvim-lspconfig": { "branch": "master", "commit": "c6105c449683b944b5d2138fcf82f18c657249e9" }, + "nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" }, "nvim-recorder": { "branch": "main", "commit": "89c1fb1139fac0a4b42faf54beaf363be104550b" }, - "nvim-scrollbar": { "branch": "main", "commit": "75210c554e935740448cfb532d8a671ae544bb1b" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "31d38d11390bcd35a568fcc65a79b7d6ec89de62" }, - "nvim-treesitter": { "branch": "master", "commit": "ba4bce9bb79f5a5fb2e7b5a6b9b4b0fb256f3db9" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "f5f13206ec33e55b16c8e1a9dec301e8bead4835" }, - "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, + "nvim-scrollbar": { "branch": "main", "commit": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943" }, + "nvim-toggleterm.lua": { "branch": "main", "commit": "9a595ba699837c4333c4296634feed320f084df2" }, + "nvim-treesitter": { "branch": "master", "commit": "87cf2abeb6077ac19a1249d0b06f223aa398a0a0" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "25698e4033cd6cd3745454bfc837dd670eba0480" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" }, - "nvim-ufo": { "branch": "main", "commit": "9e829d5cfa3de6a2ff561d86399772b0339ae49d" }, - "nvim-web-devicons": { "branch": "master", "commit": "4af94fec29f508159ceab5413383e5dedd6c24e3" }, - "persisted.nvim": { "branch": "main", "commit": "88f27dcab289b338eed5c3c8119481d9c9e7428f" }, + "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, + "persisted.nvim": { "branch": "main", "commit": "e053ff33488431dc5bf9239b08650e650ec67292" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "promise-async": { "branch": "main", "commit": "7fa127fa80e7d4d447e0e2c78e99af4355f4247b" }, "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" }, - "sniprun": { "branch": "master", "commit": "6511fd71e751ed80ea374ef096ec5187682241cd" }, + "sniprun": { "branch": "master", "commit": "562ccadf7ed93d6223564714cb2b57f1805f3e06" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, - "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, - "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" }, + "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" }, + "todo-comments.nvim": { "branch": "main", "commit": "14e2cd9a6e5e67483a03660f08471ca9a981c4a5" }, "translate.nvim": { "branch": "main", "commit": "7b2fd50c21ecfe536d572d62dcd3fa83acad3743" }, - "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, + "trouble.nvim": { "branch": "main", "commit": "7915277a259fdff5d46c6f1d2e100df2ec384d3b" }, "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" }, "vim-dadbod": { "branch": "master", "commit": "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f" }, "vim-dadbod-completion": { "branch": "master", "commit": "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1" }, - "vim-dadbod-ui": { "branch": "master", "commit": "caf45f54dad6150970331ac115e531524e418c7c" }, - "which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" } + "vim-dadbod-ui": { "branch": "master", "commit": "986324fa6372170ec47b28a5558ae7f7185e1d71" }, + "which-key.nvim": { "branch": "main", "commit": "87b1459b3e0be0340da2183fc4ec8a00b2960678" } } \ No newline at end of file diff --git a/configs/nvim/lua/max/configs/lsp.lua b/configs/nvim/lua/max/configs/lsp.lua index 8d75c82..18d456b 100644 --- a/configs/nvim/lua/max/configs/lsp.lua +++ b/configs/nvim/lua/max/configs/lsp.lua @@ -2,6 +2,16 @@ local mason = require("mason") local mason_lsp = require("mason-lspconfig") local lsp = require("lspconfig") +vim.lsp.handlers['textDocument/hover'] = vim.lsp.with( + vim.lsp.handlers.hover, + { border = 'single' } +) +vim.diagnostic.config({ + float = { + border = 'single', + }, +}) + local null_ls = require("null-ls") null_ls.setup({ sources = { @@ -140,7 +150,7 @@ custom_lsp.intelephense = { custom_lsp.rust_analyzer = { settings = { - ["rust-analyzer"] = { + ["rust-analyzer"] = { imports = { granularity = { group = "module", @@ -163,10 +173,10 @@ custom_lsp.yamlls = { settings = { yaml = { schemas = { - ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"] = "conf/**/*catalog*", - ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*", - ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2-file-provider.json"] = "rules.yml", - ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2.json"] = "traefik.yml", + ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"] = "conf/**/*catalog*", + ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*", + ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2-file-provider.json"] = "rules.yml", + ["https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/traefik-v2.json"] = "traefik.yml", }, }, }, @@ -182,7 +192,7 @@ custom_lsp.ltex = { language = "de", disabledRules = { ["en-US"] = { "PROFANITY" } }, dictionary = { - ["en-US"] = { "perf", "ci", "neovim" }, + ["en-US"] = { "perf", "ci", "neovim" }, }, hiddenFalsePositives = { "neovim", diff --git a/configs/nvim/lua/max/configs/toggleterm.lua b/configs/nvim/lua/max/configs/toggleterm.lua index 70021e4..81e9f1c 100644 --- a/configs/nvim/lua/max/configs/toggleterm.lua +++ b/configs/nvim/lua/max/configs/toggleterm.lua @@ -24,7 +24,7 @@ local pnpm = Terminal:new({ float_opts = { winblend = 0, padding = 10, - border = "shadow", + border = "single", }, on_close = function() Terminal:close() diff --git a/configs/nvim/lua/max/core/autocommands.lua b/configs/nvim/lua/max/core/autocommands.lua index dea41d2..0530742 100644 --- a/configs/nvim/lua/max/core/autocommands.lua +++ b/configs/nvim/lua/max/core/autocommands.lua @@ -26,6 +26,14 @@ autocmd({ "BufWinLeave" }, { group = save_fold, }) +autocmd({ "BufReadPost" }, { + pattern = "*.http", + callback = function() + vim.bo.filetype = "http" + end, + group = save_fold, +}) + autocmd({ "BufWinEnter" }, { pattern = "*.*", callback = function() diff --git a/configs/nvim/lua/max/core/keymappings.lua b/configs/nvim/lua/max/core/keymappings.lua index 038acf1..1d4a245 100644 --- a/configs/nvim/lua/max/core/keymappings.lua +++ b/configs/nvim/lua/max/core/keymappings.lua @@ -38,12 +38,13 @@ map("n", "li", ":LspInfo", opts) map("n", "lr", ":LspRestart", opts) -- This is my [i]nspect section, -map("n", "is", ":SymbolsOutline", opts) -- [i]nspect [s]ymbols -map("n", "io", ":Lspsaga outline", opts) -- [i]nspect [o]utline -map("n", "in", ":Telescope notify", opts) -- [i]nspect [n]otifications -map("n", "ip", ":TroubleToggle", opts) -- [i]nspect [p]roblems -map("n", "ii", ":Lspsaga incomming_calls", opts) --[i]nspect [i]ncomming_calls -map("n", "io", ":Lspsaga outgoing_calls", opts) --[i]nspect [o]utgoing_calls +map("n", "is", ":SymbolsOutline", opts) -- [i]nspect [s]ymbols +map("n", "ic", ":ColorizerToggle", opts) -- [i]nspect [c]olors +map("n", "io", ":Lspsaga outline", opts) -- [i]nspect [o]utline +map("n", "in", ":Telescope notify", opts) -- [i]nspect [n]otifications +map("n", "ip", ":TroubleToggle", opts) -- [i]nspect [p]roblems +map("n", "ii", ":Lspsaga incomming_calls", opts) -- [i]nspect [i]ncomming_calls +map("n", "io", ":Lspsaga outgoing_calls", opts) -- [i]nspect [o]utgoing_calls map({ "n", "v" }, "t", require("max.configs.translate"), opts) diff --git a/configs/nvim/lua/max/core/options.lua b/configs/nvim/lua/max/core/options.lua index 105b9f4..6dbd129 100644 --- a/configs/nvim/lua/max/core/options.lua +++ b/configs/nvim/lua/max/core/options.lua @@ -10,52 +10,59 @@ g.loaded_netrwSettings = 1 g.loaded_netrwFileHandlers = 1 g.loaded_netrw_gitignore = 1 -opt.autowrite = true -- Enable auto write -opt.clipboard = "unnamedplus" -- Sync with system clipboard +opt.autowrite = true -- Enable auto write +opt.clipboard = "unnamedplus" -- Sync with system clipboard opt.completeopt = "menu,menuone,noselect" -opt.conceallevel = 3 -- Hide * markup for bold and italic -opt.confirm = true -- Confirm to save changes before exiting modified buffer -opt.cursorline = true -- Enable highlighting of the current line -opt.expandtab = true -- Use spaces instead of tabs +opt.conceallevel = 3 -- Hide * markup for bold and italic +opt.confirm = true -- Confirm to save changes before exiting modified buffer +opt.cursorline = true -- Enable highlighting of the current line +opt.expandtab = true -- Use spaces instead of tabs opt.formatoptions = "jcroqlnt" -- tcqj opt.grepformat = "%f:%l:%c:%m" opt.grepprg = "rg --vimgrep" -opt.ignorecase = true -- Ignore case +opt.ignorecase = true -- Ignore case opt.inccommand = "nosplit" -- preview incremental substitute -opt.laststatus = 3 -- laststatus=3 enables global statusline -opt.list = false -- Show some invisible characters (tabs... -opt.mouse = "a" -- Enable mouse mode -opt.number = true -- Print line number -opt.pumblend = 10 -- Popup blend -opt.pumheight = 10 -- Maximum number of entries in a popup -opt.relativenumber = true -- Relative line numbers -opt.scrolloff = 4 -- Lines of context +opt.laststatus = 3 -- laststatus=3 enables global statusline +opt.list = false -- Show some invisible characters (tabs... +opt.mouse = "a" -- Enable mouse mode +opt.number = true -- Print line number +opt.pumblend = 10 -- Popup blend +opt.pumheight = 10 -- Maximum number of entries in a popup +opt.relativenumber = true -- Relative line numbers +opt.scrolloff = 4 -- Lines of context opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" } -opt.shiftround = true -- Round indent -opt.shiftwidth = 2 -- Size of an indent +opt.shiftround = true -- Round indent +opt.shiftwidth = 2 -- Size of an indent opt.shortmess:append { W = true, I = true, c = true } -opt.showmode = false -- Dont show mode since we have a statusline -opt.sidescrolloff = 8 -- Columns of context -opt.signcolumn = "no" -- Always show the signcolumn, otherwise it would shift the text each time -opt.smartcase = true -- Don't ignore case with capitals -opt.smartindent = true -- Insert indents automatically +opt.showmode = false -- Dont show mode since we have a statusline +opt.sidescrolloff = 8 -- Columns of context +opt.signcolumn = "no" -- Always show the signcolumn, otherwise it would shift the text each time +opt.smartcase = true -- Don't ignore case with capitals +opt.smartindent = true -- Insert indents automatically opt.spelllang = { "en" } -opt.splitbelow = true -- Put new windows below current -opt.splitright = true -- Put new windows right of current -opt.tabstop = 2 -- Number of spaces tabs count for -opt.termguicolors = true -- True color support +opt.splitbelow = true -- Put new windows below current +opt.splitright = true -- Put new windows right of current +opt.tabstop = 2 -- Number of spaces tabs count for +opt.termguicolors = true -- True color support opt.timeoutlen = 300 opt.undofile = true opt.undolevels = 10000 -opt.updatetime = 200 -- Save swap file and trigger CursorHold +opt.updatetime = 200 -- Save swap file and trigger CursorHold opt.wildmode = "longest:full,full" -- Command-line completion mode -opt.winminwidth = 5 -- Minimum window width -opt.wrap = false -- Disable line wrap +opt.winminwidth = 5 -- Minimum window width +opt.wrap = false -- Disable line wrap if vim.fn.has("nvim-0.9.0") == 1 then opt.splitkeep = "screen" opt.shortmess:append { C = true } end +function _G.CustomFoldText() + return vim.fn.getline(vim.v.foldstart) .. ' …' +end + +opt.fillchars = "fold: " +opt.foldtext = 'v:lua.CustomFoldText()' + -- Fix markdown indentation settings vim.g.markdown_recommended_style = 0 diff --git a/configs/nvim/lua/max/core/plugins.lua b/configs/nvim/lua/max/core/plugins.lua index a21c6a5..ae759ee 100644 --- a/configs/nvim/lua/max/core/plugins.lua +++ b/configs/nvim/lua/max/core/plugins.lua @@ -3,7 +3,14 @@ local plugins = { { dir = "~/Projects/sudoku.nvim", cmd = "Sudoku", - config = true + config = function() + require("sudoku").setup({ + custom_highlights = { + square = { fg = "red" } + } + }) + vim.cmd("hi SudokuSquare guibg=red") + end }, "nvim-lua/plenary.nvim", @@ -62,14 +69,26 @@ local plugins = { { "folke/noice.nvim", event = "VeryLazy", + enabled = true, opts = { lsp = { progress = { enabled = false }, - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, + hover = { + enabled = false + } + }, + views = { + cmdline_popup = { + border = { + style = "single", + padding = { 0, 1 }, + }, + filter_options = {}, + win_options = { + winhighlight = "NormalFloat:NormalFloat,FloatBorder:FloatBorder", + }, }, }, presets = { @@ -79,17 +98,6 @@ local plugins = { lsp_doc_border = true }, }, - keys = { - { "", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" }, - { "snl", function() require("noice").cmd("last") end, desc = "Noice Last Message" }, - { "snh", function() require("noice").cmd("history") end, desc = "Noice History" }, - { "sna", function() require("noice").cmd("all") end, desc = "Noice All" }, - }, - }, - { - "stevearc/dressing.nvim", - enabled = false, - lazy = true, }, { "folke/which-key.nvim", @@ -140,12 +148,6 @@ local plugins = { end, event = "VimEnter", }, - { - "kevinhwang91/nvim-ufo", - event = "BufReadPost", - dependencies = "kevinhwang91/promise-async", - config = require("max.configs.ufo"), - }, { "goolord/alpha-nvim", lazy = false, @@ -287,11 +289,11 @@ local plugins = { -------------------- { "rest-nvim/rest.nvim", - cmd = "RestNvim", + lazy = false, dependencies = { "nvim-lua/plenary.nvim" }, config = function() require("rest-nvim").setup({}) - end + end, }, { "chrisgrieser/nvim-recorder", @@ -370,7 +372,7 @@ local opts = { install = { colorscheme = { require("max.theme").name } }, change_detection = { enabled = true, -- automatically check for config file changes and reload the ui - notify = true, -- get a notification when changes are found + notify = true, -- get a notification when changes are found }, performance = { rtp = { diff --git a/configs/nvim/lua/max/theme/catpuccin.lua b/configs/nvim/lua/max/theme/catpuccin.lua index 24d62d1..08378e1 100644 --- a/configs/nvim/lua/max/theme/catpuccin.lua +++ b/configs/nvim/lua/max/theme/catpuccin.lua @@ -14,6 +14,11 @@ return { comments = { "italic" }, strings = { "italic" }, }, + custom_highlights = function() + return { + Folded = { bg = "#1d1e27" } + } + end, integrations = { gitsigns = true, telescope = true, diff --git a/configs/nvim/lua/max/theme/everblush.lua b/configs/nvim/lua/max/theme/everblush.lua new file mode 100644 index 0000000..ae8da60 --- /dev/null +++ b/configs/nvim/lua/max/theme/everblush.lua @@ -0,0 +1,7 @@ +return { + 'Everblush/nvim', + name = 'everblush', + opts = { + transparent_background = true, + } +}