From b93c065ff438eb84622d323dd764098f93d57270 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 11 Apr 2024 08:04:03 +0100 Subject: [PATCH] copy over most settings from v3 --- lua/community.lua | 60 ++++++++++++++++++++++++++++- lua/plugins/astrocore.lua | 8 ++-- lua/plugins/astrolsp.lua | 2 +- lua/plugins/astroui.lua | 3 +- lua/plugins/mason.lua | 2 +- lua/plugins/none-ls.lua | 2 +- lua/plugins/silicon.lua | 18 +++++++++ lua/plugins/treesitter.lua | 2 +- lua/plugins/ts-error-translator.lua | 3 ++ lua/plugins/user.lua | 2 +- lua/polish.lua | 2 +- 11 files changed, 93 insertions(+), 11 deletions(-) create mode 100644 lua/plugins/silicon.lua create mode 100644 lua/plugins/ts-error-translator.lua diff --git a/lua/community.lua b/lua/community.lua index c842899..885bcbb 100644 --- a/lua/community.lua +++ b/lua/community.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- AstroCommunity: import any community modules here -- We import this file in `lazy_setup.lua` before the `plugins/` folder. @@ -9,4 +9,62 @@ return { "AstroNvim/astrocommunity", { import = "astrocommunity.pack.lua" }, -- import/override with your plugins folder + + -- colorscheme + { import = "astrocommunity.colorscheme.everforest" }, + + -- completion + -- { import = "astrocommunity.completion.codeium-vim" }, + -- { import = "astrocommunity.completion.copilot-lua-cmp" }, + + -- diagnostics + { import = "astrocommunity.diagnostics.lsp_lines-nvim" }, + { import = "astrocommunity.diagnostics.trouble-nvim" }, + + -- editing-support + { import = "astrocommunity.editing-support.treesj" }, + { import = "astrocommunity.editing-support.todo-comments-nvim" }, + { import = "astrocommunity.editing-support.rainbow-delimiters-nvim" }, + { import = "astrocommunity.editing-support.auto-save-nvim" }, + { import = "astrocommunity.editing-support.refactoring-nvim" }, + -- { import = "astrocommunity.editing-support.wildfire-nvim" }, -- Vim:E523: Not allowed here broken @1729fac - Aug 21, 2023 - https://github.com/SUSTech-data/wildfire.nvim/commits/master/ + + -- file-explorer + { import = "astrocommunity.file-explorer.oil-nvim" }, + + -- git + -- { import = "astrocommunity.git.neogit" }, + + -- lsp + { import = "astrocommunity.lsp.inc-rename-nvim" }, + { import = "astrocommunity.lsp.lsp-inlayhints-nvim" }, + { import = "astrocommunity.lsp.lsp-signature-nvim" }, + + -- motion + { import = "astrocommunity.motion.flash-nvim" }, + { import = "astrocommunity.motion.hop-nvim" }, + + -- pack + { import = "astrocommunity.pack.bash" }, + { import = "astrocommunity.pack.docker" }, + { import = "astrocommunity.pack.full-dadbod" }, + { import = "astrocommunity.pack.html-css" }, + { import = "astrocommunity.pack.json" }, + { import = "astrocommunity.pack.java" }, + { import = "astrocommunity.pack.markdown" }, + -- { import = "astrocommunity.pack.python" }, + { import = "astrocommunity.pack.rust" }, + -- { import = "astrocommunity.pack.terraform" }, + { import = "astrocommunity.pack.typescript-all-in-one" }, + { import = "astrocommunity.pack.yaml" }, + + -- scrolling + { import = "astrocommunity.scrolling.nvim-scrollbar" }, + + -- test + -- { import = "astrocommunity.test.neotest" }, + -- { import = "astrocommunity.test.nvim-coverage" }, + + -- workflow + { import = "astrocommunity.workflow.hardtime-nvim" }, } diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index c99b395..518bfa7 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- AstroCore provides a central place to modify mappings, vim options, autocommands, and more! -- Configuration documentation can be found with `:h astrocore` @@ -43,7 +43,7 @@ return { -- NOTE: keycodes follow the casing in the vimdocs. For example, `` must be capitalized mappings = { -- first key is the mode - n = { + n = { -- normal mode -- second key is the lefthand side of the map -- navigate buffer tabs with `H` and `L` @@ -65,10 +65,12 @@ return { -- quick save -- [""] = { ":w!", desc = "Save File" }, -- change description but the same command }, - t = { + t = { -- terminal mode -- setting a mapping to false will disable it -- [""] = false, }, + -- i - insert mode + -- v - visual mode }, }, } diff --git a/lua/plugins/astrolsp.lua b/lua/plugins/astrolsp.lua index 3d5f7ff..1125404 100644 --- a/lua/plugins/astrolsp.lua +++ b/lua/plugins/astrolsp.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine -- Configuration documentation can be found with `:h astrolsp` diff --git a/lua/plugins/astroui.lua b/lua/plugins/astroui.lua index 2080aa9..7f8da7b 100644 --- a/lua/plugins/astroui.lua +++ b/lua/plugins/astroui.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- AstroUI provides the basis for configuring the AstroNvim User Interface -- Configuration documentation can be found with `:h astroui` @@ -12,6 +12,7 @@ return { opts = { -- change colorscheme colorscheme = "astrodark", + -- colorscheme = "everforest", -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes highlights = { init = { -- this table overrides highlights in all themes diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index 634840f..ba5e697 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- Customize Mason plugins diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index 382368d..714376a 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- Customize None-ls sources diff --git a/lua/plugins/silicon.lua b/lua/plugins/silicon.lua new file mode 100644 index 0000000..805a8be --- /dev/null +++ b/lua/plugins/silicon.lua @@ -0,0 +1,18 @@ +return { + "michaelrommel/nvim-silicon", + lazy = true, + cmd = "Silicon", + keys = { + { "sc", ":Silicon", desc = "Snapshot code block", mode = { "v" } } + }, + config = function() + require("silicon").setup({ + -- Configuration here, or leave empty to use defaults + font = "VictorMono Nerd Font Mono=34;Noto Color Emoji=34", + theme = "Dracula", + window_title = function() + return vim.fn.fnamemodify(vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf()), ":t") + end, + }) + end +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 0e8d2f7..92afa6a 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- Customize Treesitter diff --git a/lua/plugins/ts-error-translator.lua b/lua/plugins/ts-error-translator.lua new file mode 100644 index 0000000..5fbcc8e --- /dev/null +++ b/lua/plugins/ts-error-translator.lua @@ -0,0 +1,3 @@ +return { + { "dmmulroy/ts-error-translator.nvim" }, +} diff --git a/lua/plugins/user.lua b/lua/plugins/user.lua index 121089e..22efa89 100644 --- a/lua/plugins/user.lua +++ b/lua/plugins/user.lua @@ -1,4 +1,4 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- You can also add or configure plugins by creating files in this `plugins/` folder -- Here are some examples: diff --git a/lua/polish.lua b/lua/polish.lua index 14c38cd..75248a3 100644 --- a/lua/polish.lua +++ b/lua/polish.lua @@ -1,4 +1,4 @@ -if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE +-- if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE -- This will run last in the setup process and is a good place to configure -- things like custom filetypes. This just pure lua so anything that doesn't