Merge pull request #41 from junkblocker/nvim

Assume ~/.config/nvim rather than ~/.config/doom-nvim in lua code

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 `<CR>` 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

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

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

lua/doom/core/keybindings/init.lua

@@ -192,7 +192,7 @@ end
 utils.map(
 	'n',
 	'ZZ',
-	':lua require("doom.core.functions").quit_doom(true, true)<CR>',
+	'<cmd>lua require("doom.core.functions").quit_doom(true, true)<CR>',
 	opts
 )
 
@@ -257,7 +257,7 @@ utils.map('n', '<leader>bf', '<cmd>FormatWrite<CR>', opts)
 utils.map(
 	'n',
 	'<leader>dc',
-	'<cmd>e ~/.config/doom-nvim/doom_config.lua<CR>',
+	'<cmd>e ~/.config/nvim/doom_config.lua<CR>',
 	opts
 )
 utils.map('n', '<leader>dd', '<cmd>help doom_nvim<CR>', opts)
@@ -286,7 +286,7 @@ utils.map('n', '<leader>ff', '<cmd>Telescope find_files<CR>', opts)
 utils.map('n', '<leader>fr', '<cmd>Telescope oldfiles<CR>', opts)
 utils.map('n', '<leader>ft', '<cmd>Telescope help_tags<CR>', opts)
 utils.map('n', '<leader>fR', '<cmd>SudaRead<CR>', opts)
-utils.map('n', '<leader>fw', '<cmd>SudaWrite', opts)
+utils.map('n', '<leader>fw', '<cmd>SudaWrite<CR>', opts)
 
 -- search
 utils.map('n', '<leader>sg', '<cmd>Telescope live_grep<CR>', opts)
@@ -311,9 +311,9 @@ utils.map('n', '<leader>wj', '<C-W>j', opts)
 utils.map('n', '<leader>wl', '<C-W>l', opts)
 utils.map('n', '<leader>wk', '<C-W>k', opts)
 utils.map('n', '<leader>wH', '<C-W>5<', opts)
-utils.map('n', '<leader>wJ', '<cmd>resize +5', opts)
+utils.map('n', '<leader>wJ', '<cmd>resize +5<CR>', opts)
 utils.map('n', '<leader>wL', '<C-W>5>', opts)
-utils.map('n', '<leader>wK', '<cmd>resize -5', opts)
+utils.map('n', '<leader>wK', '<cmd>resize -5<CR>', opts)
 utils.map('n', '<leader>w=', '<C-W>=', opts)
 utils.map('n', '<leader>ws', '<C-W>s', opts)
 utils.map('n', '<leader>wv', '<C-W>v', opts)

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

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'