diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index bf8e5a9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM jetpackio/devbox:latest - -# Installing your devbox project -WORKDIR /code -USER root:root -RUN mkdir -p /code && chown ${DEVBOX_USER}:${DEVBOX_USER} /code -USER ${DEVBOX_USER}:${DEVBOX_USER} -COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.json devbox.json -COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.lock devbox.lock - - - -RUN devbox run -- echo "Installed Packages." - -CMD ["devbox", "shell"] diff --git a/README.md b/README.md index dd13324..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,3 +0,0 @@ -# `prnk28/nvim` - -A custom configuration of AstroNvim for my own use. diff --git a/devbox.json b/devbox.json deleted file mode 100644 index 52f4d96..0000000 --- a/devbox.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.14.0/.schema/devbox.schema.json", - "packages": ["neovim@latest"], - "shell": { - "init_hook": [ - "echo 'Welcome to devbox!' > /dev/null" - ], - "scripts": { - "test": [ - "echo \"Error: no test specified\" && exit 1" - ] - } - } -} diff --git a/lazy-lock.json b/lazy-lock.json index f0c53cd..b91ae75 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,72 +1,84 @@ { - "AstroNvim": { "branch": "main", "commit": "1411df4d970e59f1b5721556a043c5c828daf5ad" }, + "AstroNvim": { "branch": "main", "commit": "c5e610f614e74c9dd9bf11760c4d0ad2c98c0abe" }, "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "SchemaStore.nvim": { "branch": "main", "commit": "171c54b58076c7454c40da4dfba1aab21171c143" }, - "aerial.nvim": { "branch": "master", "commit": "2204cf08791449a6a2fd2ef187a29112eeefd989" }, + "SchemaStore.nvim": { "branch": "main", "commit": "9bac14f8e4951ed57d32a6944d8e3969d50e4d67" }, + "aerial.nvim": { "branch": "master", "commit": "9ebc13583cff447f5493a63e99dfca526b3c3088" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "astrocommunity": { "branch": "main", "commit": "349bd30fbaa0168c6dc771682637a665db293fe5" }, + "astrocommunity": { "branch": "main", "commit": "f0ba61a2705de3fc62d61ed48805f8842cf90aeb" }, "astrocore": { "branch": "main", "commit": "44a3dc0bf1591022b2a6bc89dccdfac1be17bec9" }, "astrolsp": { "branch": "main", "commit": "909fbe64f3f87d089ff3777751261544557117cc" }, "astrotheme": { "branch": "main", "commit": "f12dcf64b1f9a05839c3ac2146f550f43bae9dab" }, "astroui": { "branch": "main", "commit": "eab4c97dbc6961980204e24d79700f7a3097a8d5" }, "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" }, - "blink.cmp": { "branch": "main", "commit": "dcda20d3aa345025699a920c45b0a0603551f41d" }, + "blink.cmp": { "branch": "main", "commit": "1c8d8e45d6fba3d11512f4762b1fdf906bffca42" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "cyberdream.nvim": { "branch": "main", "commit": "b02c977aaf0283a0ec7a0184e6a459366325c93b" }, + "cyberdream.nvim": { "branch": "main", "commit": "339a7b1293568405847b3627247da82a6030a852" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" }, + "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "gopher.nvim": { "branch": "main", "commit": "0ed14a40d9799ac8d92aaf9eb1cd9be22ffd6b14" }, "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" }, "heirline.nvim": { "branch": "master", "commit": "af3f441ea10f96105e1af14cd37bf213533812d2" }, "inc-rename.nvim": { "branch": "main", "commit": "f9b9e5b9a75074810f40881b7e254b5bbeaf122e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" }, + "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" }, + "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" }, + "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "09220b99d63d5363f219daa2785242ee5fddba7f" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "444aad7977ee713a4049e9d1dd9b377967d67a4c" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.basics": { "branch": "main", "commit": "e8fbcf96e4e8262d452ddc851acea6c50449fa79" }, "mini.bufremove": { "branch": "main", "commit": "bba1d8b413d37081756f59200b8cf756181e5b9a" }, - "neo-tree.nvim": { "branch": "main", "commit": "2a5c86bd61e6c60ab7c2cb029c5cf619e4ee0b3a" }, - "neoconf.nvim": { "branch": "main", "commit": "c215518f96a1058965fab3d1d3fd429b8b8fef1d" }, + "mini.clue": { "branch": "main", "commit": "08901d2223797aa25611c33aaf9d8a1049a653bb" }, + "neo-tree.nvim": { "branch": "main", "commit": "dda4c9e9a7806d72fab2c733462b9beb33a45714" }, + "neoconf.nvim": { "branch": "main", "commit": "367600076c04a8f6b8060f61de57299c8ff0a9c3" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, + "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, - "nvim-dap": { "branch": "master", "commit": "8228cb00ab0850e483f8d58cc39cc580c05738d6" }, + "nvim-dap": { "branch": "master", "commit": "6a5bba0ddea5d419a783e170c20988046376090d" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "84e0cd5a3c58e88ef706fdf4a1eed59ded1d3ce2" }, + "nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, - "nvim-rip-substitute": { "branch": "main", "commit": "ede145f6fc318dc0e15ed9a40d2a60112eaf0b5f" }, - "nvim-treesitter": { "branch": "master", "commit": "f22181a62c47bf591fbfd6ada7d9a1156278d6e0" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "8b2d4d519f3516d09910f5baf48d1a47b594f0ce" }, + "nvim-rip-substitute": { "branch": "main", "commit": "ddd3562bbd93b02eb43ddfe18af7438abe46dd98" }, + "nvim-surround": { "branch": "main", "commit": "6c54643ef42016b744888b06d2381abd23f9b7ea" }, + "nvim-treesitter": { "branch": "master", "commit": "5f38dffb6a07669a678f073bfe0f62b1a020dffc" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" }, "nvim-vtsls": { "branch": "main", "commit": "45c6dfea9f83a126e9bfc5dd63430562b3f8af16" }, - "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "overseer.nvim": { "branch": "master", "commit": "d95931e9e8cc4429819c8bbae395da00a6800d1e" }, "package-info.nvim": { "branch": "master", "commit": "3de4f3569ce60e248707df042b72769b3ec343b8" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "portal.nvim": { "branch": "main", "commit": "77d9d53fec945bfa407d5fd7120f1b4f117450ed" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "resession.nvim": { "branch": "master", "commit": "cc1cc9a4ed7e6f72057c265ba5cc711ec16c2cff" }, - "smart-splits.nvim": { "branch": "master", "commit": "baff41c382020e8b31037ca97a3339b310c23772" }, + "smart-splits.nvim": { "branch": "master", "commit": "096d23df87d5c430e6e96f3e99d67e360fb2097f" }, "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-lazy.nvim": { "branch": "main", "commit": "810f7859c98e88b9c4e45de16cb5317207c9b3e8" }, - "telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" }, + "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "toggleterm.nvim": { "branch": "main", "commit": "e76134e682c1a866e3dfcdaeb691eb7b01068668" }, - "tsc.nvim": { "branch": "main", "commit": "60c9b3e9610e24e147a928e30dd148ed9bb9f247" }, + "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, + "tsc.nvim": { "branch": "main", "commit": "5bd25bb5c399b6dc5c00392ade6ac6198534b53a" }, "vim-illuminate": { "branch": "master", "commit": "19cb21f513fc2b02f0c66be70107741e837516a1" }, + "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/community.lua b/lua/community.lua index 7403639..1fe8208 100644 --- a/lua/community.lua +++ b/lua/community.lua @@ -5,20 +5,38 @@ ---@type LazySpec return { "AstroNvim/astrocommunity", + { import = "astrocommunity.bars-and-lines.bufferline-nvim" }, + { import = "astrocommunity.code-runner.overseer-nvim" }, + { import = "astrocommunity.colorscheme.cyberdream-nvim" }, + { import = "astrocommunity.completion.blink-cmp" }, + { import = "astrocommunity.completion.supermaven-nvim" }, + { import = "astrocommunity.keybinding.mini-clue" }, + { import = "astrocommunity.lsp.inc-rename-nvim" }, + { import = "astrocommunity.lsp.lsp-inlayhints-nvim" }, + { import = "astrocommunity.lsp.lsp-lens-nvim" }, + { import = "astrocommunity.lsp.nvim-lsp-file-operations" }, + { import = "astrocommunity.motion.flash-nvim" }, + { import = "astrocommunity.motion.leap-nvim" }, + { import = "astrocommunity.motion.mini-basics" }, + { import = "astrocommunity.motion.nvim-surround" }, + { import = "astrocommunity.motion.portal-nvim" }, { import = "astrocommunity.pack.docker" }, { import = "astrocommunity.pack.lua" }, { import = "astrocommunity.pack.go" }, { import = "astrocommunity.pack.markdown" }, + { import = "astrocommunity.pack.mdx" }, { import = "astrocommunity.pack.templ" }, { import = "astrocommunity.pack.tailwindcss" }, { import = "astrocommunity.pack.typescript" }, { import = "astrocommunity.pack.yaml" }, - { import = "astrocommunity.code-runner.overseer-nvim" }, - { import = "astrocommunity.lsp.inc-rename-nvim" }, - { import = "astrocommunity.lsp.nvim-lsp-file-operations" }, - { import = "astrocommunity.bars-and-lines.bufferline-nvim" }, - { import = "astrocommunity.colorscheme.cyberdream-nvim" }, { import = "astrocommunity.utility.telescope-lazy-nvim" }, - { import = "astrocommunity.completion.supermaven-nvim" }, - { import = "astrocommunity.completion.blink-cmp" }, + { import = "astrocommunity.utility.telescope-fzy-native-nvim" }, + { import = "astrocommunity.utility.mason-tool-installer-nvim" }, + { import = "astrocommunity.utility.noice-nvim" }, + { import = "astrocommunity.recipes.ai" }, + { import = "astrocommunity.recipes.astrolsp-auto-signature-help" }, + { import = "astrocommunity.recipes.heirline-nvchad-statusline" }, + { import = "astrocommunity.recipes.heirline-vscode-winbar" }, + { import = "astrocommunity.recipes.picker-lsp-mappings" }, + { import = "astrocommunity.recipes.telescope-lsp-mappings" }, } diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index b21ec8d..d92d8c6 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -16,7 +16,14 @@ return { detector = { "lsp", -- highest priority is getting workspace from running language servers { ".git", "_darcs", ".hg", ".bzr", ".svn" }, -- next check for a version controlled parent directory - { "lua", "go.mod", "package.json", "Cargo.toml", "go.work", "Pipfile", "Makefile", "requirements.txt" }, -- lastly check for a file named `main` + { + "lua", + "Cargo.toml", + "go.work", + "Pipfile", + "Makefile", + "requirements.txt", + }, -- lastly check for a file named `main` }, -- ignore things from root detection ignore = { @@ -26,7 +33,7 @@ return { -- automatically update working directory (update manually with `:AstroRoot`) autochdir = true, -- scope of working directory to change ("global"|"tab"|"win") - scope = "tab", + scope = "tab", -- Changed from "win" to "global" to make directory changes apply globally -- show notification on every working directory change notify = false, }, diff --git a/lua/plugins/astrolsp.lua b/lua/plugins/astrolsp.lua new file mode 100644 index 0000000..dd1055b --- /dev/null +++ b/lua/plugins/astrolsp.lua @@ -0,0 +1,15 @@ +return { + "AstroNvim/astrolsp", + ---@type AstroLSPOpts + opts = { + formatting = { + format_on_save = { + enabled = true, -- enable or disable + ignore_filetypes = { -- disable format on save for specified filetypes + "markdown", + "python", + }, + }, + }, + }, +} diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 7d4559e..2dee4ba 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -9,13 +9,48 @@ return { auto_expand_width = true, git_status_async = true, -- Asynchronous git status. Improves performance. hide_root_node = true, -- Hide the root node. - retain_hidden_root_indent = false, -- IF the root node is hidden, keep the indentation anyhow. + retain_hidden_root_indent = true, -- IF the root node is hidden, keep the indentation anyhow. + + -- Add custom title function to show host/org/repo + window = { + position = "left", + width = 40, + title = function() + -- Get current working directory + local cwd = vim.fn.getcwd() + + -- Extract host/org/repo from path (assuming ghq structure) + -- This pattern looks for Code/host.com/org/repo in the path + local pattern = ".*/Code/([^/]+/[^/]+/[^/]+)" + local match = string.match(cwd, pattern) + + if match then + return match + else + return "SonrVim" + end + end, + mappings = { + [""] = "navigate_up", + [">"] = "set_root", + ["."] = "toggle_hidden", + ["/"] = "fuzzy_finder", + ["f"] = "filter_on_submit", + [""] = "clear_filter", + [""] = "open_and_close_neotree", + [""] = "open", + }, + header = { + highlight = "NeoTreeHeader", + }, + }, + default_component_configs = { container = { enable_character_fade = true, }, indent = { - indent_size = 1, + indent_size = 2, padding = 1, -- extra padding on left hand side -- indent guides with_markers = true, @@ -23,8 +58,8 @@ return { last_indent_marker = "└", highlight = "NeoTreeIndentMarker", -- expander config, needed for nesting files - expander_collapsed = "", - expander_expanded = "", + expander_collapsed = "", + expander_expanded = "", expander_highlight = "NeoTreeExpander", }, name = { @@ -36,15 +71,15 @@ return { symbols = { -- Change type added = "", -- or "✚", but this is redundant info if you use git_status_colors on the name - modified = "", -- or "", but this is redundant info if you use git_status_colors on the name + modified = "", -- or "", but this is redundant info if you use git_status_colors on the name deleted = "✖", -- this can only be used in the git_status source renamed = "󰁕", -- this can only be used in the git_status source -- Status type - untracked = "", - ignored = "", + untracked = "", + ignored = "", unstaged = "󰄱", - staged = "", - conflict = "", + staged = "", + conflict = "", }, }, -- If you don't want to use these columns, you can set `enabled = false` for each of them individually @@ -72,25 +107,11 @@ return { enabled = false, }, }, - -- Simplified default component configs - window = { - mappings = { - [""] = "navigate_up", - [">"] = "set_root", - ["."] = "toggle_hidden", - ["/"] = "fuzzy_finder", - ["f"] = "filter_on_submit", - [""] = "clear_filter", - [""] = "open_and_close_neotree", - [""] = "open", - }, - header = { - highlight = "NeoTreeHeader", - }, - }, buffers = { - follow_current_file = true, + follow_current_file = { + enabled = true, + }, }, -- Filesystem specific settings @@ -110,7 +131,7 @@ return { }, bind_to_cwd = true, follow_current_file = { - enabled = true, + enabled = false, leave_dirs_open = true, }, filtered_items = { @@ -120,23 +141,24 @@ return { hide_dotfiles = false, hide_gitignored = true, hide_by_pattern = { + ".cz.toml", "dist", ".python-version", "*_test.go", "*.pb.go", "*_templ.go", "buf.gen.*", - "mprocs.*", "*config.*.js", "*config.js", "deps.mjs", "test_*.go", ".trunk", + ".config", }, hide_by_name = { ".github", + "settings.json", ".taskfiles", - "types", ".gitignore", "analysis_options.yaml", "decorators", @@ -146,14 +168,19 @@ return { "package-lock.json", ".husky", "translations", - "test", - "networks", - "go.mod", "LICENSE.md", - "CONTRIBUTING.md", + "node_modules", + ".tmuxinator.yml", + ".envrc", + ".taskfile.dist.yml", }, never_show_by_pattern = { "PULL_REQUEST_TEMPLATE.md", + ".DocumentRevisions-V100", + ".Spotlight-V100", + ".TemporaryItems", + ".Trashes", + ".fseventsd", ".trunk", ".editorconfig", ".eslint*", @@ -185,18 +212,6 @@ return { ".idea", ".metadata", ".venv", - "zkp", - "ted25519", - "dkg", - "ecies", - "ot", - "paillier", - "sharing", - "signatures", - "subtle", - "bulletproof", - "dkg", - "daed", ".gradle", "gradle.bat", ".aider.chat.history.md", @@ -205,29 +220,26 @@ return { ".devcontainer", "heighliner", ".tmp", - ".zed", - ".vscode", "go.work.sum", ".DS_Store", ".git", "LICENSE", - "interchaintest", - ".envrc", "tmp", "sonr.log", "DISCUSSION_TEMPLATE", "ISSUE_TEMPLATE", + ".devbox", + ".timemachine", }, }, }, - diagnostics = { enable = true, icons = { - hint = "", - info = "", - warning = "", - error = "", + hint = "", + info = "", + warning = "", + error = "", }, }, diff --git a/lua/plugins/supermaven.lua b/lua/plugins/supermaven.lua new file mode 100644 index 0000000..fdcbd02 --- /dev/null +++ b/lua/plugins/supermaven.lua @@ -0,0 +1,29 @@ +return { + "supermaven-inc/supermaven-nvim", + event = "InsertEnter", + cmd = { "SupermavenUseFree", "SupermavenUsePro" }, + opts = { + keymaps = { + accept_suggestion = nil, -- handled by completion engine + }, + }, + specs = { + { + "AstroNvim/astrocore", + opts = { + options = { + g = { + -- set the ai_accept function + ai_accept = function() + local suggestion = require "supermaven-nvim.completion_preview" + if suggestion.has_suggestion() then + vim.schedule(function() suggestion.on_accept_suggestion() end) + return true + end + end, + }, + }, + }, + }, + }, +} diff --git a/lua/polish.lua b/lua/polish.lua index 5b04c81..3cfdbe3 100644 --- a/lua/polish.lua +++ b/lua/polish.lua @@ -17,32 +17,8 @@ require("overseer").setup { size = vim.o.columns * 0.25, auto_scroll = true, close_on_exit = false, - quit_on_exit = "success", + quit_on_exit = "never", open_on_start = true, hidden = true, }, } - -require("lspconfig").jsonls.setup { - settings = { - json = { - schemas = require("schemastore").json.schemas(), - validate = { enable = true }, - }, - }, -} - -require("lspconfig").yamlls.setup { - settings = { - yaml = { - schemaStore = { - -- You must disable built-in schemaStore support if you want to use - -- this plugin and its advanced options like `ignore`. - enable = false, - -- Avoid TypeError: Cannot read properties of undefined (reading 'length') - url = "", - }, - schemas = require("schemastore").yaml.schemas(), - }, - }, -}