wires/nvim
1
0
Fork 0
Code Pull requests Projects Releases Packages Wiki Activity Actions

refactor(config): rename example configs

Browse source
This commit is contained in:
Matt Leong 2021-11-06 22:10:57 -07:00
parent 16cfc46795
commit 7cff9dcd98
9 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -3,3 +3,7 @@ sessions/**
.netrwhist .netrwhist
plugin/ plugin/
lua/cosmic/compiled.lua lua/cosmic/compiled.lua
lua/cosmic/config/editor.lua
lua/cosmic/config/config.lua
lua/cosmic/config/mappings.lua
lua/cosmic/config/plugins.lua

0
lua/cosmic/config/config.lua → lua/cosmic/config/config-example.lua
View file

0
lua/cosmic/config/editor.lua → lua/cosmic/config/editor-example.lua
View file

5
lua/cosmic/config/init.lua
View file

@ -2,11 +2,6 @@
local ok, user_config = pcall(require, 'cosmic.config.config') local ok, user_config = pcall(require, 'cosmic.config.config')
if not ok then if not ok then
error(('Error loading user config...\n\n%s'):format(user_config))
error('No user config, using default instead...')
end
if user_config == true then
user_config = {} user_config = {}
end end

0
lua/cosmic/config/mappings.lua → lua/cosmic/config/mappings-example.lua
View file

0
lua/cosmic/config/plugins.lua → lua/cosmic/config/plugins-example.lua
View file

13
lua/cosmic/init.lua
View file

@ -3,10 +3,8 @@ local cosmic_modules = {
'cosmic.pluginsInit', 'cosmic.pluginsInit',
'cosmic.compiled', 'cosmic.compiled',
'cosmic.editor', 'cosmic.editor',
'cosmic.core.theme.highlights',
'cosmic.config.editor',
'cosmic.mappings', 'cosmic.mappings',
'cosmic.config.mappings', 'cosmic.core.theme.highlights',
} }
for _, mod in ipairs(cosmic_modules) do for _, mod in ipairs(cosmic_modules) do
@ -15,3 +13,12 @@ for _, mod in ipairs(cosmic_modules) do
error(('Error loading %s...\n\n%s'):format(mod, err)) error(('Error loading %s...\n\n%s'):format(mod, err))
end end
end end
local user_config_modules = {
'cosmic.config.editor',
'cosmic.config.mappings',
}
for _, mod in ipairs(user_config_modules) do
pcall(require, mod)
end

5
lua/cosmic/pluginsInit.lua
View file

@ -9,11 +9,6 @@ local use = packer.use
local ok, user_plugins = pcall(require, 'cosmic.config.plugins') local ok, user_plugins = pcall(require, 'cosmic.config.plugins')
if not ok then if not ok then
error(('Error loading user custom plugins...\n\n%s'):format(user_plugins))
return false
end
if user_plugins == true then
user_plugins = { user_plugins = {
add = {}, add = {},
disable = {}, disable = {},

16
readme.md
View file

@ -66,13 +66,13 @@ Additional LSP server installation [details](https://github.com/mattleong/Cosmic
## Configuration ## Configuration
[Cosmic configurations](./lua/cosmic/config/config.lua) [Cosmic configurations](./lua/cosmic/config/config-example.lua)
[Plugin configurations](./lua/cosmic/config/plugins.lua) [Plugin configurations](./lua/cosmic/config/plugins-example.lua)
[Add additional mappings](./lua/cosmic/config/mappings.lua) [Add additional mappings](./lua/cosmic/config/mappings-example.lua)
[Add additional vim options](./lua/cosmic/config/editor.lua) [Add additional vim options](./lua/cosmic/config/editor-example.lua)
## Treesitter Support ## Treesitter Support
@ -98,15 +98,15 @@ Enter `:TSInstall` followed by <TAB> to see your options for additional language
![insert](https://user-images.githubusercontent.com/3721204/137990345-d036c2d1-0f9e-4d4e-bd6c-13e051609f61.png) ![insert](https://user-images.githubusercontent.com/3721204/137990345-d036c2d1-0f9e-4d4e-bd6c-13e051609f61.png)
![visual](https://user-images.githubusercontent.com/3721204/137990348-6eb29e9b-e912-4d6e-8a5e-e763816613d7.png) ![visual](https://user-images.githubusercontent.com/3721204/137990348-6eb29e9b-e912-4d6e-8a5e-e763816613d7.png)
![replace](https://user-images.githubusercontent.com/3721204/137990347-b59428d6-b5fe-4edb-8ceb-ab37b69b7e76.png) ![replace](https://user-images.githubusercontent.com/3721204/137990347-b59428d6-b5fe-4edb-8ceb-ab37b69b7e76.png)
### Dashboard ### Dashboard
<img width="1792" alt="dashboard" src="https://user-images.githubusercontent.com/3721204/140592730-fc512005-6060-4dd2-8b90-0afa865d61d3.png"> <img width="1792" alt="dashboard" src="https://user-images.githubusercontent.com/3721204/140592730-fc512005-6060-4dd2-8b90-0afa865d61d3.png">
### Autocomplete ### Autocomplete
<img width="1792" alt="autocomplete" src="https://user-images.githubusercontent.com/3721204/140592713-f08c72f8-4fc5-4422-8987-2224b9425725.png"> <img width="1792" alt="autocomplete" src="https://user-images.githubusercontent.com/3721204/140592713-f08c72f8-4fc5-4422-8987-2224b9425725.png">
### Rename ### Rename
<img width="859" alt="rename" src="https://user-images.githubusercontent.com/3721204/140592783-c9875634-805e-45f4-8547-6dcb5b5c7404.png"> <img width="859" alt="rename" src="https://user-images.githubusercontent.com/3721204/140592783-c9875634-805e-45f4-8547-6dcb5b5c7404.png">
@ -118,5 +118,5 @@ Enter `:TSInstall` followed by <TAB> to see your options for additional language
### Hover ### Hover
<img width="1792" alt="hover" src="https://user-images.githubusercontent.com/3721204/140592798-b9dbbdee-8496-4998-a874-110a051a7672.png"> <img width="1792" alt="hover" src="https://user-images.githubusercontent.com/3721204/140592798-b9dbbdee-8496-4998-a874-110a051a7672.png">
[See more screenshots](https://github.com/mattleong/CosmicNvim/wiki/Screenshots) [See more screenshots](https://github.com/mattleong/CosmicNvim/wiki/Screenshots)