Browse Source

Merge branch 'main' into develop

my-config
NTBBloodbath 3 years ago
parent
commit
a3552db7bc
No known key found for this signature in database GPG Key ID: 18D6730BC846AAC5
  1. 12
      .all-contributorsrc
  2. 43
      CHANGELOG.md
  3. 5
      README.md
  4. 16
      install.sh
  5. 58
      lua/doom/core/config/init.lua
  6. 2
      lua/doom/core/functions/init.lua
  7. 2
      lua/doom/modules/config/doom-compe.lua
  8. 3
      lua/doom/modules/config/doom-luasnip.lua
  9. 18
      lua/doom/modules/init.lua

12
.all-contributorsrc

@ -116,7 +116,17 @@
"avatar_url": "https://avatars.githubusercontent.com/u/2058566?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/2058566?v=4",
"profile": "https://github.com/bdillahu", "profile": "https://github.com/bdillahu",
"contributions": [ "contributions": [
"doc" "doc",
"bug"
]
},
{
"login": "amxj9",
"name": "amxj9",
"avatar_url": "https://avatars.githubusercontent.com/u/2029709?v=4",
"profile": "https://github.com/amxj9",
"contributions": [
"bug"
] ]
} }
], ],

43
CHANGELOG.md

@ -7,6 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [3.0.7] - 2021-07-13
### Fixed
- Properly lazy-load `format.nvim`
- Stop lazy-loading `friendly-snippets`
## [3.0.6] - 2021-07-13
### Fixed
- Added `neorg` to completion sources
- Properly setup for `LuaSnip` + `friendly-snippets`
## [3.0.5] - 2021-07-13
### Fixed
- Do not try to automatically install servers on start if the lspinstall plugin
is not loaded
- Set termguicolors on start instead of wait for the UI module, avoid a strange
error that I was having with packer
## [3.0.4] - 2021-07-13
### Fixed
- `doom-themes` plugin was loaded incorrectly
- Custom keymaps were not working in the `doom_config.lua` file
## [3.0.3] - 2021-07-12
### Changed
- Reverted [3.0.2] changes
## [3.0.2] - 2021-07-12 ## [3.0.2] - 2021-07-12
### Fixed ### Fixed
@ -370,7 +406,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial stable release - Initial stable release
[unreleased]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.2...develop [unreleased]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.7...develop
[3.0.6]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.6...v3.0.7
[3.0.6]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.5...v3.0.6
[3.0.5]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.4...v3.0.5
[3.0.4]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.3...v3.0.4
[3.0.3]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.2...v3.0.3
[3.0.2]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.1...v3.0.2 [3.0.2]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.1...v3.0.2
[3.0.1]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.0...v3.0.1 [3.0.1]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.0...v3.0.1
[3.0.0]: https://github.com/NTBBloodbath/doom-nvim/compare/v2.3.6...v3.0.0 [3.0.0]: https://github.com/NTBBloodbath/doom-nvim/compare/v2.3.6...v3.0.0

5
README.md

