From 77036d0584c1850545d5f0deb4dfef008c89f64f Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sat, 14 Jan 2023 13:02:17 +0100 Subject: [PATCH] split config --- .luarc.json | 6 + cmd/source_priority.lua | 8 + colorscheme.lua | 1 + default_theme/colors.lua | 4 + default_theme/highlights.lua | 13 ++ default_theme/plugins.lua | 21 ++ diagnostics.lua | 4 + header.lua | 13 ++ highlights.lua | 1 + init.lua | 391 ----------------------------------- lsp/formatting.lua | 9 + mappings.lua | 17 ++ options.lua | 30 +++ plugins/init.lua | 119 +++++++++++ plugins/mason-lspconfig.lua | 3 + plugins/mason-null-ls.lua | 3 + plugins/null-ls.lua | 31 +++ plugins/treesitter.lua | 0 polish.lua | 28 +++ updater.lua | 17 ++ which_key/register.lua | 13 ++ 21 files changed, 341 insertions(+), 391 deletions(-) create mode 100644 .luarc.json create mode 100644 cmd/source_priority.lua create mode 100644 colorscheme.lua create mode 100644 default_theme/colors.lua create mode 100644 default_theme/highlights.lua create mode 100644 default_theme/plugins.lua create mode 100644 diagnostics.lua create mode 100644 header.lua create mode 100644 highlights.lua delete mode 100644 init.lua create mode 100644 lsp/formatting.lua create mode 100644 mappings.lua create mode 100644 options.lua create mode 100644 plugins/init.lua create mode 100644 plugins/mason-lspconfig.lua create mode 100644 plugins/mason-null-ls.lua create mode 100644 plugins/null-ls.lua create mode 100644 plugins/treesitter.lua create mode 100644 polish.lua create mode 100644 updater.lua create mode 100644 which_key/register.lua diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 0000000..9cc0346 --- /dev/null +++ b/.luarc.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "Lua.diagnostics.disable": ["different-requires"], + "Lua.diagnostics.globals": ["vim", "astronvim"], + "Lua.workspace.library": ["~/.config/nvim/lua"] +} diff --git a/cmd/source_priority.lua b/cmd/source_priority.lua new file mode 100644 index 0000000..7da03f7 --- /dev/null +++ b/cmd/source_priority.lua @@ -0,0 +1,8 @@ +return { + source_priority = { + nvim_lsp = 1000, + luasnip = 750, + buffer = 500, + path = 250, + }, +} diff --git a/colorscheme.lua b/colorscheme.lua new file mode 100644 index 0000000..7bfb43a --- /dev/null +++ b/colorscheme.lua @@ -0,0 +1 @@ +return "tokyonight" diff --git a/default_theme/colors.lua b/default_theme/colors.lua new file mode 100644 index 0000000..65e1cc1 --- /dev/null +++ b/default_theme/colors.lua @@ -0,0 +1,4 @@ +return { + fg = "#abb2bf", + bg = "#1e222a", +} diff --git a/default_theme/highlights.lua b/default_theme/highlights.lua new file mode 100644 index 0000000..517919e --- /dev/null +++ b/default_theme/highlights.lua @@ -0,0 +1,13 @@ +return function(hl) -- or a function that returns a new table of colors to set + local C = require "default_theme.colors" + + hl.Normal = { fg = C.fg, bg = C.bg } + + -- New approach instead of diagnostic_style + hl.DiagnosticError.italic = true + hl.DiagnosticHint.italic = true + hl.DiagnosticInfo.italic = true + hl.DiagnosticWarn.italic = true + + return hl +end diff --git a/default_theme/plugins.lua b/default_theme/plugins.lua new file mode 100644 index 0000000..14fa302 --- /dev/null +++ b/default_theme/plugins.lua @@ -0,0 +1,21 @@ +return { + aerial = true, + beacon = false, + bufferline = true, + 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/diagnostics.lua b/diagnostics.lua new file mode 100644 index 0000000..d278811 --- /dev/null +++ b/diagnostics.lua @@ -0,0 +1,4 @@ +return { + virtual_text = true, + underline = true, +} diff --git a/header.lua b/header.lua new file mode 100644 index 0000000..e33614e --- /dev/null +++ b/header.lua @@ -0,0 +1,13 @@ +return { + " █████ ███████ ████████ ██████ ██████", + "██ ██ ██ ██ ██ ██ ██ ██", + "███████ ███████ ██ ██████ ██ ██", + "██ ██ ██ ██ ██ ██ ██ ██", + "██ ██ ███████ ██ ██ ██ ██████", + " ", + " ███  ██ ██  ██ ██ ███  ███", + " ████  ██ ██  ██ ██ ████  ████", + " ██ ██  ██ ██  ██ ██ ██ ████ ██", + " ██  ██ ██  ██  ██  ██ ██  ██  ██", + " ██   ████   ████   ██ ██      ██", +} diff --git a/highlights.lua b/highlights.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/highlights.lua @@ -0,0 +1 @@ +return {} diff --git a/init.lua b/init.lua deleted file mode 100644 index 0ebc908..0000000 --- a/init.lua +++ /dev/null @@ -1,391 +0,0 @@ --- AstroNvim Configuration Table --- All configuration changes should go inside of the table below - --- You can think of a Lua "table" as a dictionary like data structure the --- normal format is "key = value". These also handle array like data structures --- where a value with no key simply has an implicit numeric key -local config = { - - -- Configure AstroNvim updates - updater = { - remote = "origin", -- remote to use - channel = "nightly", -- "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_reload = false, -- automatically reload and sync packer after a successful 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 - -- }, - }, - - -- Set colorscheme to use - colorscheme = "tokyonight", - - -- Add highlight groups in any theme - highlights = { - -- init = { -- this table overrides highlights in all themes - -- Normal = { bg = "#000000" }, - -- } - -- duskfox = { -- a table of overrides/changes to the duskfox theme - -- Normal = { bg = "#000000" }, - -- }, - }, - - -- set vim options here (vim.. = value) - options = { - 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 - 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 - }, - }, - -- If you need more control, you can use the function()...end notation - -- options = function(local_vim) - -- local_vim.opt.relativenumber = true - -- local_vim.g.mapleader = " " - -- local_vim.opt.whichwrap = vim.opt.whichwrap - { 'b', 's' } -- removing option from list - -- local_vim.opt.shortmess = vim.opt.shortmess + { I = true } -- add to option list - -- - -- return local_vim - -- end, - - -- Set dashboard header - header = { - " █████ ███████ ████████ ██████ ██████", - "██ ██ ██ ██ ██ ██ ██ ██", - "███████ ███████ ██ ██████ ██ ██", - "██ ██ ██ ██ ██ ██ ██ ██", - "██ ██ ███████ ██ ██ ██ ██████", - " ", - " ███  ██ ██  ██ ██ ███  ███", - " ████  ██ ██  ██ ██ ████  ████", - " ██ ██  ██ ██  ██ ██ ██ ████ ██", - " ██  ██ ██  ██  ██  ██ ██  ██  ██", - " ██   ████   ████   ██ ██      ██", - }, - - -- Default theme configuration - default_theme = { - -- Modify the color palette for the default theme - colors = { - fg = "#abb2bf", - bg = "#1e222a", - }, - highlights = function(hl) -- or a function that returns a new table of colors to set - local C = require "default_theme.colors" - - hl.Normal = { fg = C.fg, bg = C.bg } - - -- New approach instead of diagnostic_style - hl.DiagnosticError.italic = true - hl.DiagnosticHint.italic = true - hl.DiagnosticInfo.italic = true - hl.DiagnosticWarn.italic = true - - return hl - end, - -- enable or disable highlighting for extra plugins - plugins = { - aerial = true, - beacon = false, - bufferline = 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, - vimwiki = false, - ["which-key"] = true, - }, - }, - - -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on - diagnostics = { - virtual_text = true, - underline = true, - }, - - -- Extend LSP configuration - lsp = { - -- enable servers that you already have installed without mason - servers = { - -- "pyright" - }, - formatting = { - format_on_save = true, -- enable or disable auto formatting on save - disabled = { -- disable formatting capabilities for the listed clients - -- "sumneko_lua", - }, - -- filter = function(client) -- fully override the default formatting function - -- return true - -- end - }, - -- easily add or disable built in mappings added during LSP attaching - mappings = { - n = { - -- ["lf"] = false -- disable formatting keymap - }, - }, - -- add to the global LSP on_attach function - -- on_attach = function(client, bufnr) - -- end, - - -- override the mason server-registration function - -- server_registration = function(server, opts) - -- require("lspconfig")[server].setup(opts) - -- end, - - -- Add overrides for LSP server settings, the keys are the name of the server - ["server-settings"] = { - -- example for addings schemas to yamlls - -- yamlls = { -- 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}", - -- }, - -- }, - -- }, - -- }, - }, - }, - - -- 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.) - mappings = { - -- 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" }, - -- quick save - -- [""] = { ":w!", desc = "Save File" }, -- change description but the same command - }, - t = { - -- setting a mapping to false will disable it - -- [""] = false, - }, - }, - - -- Configure plugins - plugins = { - init = { - { - "nvim-telescope/telescope-file-browser.nvim", - after = "telescope.nvim", - config = function() require("telescope").load_extension "file_browser" end, - }, - { - "ahmedkhalf/project.nvim", - after = "telescope.nvim", - config = function() - require("project_nvim").setup { - -- Manual mode doesn't automatically change your root directory, so you have - -- the option to manually do so using `:ProjectRoot` command. - manual_mode = false, - - -- Methods of detecting the root directory. **"lsp"** uses the native neovim - -- lsp, while **"pattern"** uses vim-rooter like glob pattern matching. Here - -- order matters: if one is not detected, the other is used as fallback. You - -- can also delete or rearangne the detection methods. - detection_methods = { "lsp", "pattern" }, - - -- All the patterns used to detect root dir, when **"pattern"** is in - -- detection_methods - patterns = { ".git", "Makefile", "package.json" }, - - -- Table of lsp clients to ignore by name - -- eg: { "efm", ... } - ignore_lsp = {}, - - -- Don't calculate root dir on specific directories - -- Ex: { "~/.cargo/*", ... } - exclude_dirs = {}, - - -- Show hidden files in telescope - show_hidden = false, - - -- When set to false, you will get a message when project.nvim changes your - -- directory. - silent_chdir = true, - - -- What scope to change the directory, valid options are - -- * global (default) - -- * tab - -- * win - scope_chdir = "global", - - -- Path where project.nvim will store the project history for use in - -- telescope - datapath = vim.fn.stdpath "data", - } - require("telescope").load_extension "projects" - end, - }, - { - "pwntester/octo.nvim", - after = "telescope.nvim", - config = function() require("octo").setup() end, - }, - { - "~/git/git.front.kjuulh.io/kjuulh/github-presense", - config = function() require("github_presence").setup {} end, - }, - { - "~/git/git.front.kjuulh.io/kjuulh/ranger.nvim", - config = function() require("ranger").setup {} end, - }, - -- You can disable default plugins as follows: - -- ["goolord/alpha-nvim"] = { disable = true }, - - -- You can also add new plugins here as well: - -- Add plugins, the packer syntax without the "use" - -- { "andweeb/presence.nvim" }, - -- { - -- "ray-x/lsp_signature.nvim", - -- event = "BufRead", - -- config = function() - -- require("lsp_signature").setup() - -- end, - -- }, - - -- We also support a key value style plugin definition similar to NvChad: - -- ["ray-x/lsp_signature.nvim"] = { - -- event = "BufRead", - -- config = function() - -- require("lsp_signature").setup() - -- end, - -- }, - }, - -- All other entries override the require("").setup({...}) call for default plugins - ["null-ls"] = function(config) -- overrides `require("null-ls").setup(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, - null_ls.builtins.formatting.deno_fmt.with { - filetypes = { "markdown" }, - }, - } - return config -- return final config table - end, - treesitter = { -- overrides `require("treesitter").setup(...)` - ensure_installed = { "lua", "rust", "markdown", "typescript", "go" }, - }, - -- use mason-lspconfig to configure LSP installations - ["mason-lspconfig"] = { -- overrides `require("mason-lspconfig").setup(...)` - ensure_installed = { "sumneko_lua", "rust_analyzer", "gopls", "yamlls" }, - }, - -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources - ["mason-null-ls"] = { -- overrides `require("mason-null-ls").setup(...)` - ensure_installed = { "prettier", "stylua" }, - }, - }, - - -- LuaSnip Options - luasnip = { - -- Add paths for including more VS Code style snippets in luasnip - vscode_snippet_paths = {}, - -- Extend filetypes - filetype_extend = { - -- javascript = { "javascriptreact" }, - }, - }, - - -- CMP Source Priorities - -- modify here the priorities of default cmp sources - -- higher value == higher priority - -- The value can also be set to a boolean for disabling default sources: - -- false == disabled - -- true == 1000 - cmp = { - source_priority = { - nvim_lsp = 1000, - luasnip = 750, - buffer = 500, - path = 250, - }, - }, - - -- Modify which-key registration (Use this with mappings table in the above.) - ["which-key"] = { - -- Add bindings which show up as group name - register = { - -- first key is the mode, n == normal mode - n = { - -- second key is the prefix, prefixes - [""] = { - -- third key is the key to bring up next level and its displayed - -- group name in which-key top level menu - ["b"] = { name = "Buffer" }, - ["P"] = { "Telescope projects", "projects" }, - ["."] = { "Ranger", "ranger" }, - }, - }, - }, - }, - - -- 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 - polish = function() - vim.filetype.add { - extension = { - avsc = "json", - }, - } - - -- Set up custom filetypes - -- vim.filetype.add { - -- extension = { - -- foo = "fooscript", - -- }, - -- filename = { - -- ["Foofile"] = "fooscript", - -- }, - -- pattern = { - -- ["~/%.config/foo/.*"] = "fooscript", - -- }, - -- } - end, -} - -return config diff --git a/lsp/formatting.lua b/lsp/formatting.lua new file mode 100644 index 0000000..9ced996 --- /dev/null +++ b/lsp/formatting.lua @@ -0,0 +1,9 @@ +return { + format_on_save = true, -- enable or disable auto formatting on save + disabled = { -- disable formatting capabilities for the listed clients + -- "sumneko_lua", + }, + -- filter = function(client) -- fully override the default formatting function + -- return true + -- end +} diff --git a/mappings.lua b/mappings.lua new file mode 100644 index 0000000..9228d93 --- /dev/null +++ b/mappings.lua @@ -0,0 +1,17 @@ +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" }, + -- 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..d5aaaf0 --- /dev/null +++ b/options.lua @@ -0,0 +1,30 @@ +return { + opt = { + -- set to true or false etc. + relativenumber = false, -- 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 + 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 + markdown_fenced_languages = { "ts=typescript", "yaml", "json" }, + autoformat_enabled = true, -- enable or disable auto formatting at start (lsp.formatting.format_on_save must be enabled) + 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 + heirline_bufferline = false, -- enable new heirline based bufferline (requires :PackerSync after changing) + + vim_markdown_folding_disabled = 1, + vim_markdown_conceal = 1, + tex_conceal = "", + vim_markdown_math = 1, + vim_markdown_frontmatter = 1, + vim_markdown_toml_frontmatter = 1, + vim_markdown_json_frontmatter = 1, + }, +} diff --git a/plugins/init.lua b/plugins/init.lua new file mode 100644 index 0000000..5208fac --- /dev/null +++ b/plugins/init.lua @@ -0,0 +1,119 @@ +return { + { + "nvim-telescope/telescope-file-browser.nvim", + after = "telescope.nvim", + config = function() require("telescope").load_extension "file_browser" end, + }, + --{ + -- "ahmedkhalf/project.nvim", + -- after = "telescope.nvim", + -- config = function() + -- require("project_nvim").setup { + -- -- Manual mode doesn't automatically change your root directory, so you have + -- -- the option to manually do so using `:ProjectRoot` command. + -- manual_mode = false, + + -- -- Methods of detecting the root directory. **"lsp"** uses the native neovim + -- -- lsp, while **"pattern"** uses vim-rooter like glob pattern matching. Here + -- -- order matters: if one is not detected, the other is used as fallback. You + -- -- can also delete or rearangne the detection methods. + -- detection_methods = { "lsp", "pattern" }, + + -- -- All the patterns used to detect root dir, when **"pattern"** is in + -- -- detection_methods + -- patterns = { ".git", "Makefile", "package.json" }, + + -- -- Table of lsp clients to ignore by name + -- -- eg: { "efm", ... } + -- ignore_lsp = {}, + + -- -- Don't calculate root dir on specific directories + -- -- Ex: { "~/.cargo/*", ... } + -- exclude_dirs = {}, + + -- -- Show hidden files in telescope + -- show_hidden = false, + + -- -- When set to false, you will get a message when project.nvim changes your + -- -- directory. + -- silent_chdir = true, + + -- -- What scope to change the directory, valid options are + -- -- * global (default) + -- -- * tab + -- -- * win + -- scope_chdir = "global", + + -- -- Path where project.nvim will store the project history for use in + -- -- telescope + -- datapath = vim.fn.stdpath "data", + -- } + -- require("telescope").load_extension "projects" + -- end, + --}, + { + after = "telescope.nvim", + "pwntester/octo.nvim", + config = function() require("octo").setup() end, + }, + --{ + -- "~/git/git.front.kjuulh.io/kjuulh/github-presense", + -- config = function() require("github_presence").setup {} end, + --}, + { + "~/git/git.front.kjuulh.io/kjuulh/ranger.nvim", + config = function() require("ranger").setup {} end, + }, + { + "~/git/git.front.kjuulh.io/kjuulh/dataviewjs.nvim", + after = "nvim-treesitter", + config = function() require("dataviewjs").init {} end, + }, + { + "iamcco/markdown-preview.nvim", + run = function() vim.fn["mkdp#util#install"]() end, + }, + { + "godlygeek/tabular", + }, + { + "elzr/vim-json", + }, + { + "plasticboy/vim-markdown", + }, + { + "folke/tokyonight.nvim", + }, + { "scalameta/nvim-metals", requires = { "nvim-lua/plenary.nvim" } }, + { + "leoluz/nvim-dap-go", + config = function() + require("dap-go").setup { + -- Additional dap configurations can be added. + -- dap_configurations accepts a list of tables where each entry + -- represents a dap configuration. For more details do: + -- :help dap-configuration + dap_configurations = { + { + -- Must be "go" or it will be ignored by the plugin + type = "go", + name = "Attach remote", + mode = "remote", + request = "attach", + }, + }, + -- delve configurations + delve = { + -- time to wait for delve to initialize the debug session. + -- default to 20 seconds + initialize_timeout_sec = 20, + -- a string that defines the port to start delve debugger. + -- default to string "${port}" which instructs nvim-dap + -- to start the process in a random available port + port = "${port}", + }, + } + end, + }, +} diff --git a/plugins/mason-lspconfig.lua b/plugins/mason-lspconfig.lua new file mode 100644 index 0000000..33e0e05 --- /dev/null +++ b/plugins/mason-lspconfig.lua @@ -0,0 +1,3 @@ +return { + ensure_installed = { "sumneko_lua", "rust_analyzer", "gopls", "yamlls" }, +} diff --git a/plugins/mason-null-ls.lua b/plugins/mason-null-ls.lua new file mode 100644 index 0000000..166e198 --- /dev/null +++ b/plugins/mason-null-ls.lua @@ -0,0 +1,3 @@ +return { -- overrides `require("mason-null-ls").setup(...)` + ensure_installed = { "prettier", "stylua" }, +} diff --git a/plugins/null-ls.lua b/plugins/null-ls.lua new file mode 100644 index 0000000..f56a244 --- /dev/null +++ b/plugins/null-ls.lua @@ -0,0 +1,31 @@ +return function(config) -- overrides `require("null-ls").setup(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, + null_ls.builtins.formatting.deno_fmt.with { + filetypes = { "markdown" }, + }, + null_ls.builtins.formatting.csharpier, + null_ls.builtins.diagnostics.sqlfluff.with { + extra_args = { + "--dialect", + "postgres", + "--config", + "/Users/kah/.config/sqlfluff/sqlc/config.toml", + }, -- change to your dialect + }, + null_ls.builtins.formatting.gofumpt, + null_ls.builtins.formatting.goimports, + null_ls.builtins.formatting.goimports_reviser, + null_ls.builtins.formatting.golines, + --null_ls.builtins.formatting.pg_format, + } + return config -- return final config table +end diff --git a/plugins/treesitter.lua b/plugins/treesitter.lua new file mode 100644 index 0000000..e69de29 diff --git a/polish.lua b/polish.lua new file mode 100644 index 0000000..89a48c9 --- /dev/null +++ b/polish.lua @@ -0,0 +1,28 @@ +return function() + vim.filetype.add { + extension = { + avsc = "json", + }, + } + vim.filetype.add { + extension = { + dataviewjs = "javascript", + }, + } + + local ft_to_parser = require("nvim-treesitter.parsers").filetype_to_parsername + ft_to_parser.dataviewjs = "javascript" + + -- 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..39a93c9 --- /dev/null +++ b/updater.lua @@ -0,0 +1,17 @@ +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_reload = false, -- automatically reload and sync packer after a successful 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 + -- }, +} diff --git a/which_key/register.lua b/which_key/register.lua new file mode 100644 index 0000000..b5f78e2 --- /dev/null +++ b/which_key/register.lua @@ -0,0 +1,13 @@ +return { + -- first key is the mode, n == normal mode + n = { + -- second key is the prefix, prefixes + [""] = { + -- third key is the key to bring up next level and its displayed + -- group name in which-key top level menu + ["b"] = { name = "Buffer" }, + ["P"] = { "Telescope projects", "projects" }, + ["."] = { "Ranger", "ranger" }, + }, + }, +}