restructure configs

This commit is contained in:
Dmitriy Pleshevskiy 2022-09-16 10:10:38 +03:00
parent bed6e851cd
commit c6d1be78e8
Signed by: pleshevskiy
GPG key ID: 1B59187B161C0215
10 changed files with 9 additions and 17 deletions

View file

@ -16,14 +16,6 @@ vim.opt.encoding = "utf-8"
-- True color support -- True color support
vim.opt.termguicolors = true vim.opt.termguicolors = true
-- Theme (required plugin 'material-vim')
-- Available styles: default, planight, ocean, lighter
-- darker, default-community, palenight-community, ocean-community,
-- lighter-community, darker-community
-- vim.g.material_theme_style = "default"
-- vim.g.lightline = { colorscheme = "material_vim" }
-- vim.cmd("colorscheme material")
-- Other options -- Other options
vim.cmd("syntax on") vim.cmd("syntax on")
vim.opt.backspace = { "indent", "eol", "start" } vim.opt.backspace = { "indent", "eol", "start" }

View file

@ -6,14 +6,15 @@ let
callPlugins = list: builtins.map (p: callPackage p { }) list; callPlugins = list: builtins.map (p: callPackage p { }) list;
plugins = callPlugins [ plugins = callPlugins [
./syntax ./plugins/syntax
./explorer ./plugins/explorer
./theme ./plugins/theme
./lsp ./plugins/lsp
]; ];
basicConfig = builtins.readFile ./basic.lua; basicConfigs = [builtins.readFile ./config/basic.lua];
pluginConfigs = lib.extractAttrs "luaConfig" plugins;
allConfigs = basicConfigs ++ pluginConfigs;
in in
wrapNeovim neovim-unwrapped { wrapNeovim neovim-unwrapped {
withPython3 = false; withPython3 = false;
@ -21,9 +22,8 @@ wrapNeovim neovim-unwrapped {
withRuby = false; withRuby = false;
configure = { configure = {
customRC = lib.mkLuaRc ([ basicConfig ] ++ lib.extractAttrs "luaConfig" plugins); customRC = lib.mkLuaRc allConfigs;
packages.myVimPackages = packages.myVimPackages = { start = lib.extractAttrs "plugins" plugins; };
{ start = lib.extractAttrs "plugins" plugins; };
}; };
} }