From 0e6bd99cb4d821198fcfd7a3d829b2a9604683ab Mon Sep 17 00:00:00 2001 From: NTBBloodbath Date: Sun, 11 Jul 2021 18:46:13 -0400 Subject: [PATCH 1/4] fix(keybindings): add some missing `` --- lua/doom/core/keybindings/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/doom/core/keybindings/init.lua b/lua/doom/core/keybindings/init.lua index d0f61fed6..20f0ae1a2 100644 --- a/lua/doom/core/keybindings/init.lua +++ b/lua/doom/core/keybindings/init.lua @@ -192,7 +192,7 @@ end utils.map( 'n', 'ZZ', - ':lua require("doom.core.functions").quit_doom(true, true)', + 'lua require("doom.core.functions").quit_doom(true, true)', opts ) @@ -286,7 +286,7 @@ utils.map('n', 'ff', 'Telescope find_files', opts) utils.map('n', 'fr', 'Telescope oldfiles', opts) utils.map('n', 'ft', 'Telescope help_tags', opts) utils.map('n', 'fR', 'SudaRead', opts) -utils.map('n', 'fw', 'SudaWrite', opts) +utils.map('n', 'fw', 'SudaWrite', opts) -- search utils.map('n', 'sg', 'Telescope live_grep', opts) @@ -311,9 +311,9 @@ utils.map('n', 'wj', 'j', opts) utils.map('n', 'wl', 'l', opts) utils.map('n', 'wk', 'k', opts) utils.map('n', 'wH', '5<', opts) -utils.map('n', 'wJ', 'resize +5', opts) +utils.map('n', 'wJ', 'resize +5', opts) utils.map('n', 'wL', '5>', opts) -utils.map('n', 'wK', 'resize -5', opts) +utils.map('n', 'wK', 'resize -5', opts) utils.map('n', 'w=', '=', opts) utils.map('n', 'ws', 's', opts) utils.map('n', 'wv', 'v', opts) From 16045b5414ca3ae0869821cd25e823ced5b550ed Mon Sep 17 00:00:00 2001 From: NTBBloodbath Date: Sun, 11 Jul 2021 18:47:32 -0400 Subject: [PATCH 2/4] feat(docs): add CHANGELOG entry for `v3.0.1` --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c4d503a..5a106a9cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.0.1] - 2021-07-11 + +### Fixed + +- Added some missing `` at the end of some `SPC` keybindings. + ## [3.0.0] - 2021-07-11 ### Added @@ -358,7 +364,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial stable release -[unreleased]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.0...develop +[unreleased]: https://github.com/NTBBloodbath/doom-nvim/compare/v3.0.1...develop +[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 [2.3.6]: https://github.com/NTBBloodbath/doom-nvim/compare/v2.3.5...v2.3.6 [2.3.5]: https://github.com/NTBBloodbath/doom-nvim/compare/v2.3.4...v2.3.5 From 899472514fff7e7a6abccab74540ef6af226db92 Mon Sep 17 00:00:00 2001 From: NTBBloodbath Date: Sun, 11 Jul 2021 19:52:24 -0400 Subject: [PATCH 3/4] feat(docs): tweak README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5f1f50ddb..85ff33605 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,9 @@ Its design is guided by these mantras: - A modular organizational structure for separating concerns in your config. - Extensible and customizable, everything can be easily modified. - Curated and sane defaults for many plugins. +- Automatized, you don't have to care about manually managing plugins, installing + language servers or even TreeSitter syntax parsers, Doom Nvim will handle all + these things for you. - A declarative and powerful [plugins management system](https://github.com/wbthomason/packer.nvim) (powered by `packer.nvim`). - Opt-in LSP integration for many languages by using the new From 0c82a23cae5761c88da9ad3118d9d53661145bb9 Mon Sep 17 00:00:00 2001 From: Manpreet Singh Date: Sun, 11 Jul 2021 17:27:22 -0700 Subject: [PATCH 4/4] Assume ~/.config/nvim rather than ~/.config/doom-nvim in lua code --- lua/doom/core/functions/init.lua | 4 ++-- lua/doom/core/keybindings/init.lua | 2 +- lua/doom/modules/config/doom-dashboard.lua | 2 +- lua/doom/utils/init.lua | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/doom/core/functions/init.lua b/lua/doom/core/functions/init.lua index a93947111..9e698d26c 100644 --- a/lua/doom/core/functions/init.lua +++ b/lua/doom/core/functions/init.lua @@ -93,7 +93,7 @@ M.quit_doom = function(write, force) .. config.doom.colorscheme .. "'/'" .. target_colorscheme - .. '\'/" $HOME/.config/doom-nvim/doom_config.lua' + .. '\'/" $HOME/.config/nvim/doom_config.lua' ) log.info( 'Colorscheme successfully changed to ' .. target_colorscheme @@ -105,7 +105,7 @@ M.quit_doom = function(write, force) .. config.doom.colorscheme_bg .. "'/'" .. target_background - .. '\'/" $HOME/.config/doom-nvim/doom_config.lua' + .. '\'/" $HOME/.config/nvim/doom_config.lua' ) log.info('Background successfully changed to ' .. target_background) end diff --git a/lua/doom/core/keybindings/init.lua b/lua/doom/core/keybindings/init.lua index 20f0ae1a2..ca2e56753 100644 --- a/lua/doom/core/keybindings/init.lua +++ b/lua/doom/core/keybindings/init.lua @@ -257,7 +257,7 @@ utils.map('n', 'bf', 'FormatWrite', opts) utils.map( 'n', 'dc', - 'e ~/.config/doom-nvim/doom_config.lua', + 'e ~/.config/nvim/doom_config.lua', opts ) utils.map('n', 'dd', 'help doom_nvim', opts) diff --git a/lua/doom/modules/config/doom-dashboard.lua b/lua/doom/modules/config/doom-dashboard.lua index 0404405e1..03a863e1c 100644 --- a/lua/doom/modules/config/doom-dashboard.lua +++ b/lua/doom/modules/config/doom-dashboard.lua @@ -28,7 +28,7 @@ return function() }, f = { description = { ' Open Private Configuration SPC d c' }, - command = ':e ~/.config/doom-nvim/doomrc', + command = ':e ~/.config/nvim/doomrc', }, g = { description = { ' Open Documentation SPC d d' }, diff --git a/lua/doom/utils/init.lua b/lua/doom/utils/init.lua index f0c254f4c..1d156227c 100644 --- a/lua/doom/utils/init.lua +++ b/lua/doom/utils/init.lua @@ -11,7 +11,7 @@ local M = {} M.doom_version = '3.0.0' -- Local files -M.doom_root = vim.fn.expand('$HOME/.config/doom-nvim') +M.doom_root = vim.fn.expand('$HOME/.config/nvim') M.doom_logs = vim.fn.stdpath('data') .. '/doom.log' M.doom_report = vim.fn.stdpath('data') .. '/doom_report.md'