diff --git a/plugins/ux/default.nix b/plugins/ux/default.nix index 14f0f96..52a7627 100644 --- a/plugins/ux/default.nix +++ b/plugins/ux/default.nix @@ -11,12 +11,17 @@ let inherit (builtins) readFile; + hopLuaConfig = readFile ./hop-nvim.lua; + orgmodeSettings = lib.toLua (lib.attrByPath [ "orgmode" "settings" ] { } plugins); + orgmodeLuaConfig = lib.optional enableOrgMode (readFile (lib.substituteAll { src = ./nvim-orgmode.lua; inherit orgmodeSettings; })); + + colorizerFiletypes = lib.toLua (lib.attrByPath [ "colorizer" "filetypes" ] { } plugins); + colorizerSettings = lib.toLua (lib.attrByPath [ "colorizer" "settings" ] { } plugins); + colorizerLuaConfig = readFile (lib.substituteAll { src = ./nvim-colorizer.lua; inherit colorizerFiletypes colorizerSettings; }); in { - luaConfig = readFile ./hop-nvim.lua - + lib.optional enableOrgMode (readFile (lib.substituteAll { src = ./nvim-orgmode.lua; inherit orgmodeSettings; })) - + readFile ./nvim-colorizer.lua; + luaConfig = hopLuaConfig + orgmodeLuaConfig + colorizerLuaConfig; plugins = [ hop-nvim nvim-colorizer ] ++ lib.optional enableOrgMode [ nvim-orgmode org-bullets-nvim ]; diff --git a/plugins/ux/nvim-colorizer.lua b/plugins/ux/nvim-colorizer.lua index 3229a5f..69d19d4 100644 --- a/plugins/ux/nvim-colorizer.lua +++ b/plugins/ux/nvim-colorizer.lua @@ -1 +1 @@ -require("coloriazer").setup() +require("colorizer").setup(@colorizerFiletypes@, @colorizerSettings@)