@ -9,7 +9,7 @@
![Neovim version](https://img.shields.io/badge/Neovim-0.5-57A143?style=for-the-badge&logo=neovim) ![Neovim version](https://img.shields.io/badge/Neovim-0.5-57A143?style=for-the-badge&logo=neovim)
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-) [![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END --> <!-- ALL-CONTRIBUTORS-BADGE:END -->
[Features](#features) • [Install](#install) • [Documentation] • [Contribute](#contribute) [Features](#features) • [Install](#install) • [Documentation] • [Contribute](#contribute)
@ -175,7 +175,8 @@ Special thanks to these amazing people for helping improve doom (see [emoji key]
<td align="center"><a href="https://github.com/ZeusThundr"><img src="https://avatars.githubusercontent.com/u/76399616?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ZeusThundr</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3AZeusThundr" title="Bug reports">🐛</a></td> <td align="center"><a href="https://github.com/ZeusThundr"><img src="https://avatars.githubusercontent.com/u/76399616?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ZeusThundr</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3AZeusThundr" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/leonistor"><img src="https://avatars.githubusercontent.com/u/310468?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leo Nistor</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Aleonistor" title="Bug reports">🐛</a></td> <td align="center"><a href="https://github.com/leonistor"><img src="https://avatars.githubusercontent.com/u/310468?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leo Nistor</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Aleonistor" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/notusknot"><img src="https://avatars.githubusercontent.com/u/69602000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>notusknot</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=notusknot" title="Documentation">📖</a></td> <td align="center"><a href="https://github.com/notusknot"><img src="https://avatars.githubusercontent.com/u/69602000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>notusknot</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=notusknot" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/bdillahu"><img src="https://avatars.githubusercontent.com/u/2058566?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bruce Dillahunty</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=bdillahu" title="Documentation">📖</a></td> <td align="center"><a href="https://github.com/bdillahu"><img src="https://avatars.githubusercontent.com/u/2058566?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bruce Dillahunty</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/commits?author=bdillahu" title="Documentation">📖</a> <a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Abdillahu" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/amxj9"><img src="https://avatars.githubusercontent.com/u/2029709?v=4?s=100" width="100px;" alt=""/><br /><sub><b>amxj9</b></sub></a><br /><a href="https://github.com/NTBBloodbath/doom-nvim/issues?q=author%3Aamxj9" title="Bug reports">🐛</a></td>
</tr> </tr>
</table> </table>

16
install.sh

@ -12,15 +12,15 @@
Color_reset='\033[0m' # Reset Color_reset='\033[0m' # Reset
## Normal colors ## Normal colors
Black='\033[0;30m' # Black Black='\033.0.70m' # Black
Gray='\033[0;90m' # Gray Gray='\033[0;90m' # Gray
White='\033[0;37m' # White White='\033.0.77m' # White
Red='\033[0;31m' # Red Red='\033.0.71m' # Red
Blue='\033[0;34m' # Blue Blue='\033.0.74m' # Blue
Cyan='\033[0;36m' # Cyan Cyan='\033.0.76m' # Cyan
Purple='\033[0;35m' # Purple Purple='\033.0.75m' # Purple
Green='\033[0;32m' # Green Green='\033.0.72m' # Green
Yellow='\033[0;33m' # Yellow Yellow='\033.0.73m' # Yellow
## Bold colors ## Bold colors
BBlack='\033[1;30m' # Black BBlack='\033[1;30m' # Black

58
lua/doom/core/config/init.lua

@ -24,6 +24,11 @@ else
) )
end end
-- Set termguicolors on load
if vim.fn.has('vim_starting') then
vim.opt.termguicolors = true
end
-- {{{ Default doom_config values -- {{{ Default doom_config values
-- default_doom_config_values loads the default doom_config values -- default_doom_config_values loads the default doom_config values
@ -418,29 +423,36 @@ end
-- --
-- @param langs The list of languages in the doomrc -- @param langs The list of languages in the doomrc
M.install_servers = function(langs) M.install_servers = function(langs)
local lspinstall = require('lspinstall') -- selene: allow(undefined_variable)
local installed_servers = lspinstall.installed_servers() if
local available_servers = lspinstall.available_servers() packer_plugins
and packer_plugins['lspinstall']
for _, lang in ipairs(langs) do and packer_plugins['lspinstall'].loaded
local lang_str = lang then
lang = lang:gsub('%s+%+lsp', '') local lspinstall = require('lspinstall')
local installed_servers = lspinstall.installed_servers()
-- If the +lsp flag exists and the language server is not installed yet local available_servers = lspinstall.available_servers()
if
lang_str:find('%+lsp') for _, lang in ipairs(langs) do
and (not utils.has_value(installed_servers, lang)) local lang_str = lang
then lang = lang:gsub('%s+%+lsp', '')
-- Try to install the server only if there is a server available for
-- the language, oterwise raise a warning -- If the +lsp flag exists and the language server is not installed yet
if utils.has_value(available_servers, lang) then if
lspinstall.install_server(lang) lang_str:find('%+lsp')
else and (not utils.has_value(installed_servers, lang))
log.warn( then
'The language ' -- Try to install the server only if there is a server available for
.. lang -- the language, oterwise raise a warning
.. ' does not have a server, please remove the "+lsp" flag' if utils.has_value(available_servers, lang) then
) lspinstall.install_server(lang)
else
log.warn(
'The language '
.. lang
.. ' does not have a server, please remove the "+lsp" flag'
)
end
end end
end end
end end

2
lua/doom/core/functions/init.lua

@ -67,7 +67,7 @@ M.load_custom_settings = function(settings_tbl, scope)
local opts = { silent = true } local opts = { silent = true }
for _, map in ipairs(settings_tbl) do for _, map in ipairs(settings_tbl) do
-- scope, lhs, rhs, options -- scope, lhs, rhs, options
map(map[1], map[2], map[3], opts) utils.map(map[1], map[2], map[3], opts)
end end
elseif scope == 'variables' then elseif scope == 'variables' then
for var, val in pairs(settings_tbl) do for var, val in pairs(settings_tbl) do

2
lua/doom/modules/config/doom-compe.lua

@ -24,8 +24,10 @@ return function()
vsnip = false, vsnip = false,
nvim_lsp = true, nvim_lsp = true,
nvim_lua = true, nvim_lua = true,
luasnip = true,
spell = false, spell = false,
tags = true, tags = true,
neorg = true,
snippets_nvim = false, snippets_nvim = false,
treesitter = true, treesitter = true,
}, },

3
lua/doom/modules/config/doom-luasnip.lua

@ -0,0 +1,3 @@
return function()
require('luasnip.loaders.from_vscode').lazy_load()
end

18
lua/doom/modules/init.lua

@ -90,7 +90,7 @@ packer.startup(function(use)
use({ use({
'GustavoPrietoP/doom-themes.nvim', 'GustavoPrietoP/doom-themes.nvim',
disable = disabled_doom_themes, disable = disabled_doom_themes,
event = 'TabNewEntered', event = 'ColorSchemePre',
}) })
-- Development icons -- Development icons
@ -276,16 +276,10 @@ packer.startup(function(use)
local disabled_snippets = functions.is_plugin_disabled('snippets') local disabled_snippets = functions.is_plugin_disabled('snippets')
use({ use({
'L3MON4D3/LuaSnip', 'L3MON4D3/LuaSnip',
commit = '24f3317166a91db3d8f16fbaa610b1cfa6615f14', config = require('doom.modules.config.doom-luasnip'),
disable = (disabled_lsp and true or disabled_snippets), disable = disabled_snippets,
opt = true, requires = { 'rafamadriz/friendly-snippets' },
after = 'nvim-compe', event = 'BufWinEnter',
})
use({
'rafamadriz/friendly-snippets',
disable = (disabled_lsp and true or disabled_snippets),
opt = true,
after = 'nvim-compe',
}) })
-- install lsp saga -- install lsp saga
@ -323,7 +317,7 @@ packer.startup(function(use)
'lukas-reineke/format.nvim', 'lukas-reineke/format.nvim',
config = require('doom.modules.config.doom-format'), config = require('doom.modules.config.doom-format'),
disable = disabled_formatter, disable = disabled_formatter,
cmd = { 'Format', 'FormatWrite' }, event = 'BufWinEnter',
}) })
-- Autopairs -- Autopairs

Loading…
Cancel
Save