diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index ddb6edc..f41a1fc 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -18,6 +18,7 @@ vim.keymap.set("n", "/", ":FzfLua files", {desc = "Open fzf in vim.keymap.set("n", "?", ":FzfLua files cwd=/", {desc = "Open fzf in root dir"}) vim.keymap.set("n", "", ":FzfLua grep", {desc = "Grep CWD"}) vim.keymap.set("n", "", ":FzfLua grep cwd=/", {desc = "Grep root dir"}) +vim.keymap.set("n", "t", "FzfLua colorschemes", {desc = "Browse colourschemes"}) --BARBAR vim.keymap.set("n", "b[", "BufferPrevious", {desc = "Previous buffer tab"}) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index bb11926..ed2e7f6 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -21,9 +21,12 @@ vim.opt.rtp:prepend(lazypath) -- This is also a good place to setup other settings (vim.opt) vim.g.mapleader = " " --vim.g.maplocalleader = "\\" +vim.opt.termguicolors = true require("config.options") +local colScheme = require("ignoreConfig.colourConfig") + -- Setup lazy.nvim require("lazy").setup({ spec = { @@ -32,13 +35,14 @@ require("lazy").setup({ }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "everforest" } }, + install = { colorscheme = { colScheme.name } }, -- automatically check for plugin updates checker = { enabled = true, notify = false }, }) +vim.cmd("colorscheme " .. colScheme.name); --setup colour indents local highlight = { diff --git a/lua/ignoreConfig/colourConfig.lua.example b/lua/ignoreConfig/colourConfig.lua.example index a937d2b..eaf3163 100644 --- a/lua/ignoreConfig/colourConfig.lua.example +++ b/lua/ignoreConfig/colourConfig.lua.example @@ -1,4 +1,5 @@ local opts = { + name = "everforest", transparent = 0 } diff --git a/lua/plugins/colourscheme.lua b/lua/plugins/colourscheme.lua index 2a3c389..7a15c6d 100644 --- a/lua/plugins/colourscheme.lua +++ b/lua/plugins/colourscheme.lua @@ -1,7 +1,7 @@ ---[[ -return { +local material = { 'marko-cerovac/material.nvim', priority = 1000, + lazy = true, config = function() local material = require "material" --local colours = require "material.colors" @@ -18,7 +18,7 @@ return { -- AlphaFooter = { fg = colours.main.red}, }, }) - vim.cmd('colorscheme material') + --vim.cmd('colorscheme material') end, } @@ -31,24 +31,23 @@ return { --deep ocean --]] ---[[ -- DRACULA -return { +local dracula = { -- add dracula "Mofiqul/dracula.nvim", priority = 1000, - config = function() - vim.cmd('colorscheme dracula') - end, + lazy = true, + --config = function() + -- vim.cmd('colorscheme dracula') + --end, } ---]] ---[[ -return { +local kanagawa = { "rebelot/kanagawa.nvim", priority = 1000, + lazy = true, config = function() local ignores = require('ignoreConfig.colourConfig') require('kanagawa').setup({ @@ -71,27 +70,27 @@ return { }, }, }) - vim.cmd("colorscheme kanagawa-dragon") + --vim.cmd("colorscheme kanagawa-dragon") -- colourschemes: -- wave (default) -- dragon (dark) -- lotus (MY EEEEYES!) end, --uncomment this and 'compile=true' in setup if compiling to bytecode - build = function() - vim.cmd("KanagawaCompile") - end, + --build = function() + -- vim.cmd("KanagawaCompile") + --end, } ---]] --EVERFOREST -return{ +local everforest = { "neanias/everforest-nvim", priority = 1000, + lazy = true, config = function() local everforest = require("everforest"); local ignore = require('ignoreConfig.colourConfig'); @@ -102,6 +101,15 @@ return{ }); everforest.load(); - vim.cmd("colorscheme everforest"); + --vim.cmd("colorscheme everforest"); end, } + + + +return { + material, + dracula, + kanagawa, + everforest +}