commit aac7f99b0517578c10cf6fc8afa942d5834fd619 Author: Micah Halter Date: Sat Jan 14 14:16:59 2023 -0500 feat: initial push with a fully separated and organized user configuration for AstroNvim v3 diff --git a/.stylua.toml b/.stylua.toml new file mode 100644 index 0000000..bfcffff --- /dev/null +++ b/.stylua.toml @@ -0,0 +1,7 @@ +column_width = 120 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferDouble" +call_parentheses = "None" +collapse_simple_statement = "Always" diff --git a/astronvim_theme/colors.lua b/astronvim_theme/colors.lua new file mode 100644 index 0000000..2355391 --- /dev/null +++ b/astronvim_theme/colors.lua @@ -0,0 +1,5 @@ +-- Modify the color palette for the default theme +return { + fg = "#abb2bf", + bg = "#1e222a", +} diff --git a/astronvim_theme/highlights.lua b/astronvim_theme/highlights.lua new file mode 100644 index 0000000..80e715e --- /dev/null +++ b/astronvim_theme/highlights.lua @@ -0,0 +1,11 @@ +local C = require "astronvim_theme.colors" +-- modify the astronvim colors of the astronvim colorscheme directly when it's created +return { + Normal = { fg = C.fg, bg = C.bg }, + + -- customize styles of highlight groups + -- DiagnosticError = { italic = true }, + -- DiagnosticHint = { italic = true }, + -- DiagnosticInfo = { italic = true }, + -- DiagnosticWarn = { italic = true }, +} diff --git a/astronvim_theme/plugins.lua b/astronvim_theme/plugins.lua new file mode 100644 index 0000000..f45adaa --- /dev/null +++ b/astronvim_theme/plugins.lua @@ -0,0 +1,22 @@ +-- enable or disable highlighting for extra plugins in the astronvim theme +return { + aerial = true, + beacon = false, + bufferline = false, + cmp = true, + dashboard = true, + highlighturl = true, + hop = false, + indent_blankline = true, + lightspeed = false, + ["neo-tree"] = true, + notify = true, + ["nvim-tree"] = false, + ["nvim-web-devicons"] = true, + rainbow = true, + symbols_outline = false, + telescope = true, + treesitter = true, + vimwiki = false, + ["which-key"] = true, +} diff --git a/colorscheme.lua b/colorscheme.lua new file mode 100644 index 0000000..a893d37 --- /dev/null +++ b/colorscheme.lua @@ -0,0 +1,2 @@ +-- Set colorscheme to use +return "astronvim" diff --git a/diagnostics.lua b/diagnostics.lua new file mode 100644 index 0000000..247e909 --- /dev/null +++ b/diagnostics.lua @@ -0,0 +1,5 @@ +-- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on +return { + virtual_text = true, + underline = true, +} diff --git a/heirline/attributes.lua b/heirline/attributes.lua new file mode 100644 index 0000000..75f0945 --- /dev/null +++ b/heirline/attributes.lua @@ -0,0 +1,5 @@ +-- Customize attributes of highlighting in Heirline components +return { + -- styling choices for each heirline element, check possible attributes with `:h attr-list` + git_branch = { bold = true }, -- bold the git branch statusline component +} diff --git a/heirline/colors.lua b/heirline/colors.lua new file mode 100644 index 0000000..e9d6417 --- /dev/null +++ b/heirline/colors.lua @@ -0,0 +1,5 @@ +-- Customize colors for each element each element has a `_fg` and a `_bg` +return function(colors) + colors.git_branch_fg = astronvim.get_hlgroup "Conditional" + return colors +end diff --git a/heirline/icon_highlights.lua b/heirline/icon_highlights.lua new file mode 100644 index 0000000..0867580 --- /dev/null +++ b/heirline/icon_highlights.lua @@ -0,0 +1,9 @@ +-- Customize if icons should be highlighted +return { + breadcrumbs = false, -- LSP symbols in the breadcrumbs + file_icon = { + winbar = false, -- Filetype icon in the winbar inactive windows + statusline = true, -- Filetype icon in the statusline + tabline = true, -- Filetype icon in the tabline + }, +} diff --git a/heirline/separators.lua b/heirline/separators.lua new file mode 100644 index 0000000..340de0f --- /dev/null +++ b/heirline/separators.lua @@ -0,0 +1,5 @@ +-- Customize different separators between sections +return { + breadcrumbs = " > ", + tab = { "", "" }, +} diff --git a/highlights/duskfox.lua b/highlights/duskfox.lua new file mode 100644 index 0000000..31318ee --- /dev/null +++ b/highlights/duskfox.lua @@ -0,0 +1,3 @@ +return { -- a table of overrides/changes to the duskfox theme + Normal = { bg = "#000000" }, +} diff --git a/highlights/init.lua b/highlights/init.lua new file mode 100644 index 0000000..f7e055b --- /dev/null +++ b/highlights/init.lua @@ -0,0 +1,3 @@ +return { -- this table overrides highlights in all themes + -- Normal = { bg = "#000000" }, +} diff --git a/lazy.lua b/lazy.lua new file mode 100644 index 0000000..63d0c8e --- /dev/null +++ b/lazy.lua @@ -0,0 +1,10 @@ +-- Configure require("lazy").setup() options +return { + defaults = { lazy = true }, + performance = { + rtp = { + -- customize default disabled vim plugins + disabled_plugins = { "tohtml", "gzip", "matchit", "zipPlugin", "netrwPlugin", "tarPlugin", "matchparen" }, + }, + }, +} diff --git a/lsp/config/yamlls.lua b/lsp/config/yamlls.lua new file mode 100644 index 0000000..83a7685 --- /dev/null +++ b/lsp/config/yamlls.lua @@ -0,0 +1,12 @@ +-- example for addings schemas to yamlls +return { -- override table for require("lspconfig").yamlls.setup({...}) + settings = { + yaml = { + schemas = { + ["http://json.schemastore.org/github-workflow"] = ".github/workflows/*.{yml,yaml}", + ["http://json.schemastore.org/github-action"] = ".github/action.{yml,yaml}", + ["http://json.schemastore.org/ansible-stable-2.9"] = "roles/tasks/*.{yml,yaml}", + }, + }, + }, +} diff --git a/lsp/formatting.lua b/lsp/formatting.lua new file mode 100644 index 0000000..6035b20 --- /dev/null +++ b/lsp/formatting.lua @@ -0,0 +1,20 @@ +-- customize lsp formatting options +return { + -- control auto formatting on save + format_on_save = { + enabled = true, -- enable or disable format on save globally + allow_filetypes = { -- enable format on save for specified filetypes only + -- "go", + }, + ignore_filetypes = { -- disable format on save for specified filetypes + -- "python", + }, + }, + disabled = { -- disable formatting capabilities for the listed language servers + -- "sumneko_lua", + }, + timeout_ms = 1000, -- default format timeout + -- filter = function(client) -- fully override the default formatting function + -- return true + -- end +} diff --git a/lsp/mappings.lua b/lsp/mappings.lua new file mode 100644 index 0000000..1d2d6ef --- /dev/null +++ b/lsp/mappings.lua @@ -0,0 +1,6 @@ +-- easily add or disable built in mappings added during LSP attaching +return { + n = { + -- ["lf"] = false -- disable formatting keymap + }, +} diff --git a/lsp/mason.lua b/lsp/mason.lua new file mode 100644 index 0000000..b7b99a6 --- /dev/null +++ b/lsp/mason.lua @@ -0,0 +1,26 @@ +-- customize mason plugins +return { + -- use mason-lspconfig to configure LSP installations + { + "williamboman/mason-lspconfig.nvim", + -- overrides `require("mason-lspconfig").setup(...)` + opts = { + -- ensure_installed = { "sumneko_lua" }, + }, + }, + -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources + { + "jay-babu/mason-null-ls.nvim", + -- overrides `require("mason-null-ls").setup(...)` + opts = { + -- ensure_installed = { "prettier", "stylua" }, + }, + }, + { + "jay-babu/mason-nvim-dap.nvim", + -- overrides `require("mason-nvim-dap").setup(...)` + opts = { + -- ensure_installed = { "python" }, + }, + }, +} diff --git a/lsp/servers.lua b/lsp/servers.lua new file mode 100644 index 0000000..eac00b1 --- /dev/null +++ b/lsp/servers.lua @@ -0,0 +1,4 @@ +-- enable servers that you already have installed without mason +return { + -- "pyright" +} diff --git a/lsp/setup_handlers.lua b/lsp/setup_handlers.lua new file mode 100644 index 0000000..f96f4b4 --- /dev/null +++ b/lsp/setup_handlers.lua @@ -0,0 +1,10 @@ +-- override the LSP setup handler function based on server name +return { + -- first function changes the default setup handler + function(server, opts) require("lspconfig")[server].setup(opts) end, + -- keys for a specific server name will be used for that LSP + sumneko_lua = function(server, opts) + -- custom sumneko_lua setup handler + require("lspconfig")["sumneko_lua"].setup(opts) + end, +} diff --git a/mappings.lua b/mappings.lua new file mode 100644 index 0000000..755c50b --- /dev/null +++ b/mappings.lua @@ -0,0 +1,25 @@ +-- Mapping data with "desc" stored directly by vim.keymap.set(). +-- +-- Please use this mappings table to set keyboard mapping since this is the +-- lower level configuration and more robust one. (which-key will +-- automatically pick-up stored data by this setting.) +return { + -- first key is the mode + n = { + -- second key is the lefthand side of the map + -- mappings seen under group name "Buffer" + ["bb"] = { "tabnew", desc = "New tab" }, + ["bc"] = { "BufferLinePickClose", desc = "Pick to close" }, + ["bj"] = { "BufferLinePick", desc = "Pick to jump" }, + ["bt"] = { "BufferLineSortByTabs", desc = "Sort by tabs" }, + -- tables with the `name` key will be registered with which-key if it's installed + -- this is useful for naming menus + ["b"] = { name = "Buffers" }, + -- quick save + -- [""] = { ":w!", desc = "Save File" }, -- change description but the same command + }, + t = { + -- setting a mapping to false will disable it + -- [""] = false, + }, +} diff --git a/options.lua b/options.lua new file mode 100644 index 0000000..99c122d --- /dev/null +++ b/options.lua @@ -0,0 +1,21 @@ +-- set vim options here (vim.. = value) +return { + opt = { + -- set to true or false etc. + relativenumber = true, -- sets vim.opt.relativenumber + number = true, -- sets vim.opt.number + spell = false, -- sets vim.opt.spell + signcolumn = "auto", -- sets vim.opt.signcolumn to auto + wrap = false, -- sets vim.opt.wrap + }, + g = { + mapleader = " ", -- sets vim.g.mapleader + autoformat_enabled = true, -- enable or disable auto formatting at start (lsp.formatting.format_on_save must be enabled) + cmp_enabled = true, -- enable completion at start + autopairs_enabled = true, -- enable autopairs at start + diagnostics_enabled = true, -- enable diagnostics at start + status_diagnostics_enabled = true, -- enable diagnostics in statusline + icons_enabled = true, -- disable icons in the UI (disable if no nerd font is available, requires :PackerSync after changing) + ui_notifications_enabled = true, -- disable notifications when toggling UI elements + }, +} diff --git a/plugins/alpha.lua b/plugins/alpha.lua new file mode 100644 index 0000000..3a8cdc9 --- /dev/null +++ b/plugins/alpha.lua @@ -0,0 +1,21 @@ +-- customize alpha options +return { + "goolord/alpha-nvim", + opts = function(_, opts) + -- customize the dashboard header + opts.section.header.val = { + " █████ ███████ ████████ ██████ ██████", + "██ ██ ██ ██ ██ ██ ██ ██", + "███████ ███████ ██ ██████ ██ ██", + "██ ██ ██ ██ ██ ██ ██ ██", + "██ ██ ███████ ██ ██ ██ ██████", + " ", + " ███  ██ ██  ██ ██ ███  ███", + " ████  ██ ██  ██ ██ ████  ████", + " ██ ██  ██ ██  ██ ██ ██ ████ ██", + " ██  ██ ██  ██  ██  ██ ██  ██  ██", + " ██   ████   ████   ██ ██      ██", + } + return opts + end, +} diff --git a/plugins/core.lua b/plugins/core.lua new file mode 100644 index 0000000..9700fc1 --- /dev/null +++ b/plugins/core.lua @@ -0,0 +1,56 @@ +return { + -- You can disable default plugins as follows: + -- { "max397574/better-escape.nvim", enabled = false }, + -- + -- You can also easily customize additional setup of plugins that is outside of the plugin's setup call + -- { + -- "L3MON4D3/LuaSnip", + -- config = function(plugin, opts) + -- plugin.default_config(opts) -- include the default astronvim config that calls the setup call + -- -- add more custom luasnip configuration such as filetype extend or custom snippets + -- local luasnip = require "luasnip" + -- luasnip.filetype_extend("javascript", { "javascriptreact" }) + -- end, + -- }, + -- { + -- "windwp/nvim-autopairs", + -- config = function(plugin, opts) + -- plugin.default_config(opts) -- include the default astronvim config that calls the setup call + -- -- add more custom autopairs configuration such as custom rules + -- local npairs = require "nvim-autopairs" + -- local Rule = require "nvim-autopairs.rule" + -- local cond = require "nvim-autopairs.conds" + -- npairs.add_rules( + -- { + -- Rule("$", "$", { "tex", "latex" }) + -- -- don't add a pair if the next character is % + -- :with_pair(cond.not_after_regex "%%") + -- -- don't add a pair if the previous character is xxx + -- :with_pair( + -- cond.not_before_regex("xxx", 3) + -- ) + -- -- don't move right when repeat character + -- :with_move(cond.none()) + -- -- don't delete if the next character is xx + -- :with_del(cond.not_after_regex "xx") + -- -- disable adding a newline when you press + -- :with_cr(cond.none()), + -- }, + -- -- disable for .vim files, but it work for another filetypes + -- Rule("a", "a", "-vim") + -- ) + -- end, + -- }, + -- By adding to the which-key config and using our helper function you can add more which-key registered bindings + -- { + -- "folke/which-key.nvim", + -- config = function(plugin, opts) + -- plugin.default_config(opts) + -- -- Add bindings which show up as group name + -- local wk = require "which-key" + -- wk.register({ + -- b = { name = "Buffer" }, + -- }, { mode = "n", prefix = "" }) + -- end, + -- }, +} diff --git a/plugins/null-ls.lua b/plugins/null-ls.lua new file mode 100644 index 0000000..beceeda --- /dev/null +++ b/plugins/null-ls.lua @@ -0,0 +1,17 @@ +return { + "jose-elias-alvarez/null-ls.nvim", + opts = function(_, config) + -- config variable is the default configuration table for the setup function call + -- local null_ls = require "null-ls" + + -- Check supported formatters and linters + -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting + -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics + config.sources = { + -- Set a formatter + -- null_ls.builtins.formatting.stylua, + -- null_ls.builtins.formatting.prettier, + } + return config -- return final config table + end, +} diff --git a/plugins/treesitter.lua b/plugins/treesitter.lua new file mode 100644 index 0000000..092d7a8 --- /dev/null +++ b/plugins/treesitter.lua @@ -0,0 +1,6 @@ +return { + "nvim-treesitter/nvim-treesitter", + opts = { + -- ensure_installed = { "lua" }, + }, +} diff --git a/plugins/user.lua b/plugins/user.lua new file mode 100644 index 0000000..acdbf63 --- /dev/null +++ b/plugins/user.lua @@ -0,0 +1,12 @@ +return { + -- You can also add new plugins here as well: + -- Add plugins, the lazy syntax + -- "andweeb/presence.nvim", + -- { + -- "ray-x/lsp_signature.nvim", + -- event = "BufRead", + -- config = function() + -- require("lsp_signature").setup() + -- end, + -- }, +} diff --git a/polish.lua b/polish.lua new file mode 100644 index 0000000..b4fa4de --- /dev/null +++ b/polish.lua @@ -0,0 +1,17 @@ +-- This function is run last and is a good place to configuring +-- augroups/autocommands and custom filetypes also this just pure lua so +-- anything that doesn't fit in the normal config locations above can go here +return function() + -- Set up custom filetypes + -- vim.filetype.add { + -- extension = { + -- foo = "fooscript", + -- }, + -- filename = { + -- ["Foofile"] = "fooscript", + -- }, + -- pattern = { + -- ["~/%.config/foo/.*"] = "fooscript", + -- }, + -- } +end diff --git a/updater.lua b/updater.lua new file mode 100644 index 0000000..2a48b38 --- /dev/null +++ b/updater.lua @@ -0,0 +1,17 @@ +-- Configure AstroNvim updates +return { + remote = "origin", -- remote to use + channel = "stable", -- "stable" or "nightly" + version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY) + branch = "main", -- branch name (NIGHTLY ONLY) + commit = nil, -- commit hash (NIGHTLY ONLY) + pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only) + skip_prompts = false, -- skip prompts about breaking changes + show_changelog = true, -- show the changelog after performing an update + auto_quit = false, -- automatically quit the current session after a successful update + -- remotes = { -- easily add new remotes to track + -- ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url + -- ["remote2"] = "github_user/repo", -- GitHub user/repo shortcut, + -- ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork + -- }, +}