misc
/
nvim_doom_config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

all: 

- Improve load_config and load_doomrc functions
  - Set defaults for load_config function
  - Implement `+lsp` flag for languages in doomrc
my-config
NTBBloodbath 3 years ago
parent
2d5e71f964
commit
952cc73eb0
No known key found for this signature in database GPG Key ID: 18D6730BC846AAC5
4 changed files with 409 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 202
      lua/doom/core/config/doomrc.lua
  2. 367
      lua/doom/core/config/init.lua
  3. 3
      lua/doom/core/init.lua
  4. 5
      lua/doom/modules/config/doom-lspinstall.lua

202
lua/doom/core/config/doomrc.lua
View File

@ -16,163 +16,51 @@ log.debug('Loading Doom doomrc module ...')
local function default_doomrc_values()
return {
doom = {
-- Autosave
-- false : Disable autosave
-- true : Enable autosave
-- @default = false
autosave = false,
-- Format on save
-- false : Disable format on save
-- true : Enable format on save
-- @default = false
fmt_on_save = false,
-- Autosave sessions
-- false : Disable session autosave
-- true : Enable session autosave
-- @default = false
autosave_sessions = false,
-- Autoload sessions
-- false : Disable session autoload
-- true : Enable session autosave
-- @default = false
autoload_last_session = false,
-- Preserve last editing position
-- false : Disable preservation of last editing position
-- true : Enable preservation of last editing position
-- @default = false
preserve_edit_pos = false,
-- Default indent size
-- @default = 4
indent = 4,
-- Show indent lines
-- @default = true
show_indent = true,
-- Expand tabs
-- Specifies if spaces or tabs must be used
-- false : spaces
-- true : tabs
-- @default = true
expand_tabs = true,
-- Set numbering
-- false : Shows absolute number lines
-- true : Shows relative number lines
-- @default = true
relative_num = true,
-- Set max cols
-- Defines the column to show a vertical marker
-- @default = 80
max_columns = 80,
-- Enable guicolors
-- Enables gui colors on GUI versions of Neovim
-- @default = true
enable_guicolors = true,
-- Sidebar sizing
-- Specifies the default width of Tree Explorer and Symbols-Outline
-- @default = 25
sidebar_width = 25,
-- Symbols-Outline left
-- Sets Symbols-Outline buffer to the left when enabled
-- @default = true
symbols_outline_left = true,
-- Show hidden files
-- @default = true
show_hidden = true,
-- Default colorscheme
-- @default = doom-one
colorscheme = 'doom-one',
-- Background color
-- @default = dark
colorscheme_bg = 'dark',
-- Check updates on start
-- @default = false
check_updates = false,
-- Set the Terminal direction
-- Available directions:
-- - vertical
-- - horizontal
-- - window
-- - float
-- @default = 'horizontal'
terminal_direction = 'horizontal',
-- Set the Terminal width
-- Applies only to float direction
-- @default = 70
terminal_width = 70,
-- Set the Terminal height
-- Applies to all directions except window
-- @default = 20
terminal_height = 20,
-- Conceal level
-- Set Neovim conceal level
-- 0 : Disable indentline and show all
-- 1 : Conceal some functions and show indentlines
-- 2 : Concealed text is completely hidden unless it has a custom replacement
-- character defined
-- 3 : Concealed text is completely hidden
-- @default = 0
conceallevel = 0,
-- Logging level
-- Set Doom logging level
-- Available levels:
-- · trace
-- · debug
-- · info
-- · warn
-- · error
-- · fatal
-- @default = 'info'
logging = 'info',
},
nvim = {
-- Set custom Neovim global variables
-- @default = {}
-- example:
-- { ['sonokai_style'] = 'andromeda' }
global_variables = {},
-- Set custom autocommands
-- @default = {}
-- example:
-- augroup_name = {
-- { 'BufNewFile,BufRead', 'doomrc', 'set ft=lua'}
-- }
autocmds = {},
-- Set custom key bindings
-- @default = {}
-- example:
-- {
-- {'n', 'ca', ':Lspsaga code_action<CR>'}
-- }
--
-- where
-- 'n' is the map scope
-- 'ca' is the map activator
-- ':Lspsaga ...' is the command to be executed
mappings = {},
},
ui = {
'dashboard', -- Start screen
'doom-themes', -- Additional doom emacs' colorschemes
'statusline', -- Statusline
'tabline', -- Tabline, shows your buffers list at top
-- 'zen', -- Distraction free environment
'which-key', -- Keybindings popup menu like Emacs' guide-key
'indentlines', -- Show indent lines
},
doom = {
-- 'neorg', -- Life Organization Tool
},
editor = {
'auto-session', -- A small automated session manager for Neovim
'terminal', -- Terminal for Neovim
'explorer', -- Tree explorer
'symbols', -- LSP symbols and tags
-- 'minimap', -- Code minimap, requires github.com/wfxr/code-minimap
-- 'gitsigns', -- Git signs
'telescope', -- Highly extendable fuzzy finder over lists
-- 'restclient', -- A fast Neovim http client
'formatter', -- File formatting
'autopairs', -- Autopairs
-- 'editorconfig', -- EditorConfig support for Neovim
'kommentary', -- Comments plugin
'lsp', -- Language Server Protocols
'treesitter', -- An incremental parsing system for programming tools
'snippets', -- LSP snippets
},
langs = {
-- 'javascript', -- JavaScript support
-- 'typescript', -- TypeScript support
-- 'python +lsp', -- Python support + lsp
'lua', -- Support for our gods language
-- 'rust +lsp', -- Let's get rusty!
-- 'config', -- Configuration files (JSON, YAML, TOML)
},
utilities = {
-- 'suda', -- Write and read files without sudo permissions
-- 'lazygit', -- LazyGit integration for Neovim, requires LazyGit
-- 'neogit', -- Magit for Neovim
-- 'octo', -- GitHub in Neovim, requires GitHub CLI
-- 'colorizer', -- Fastets colorizer for Neovim
},
}
}
end

