split config

This commit is contained in:
Kasper Juul Hermansen 2023-01-14 13:02:17 +01:00
parent c76362b913
commit 77036d0584
Signed by: kjuulh
GPG Key ID: 57B6E1465221F912
21 changed files with 341 additions and 391 deletions

6
.luarc.json Normal file
View File

@ -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"]
}

8
cmd/source_priority.lua Normal file
View File

@ -0,0 +1,8 @@
return {
source_priority = {
nvim_lsp = 1000,
luasnip = 750,
buffer = 500,
path = 250,
},
}

1
colorscheme.lua Normal file
View File

@ -0,0 +1 @@
return "tokyonight"

4
default_theme/colors.lua Normal file
View File

@ -0,0 +1,4 @@
return {
fg = "#abb2bf",
bg = "#1e222a",
}

View File

@ -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

21
default_theme/plugins.lua Normal file
View File

@ -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,
}

4
diagnostics.lua Normal file
View File

@ -0,0 +1,4 @@
return {
virtual_text = true,
underline = true,
}

13
header.lua Normal file
View File

@ -0,0 +1,13 @@
return {
" █████ ███████ ████████ ██████ ██████",
"██ ██ ██ ██ ██ ██ ██ ██",
"███████ ███████ ██ ██████ ██ ██",
"██ ██ ██ ██ ██ ██ ██ ██",
"██ ██ ███████ ██ ██ ██ ██████",
" ",
" ███  ██ ██  ██ ██ ███  ███",
" ████  ██ ██  ██ ██ ████  ████",
" ██ ██  ██ ██  ██ ██ ██ ████ ██",
" ██  ██ ██  ██  ██  ██ ██  ██  ██",
" ██   ████   ████   ██ ██  ██",
}

1
highlights.lua Normal file
View File

@ -0,0 +1 @@
return {}

391
init.lua
View File

@ -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.<first_key>.<second_key> = 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 = {
-- ["<leader>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"
["<leader>bb"] = { "<cmd>tabnew<cr>", desc = "New tab" },
["<leader>bc"] = { "<cmd>BufferLinePickClose<cr>", desc = "Pick to close" },
["<leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" },
["<leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" },
-- quick save
-- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command
},
t = {
-- setting a mapping to false will disable it
-- ["<esc>"] = 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("<key>").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, <leader> prefixes
["<leader>"] = {
-- 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"] = { "<cmd>Telescope projects<cr>", "projects" },
["."] = { "<cmd>Ranger<cr>", "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

9
lsp/formatting.lua Normal file
View File

@ -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
}

17
mappings.lua Normal file
View File

@ -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"
["<leader>bb"] = { "<cmd>tabnew<cr>", desc = "New tab" },
["<leader>bc"] = { "<cmd>BufferLinePickClose<cr>", desc = "Pick to close" },
["<leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" },
["<leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" },
-- quick save
-- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command
},
t = {
-- setting a mapping to false will disable it
-- ["<esc>"] = false,
},
}

30
options.lua Normal file
View File

@ -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,
},
}

119
plugins/init.lua Normal file
View File

@ -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,
},
}

View File

@ -0,0 +1,3 @@
return {
ensure_installed = { "sumneko_lua", "rust_analyzer", "gopls", "yamlls" },
}

View File

@ -0,0 +1,3 @@
return { -- overrides `require("mason-null-ls").setup(...)`
ensure_installed = { "prettier", "stylua" },
}

31
plugins/null-ls.lua Normal file
View File

@ -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

0
plugins/treesitter.lua Normal file
View File

28
polish.lua Normal file
View File

@ -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

17
updater.lua Normal file
View File

@ -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
-- },
}

13
which_key/register.lua Normal file
View File

@ -0,0 +1,13 @@
return {
-- first key is the mode, n == normal mode
n = {
-- second key is the prefix, <leader> prefixes
["<leader>"] = {
-- 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"] = { "<cmd>Telescope projects<cr>", "projects" },
["."] = { "<cmd>Ranger<cr>", "ranger" },
},
},
}