367
lua/doom/core/config/init.lua
View File

@ -1,8 +1,8 @@
---[[---------------------------------------]]---
-- config - Core of Doom Nvim --
-- Author: NTBBloodbath --
-- License: MIT --
---[[---------------------------------------]]---
---[[------------------------------]]---
-- config - Core of Doom Nvim --
-- Author: NTBBloodbath --
-- License: MIT --
---[[------------------------------]]---
local M = {}
@ -12,8 +12,8 @@ local utils = require('doom.utils')
log.debug('Loading Doom core config module ...')
-- Check if running Neovim or Vim and fails if:
-- 1. Running Vim instead of Neovim
-- 2. Running Neovim 0.4 or below
-- 1. Running Vim instead of Neovim
-- 2. Running Neovim 0.4 or below
if vim.fn.has('nvim') == 1 then
if vim.fn.has('nvim-0.5') ~= 1 then
log.fatal('Doom Nvim requires Neovim 0.5.0')
@ -32,6 +32,336 @@ if vim.fn.has('vim_starting') then
vim.opt.termguicolors = true
end
-- {{{ Default doom_config values
-- default_doom_config_values loads the default doom_config values
-- @return table
local function default_doom_config_values()
local doom = {
-- Autosave
-- false : Disable autosave
-- true : Enable autosave
-- @default = false
autosave = false,
-- Format on save
-- false : Disable format on save
-- true : Enable format on save
-- @default = false
fmt_on_save = false,
-- Autosave sessions
-- false : Disable session autosave
-- true : Enable session autosave
-- @default = false
autosave_sessions = false,
-- Autoload sessions
-- false : Disable session autoload
-- true : Enable session autoload
-- @default = false
autoload_last_session = false,
-- Enable Swap files
-- false : no swap files
-- true : enables swap files
-- @default = false
swap_files = false,
-- Undo Directories
-- the backup variable enables backup related settings (undofile, undodir)
-- false : ignores undo Directories (this code block will be ignored)
-- true : enable undo files/undo dirs.
-- @default = false
backup = false, -- WARNING: if you change this to false and you have an undo dir already, it will REMOVE the undodir (loss of data might take place)
-- Enable Line wrapping
-- false : disables line wrapping
-- true : enables line wrapping
-- @default = false
line_wrap = false,
-- Enable Show mode ( -- INSERT --, -- NORMAL --, -- VISUAL -- )
-- false : disables show mode
-- true : enables show mode
-- @default = false
show_mode = false,
-- Enable scroll off
-- false : disables scroll off
-- true : enables scroll off
-- @default = true, @default scrolloff_amount = 4,
scrolloff = true,
scrolloff_amount = 4,
-- Enable mouse
-- false : disables mouse
-- true : enables mouse
-- @default = true
mouse = true,
-- Preserve last editing position
-- false : Disable preservation of last editing position
-- true : Enable preservation of last editing position
-- @default = false
preserve_edit_pos = false,
-- horizontal split on creating a new file (<Leader>fn)
-- false : doesn't split the window when creating a new file
-- true : horizontal split on creating a new file
-- @default = true
new_file_split = true,
-- enable current line highlight
-- false : disables current line highlight
-- true : enables current line highlight
-- @default = true
line_highlight = true,
-- Automatically split right
-- false : splits right (vertically)
-- true : splits left (vertically)
-- @default = true
split_right = true,
-- Automatically split above
-- false : splits above (horizontally)
-- true : splits below (horizontally)
-- @default = true
split_below = true,
-- Use clipboard outside of vim
-- false : won't use third party clipboard
-- true : enables third part clipboard
-- @default = true
clipboard = true,
-- Enable auto comment (current line must be commented)
-- false : disables auto comment
-- true : enables auto comment
-- @default = false
auto_comment = false,
-- Show indent lines
-- @default = true
show_indent = true,
-- Expand tabs
-- Specifies if spaces or tabs must be used
-- false : spaces
-- true : tabs
-- @default = true
expand_tabs = true,
-- Set numbering
-- false : Shows absolute number lines
-- true : Shows relative number lines
-- @default = true
relative_num = true,
-- Enable Highlight on yank
-- false : disables highligh on yank
-- true : enables highlight on yank
-- @default = true
highlight_yank = true,
-- Enable guicolors
-- Enables gui colors on GUI versions of Neovim
-- @default = true
enable_guicolors = true,
-- Symbols-Outline on the left
-- Places the Symbols-Outline buffer to the left when enabled
-- @default = false
symbols_outline_left = true,
-- Show hidden files
-- @default = true
show_hidden = true,
-- Checkupdates on start
-- @default = false
check_updates = false,
-- Auto install plugins on launch, useful if you don't want to run
-- PackerInstall every time you add a new plugin
-- @default = true
auto_install_plugins = true,
-- Disable dashboard status line (does not work perfectly)
-- false : disables dashboard status line
-- true : enables dashboard status line
-- @default = true
dashboard_statline = true,
-- Default indent size
-- @default = 4
indent = 4,
-- Set max cols
-- Defines the column to show a vertical marker
-- @default = 80
max_columns = 80,
-- Completion box height
-- @default = 10
complete_size = 10,
-- Completion box transparency
-- 0 = no transparency
-- 100 = fully transparent
-- @default = 25
complete_transparency = 25,
-- Sidebar sizing
-- Specifies the default width of Tree Explorer and Tagbar
-- @default = 25
sidebar_width = 25,
-- Set the Terminal width
-- Applies only to float direction
-- @default = 70
terminal_width = 70,
-- Set the Terminal height
-- Applies to all directions except window
-- @default = 20
terminal_height = 20,
-- Conceal level
-- Set Neovim conceal level
-- 0 : Disable indentline and show all
-- 1 : Conceal some functions and show indentlines
-- 2 : Concealed text is completely hidden unless it has a custom replacement
-- character defined
-- 3 : Concealed text is completely hidden
conceallevel = 0,
-- Logging level
-- Set Doom logging level
-- Available levels:
-- · trace
-- · debug
-- · info
-- · warn
-- · error
-- · fatal
-- @default = 'info'
logging = 'info',
-- Set the Terminal direction
-- Available directions:
-- - vertical
-- - horizontal
-- - window
-- - float
-- @default = 'horizontal'
terminal_direction = 'horizontal',
-- NOTE: This will only be activated if 'backup' is true.
-- We don'recommend you put this outside of neovim so we've restricted to the path: ~/.config/nvim
-- WARNING: only put the folder name that you want. (eg: undo_dir = '/undodir')
-- @default_directory = '~/.config/nvim/undodir'
undo_dir = '/undodir',
-- Default colorscheme
-- @default = doom-one
colorscheme = 'doom-one',
-- Background color
-- @default = dark
colorscheme_bg = 'dark',
-- Set gui fonts here
-- @default = "FiraCode Nerd Font", @default font size = 15,
-- WARNING: Font sizes must be in string format!
guifont = 'FiraCode Nerd Font',
guifont_size = '15',
-- change Which Key background color
-- can use hex, or normal color names (eg: Red, Gree, Blue)
-- @default = #202328
whichkey_bg = '#202328',
-- set your custom lsp diagnostic symbols below
lsp_error = '',
lsp_warning = '',
lsp_hint = '',
lsp_information = '',
lsp_virtual_text = '',
-- Set your dashboard custom colors below
-- @default = doom emacs' default dashboard colors
dashboard_custom_colors = {
header_color = '#586268',
center_color = '#51afef',
shortcut_color = '#a9a1e1',
footer_color = '#586268',
},
-- Set your custom dashboard header below
-- @default = doom emacs' default dashboard header
dashboard_custom_header = {},
}
-- }}}
-- {{{ Nvim
local nvim = {
-- Set custom Neovim global variables
-- @default = {}
-- example:
-- { ['sonokai_style'] = 'andromeda' }
global_variables = {},
-- Set custom autocommands
-- @default = {}
-- example:
-- augroup_name = {
-- { 'BufNewFile,BufRead', 'doomrc', 'set ft=lua'}
-- }
autocmds = {},
-- Set custom key bindings
-- @default = {}
-- example:
-- {
-- {'n', 'ca', ':Lspsaga code_action<CR>'}
-- }
--
-- where
-- 'n' is the map scope
-- 'ca' is the map activator
-- ':Lspsaga ...' is the command to be executed
mappings = {},
-- Set custom commands
-- @default = {}
-- example:
-- {
-- 'echo "Hello, custom commands!"'
-- }
commands = {},
-- Set custom functions
-- @default = {}
-- example:
-- {
-- hello_custom_func = function()
-- print("Hello, custom functions!")
-- end
-- }
functions = {},
}
return {
doom = doom,
nvim = nvim,
}
end
-- }}}
-- load_config Loads the doom_config.lua file if it exists
-- @return table
M.load_config = function()
@ -53,15 +383,36 @@ M.load_config = function()
)
end
else
log.warn('No doom_config.lua file found')
log.warn('No doom_config.lua file found, falling to defaults')
default_doom_config_values()
end
return config
end
-- install_servers will install the language servers for the languages with
-- the +lsp flag.
--
-- @param langs The list of languages in the doomrc
M.install_servers = function(langs)
local lspinstall = require('lspinstall')
local installed_servers = lspinstall.installed_servers()
for _, lang in ipairs(langs) do
-- If the +lsp flag exists and the language server is not installed yet
if
lang:find('%+lsp') and not utils.has_value(installed_servers, lang)
then
lspinstall.install_server(lang)
end
end
end
-- Check plugins updates on start if enabled
if M.load_config().doom.check_updates then
require('doom.core.functions').check_updates()
end
return M
-- vim: fdm=marker

3
lua/doom/core/init.lua
View File

@ -15,3 +15,6 @@ require('doom.modules')
require('doom.core.keybindings')
-- Doom autocommands
require('doom.core.autocmds')
-- Automatically install language servers
require('doom.core.config').install_servers(require('doom.core.config.doomrc').load_doomrc().langs)

5
lua/doom/modules/config/doom-lspinstall.lua
View File

@ -1,8 +1,7 @@
return function()
local nvim_lsp = require('lspconfig')
--[[-----------------]]
--
--[[-----------------]]--
-- LSP Setup --
--]]-----------------[[--
-- https://github.com/kabouzeid/nvim-lspinstall#advanced-configuration-recommended
@ -11,7 +10,7 @@ return function()
require('lspinstall').setup()
local servers = require('lspinstall').installed_servers()
for _, server in pairs(servers) do
-- Configure sumneko to neovim lua development
-- Configure sumneko for neovim lua development
if server == 'lua' then
local lua_path = vim.split(package.path, ';')
table.insert(lua_path, 'lua/?.lua')

Write Preview
Loading…
Cancel
Save