From 590af61a7fe4298206d92999f4b3fc98494b5bf6 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 3 Nov 2023 18:43:21 -0400 Subject: [PATCH 1/4] Added new theme I think? --- init.lua | 11 +++++++++++ lua/custom/plugins/init.lua | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/init.lua b/init.lua index baaae677..2e89a693 100644 --- a/init.lua +++ b/init.lua @@ -138,6 +138,11 @@ require('lazy').setup({ }, }, + -- I want to be able to use this, TODO resolve + -- { + -- "nyoom-engineering/oxocarbon.nvim" + -- }, + { -- Theme inspired by Atom 'navarasu/onedark.nvim', @@ -220,6 +225,12 @@ require('lazy').setup({ { import = 'custom.plugins' }, }, {}) +-- Configure Glow +require('glow').setup({ + style = 'dark', + install_path = os.getenv("GLOW_PATH") +}) + -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 4ccc6fc1..143fbe19 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -23,5 +23,10 @@ return { }, { 'ThePrimeagen/harpoon' + }, + { + "ellisonleao/glow.nvim", + config = true, + cmd = "Glow" } } From 2218ce9db8d84c5ae5e2c826f8c297ddf6a36f99 Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Fri, 3 Nov 2023 20:07:57 -0400 Subject: [PATCH 2/4] Changed theme --- init.lua | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index 2e89a693..7e5959d5 100644 --- a/init.lua +++ b/init.lua @@ -138,20 +138,26 @@ require('lazy').setup({ }, }, - -- I want to be able to use this, TODO resolve - -- { - -- "nyoom-engineering/oxocarbon.nvim" - -- }, - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' + "tiagovla/tokyodark.nvim", + opts = { + -- custom options here + }, + config = function(_, opts) + require("tokyodark").setup(opts) -- calling setup is optional + vim.cmd [[colorscheme tokyodark]] end, }, + -- { + -- -- Theme inspired by Atom + -- 'navarasu/onedark.nvim', + -- priority = 1000, + -- config = function() + -- vim.cmd.colorscheme 'onedark' + -- end, + -- }, + { -- Set lualine as statusline 'nvim-lualine/lualine.nvim', @@ -159,7 +165,7 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'onedark', + theme = 'tokyodark', component_separators = '|', section_separators = '', }, From 78a94034356406c41890e312e3d90d7e20c29e2c Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Fri, 3 Nov 2023 22:28:49 -0400 Subject: [PATCH 3/4] Tokyo Dark --- init.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 7e5959d5..5e7814f1 100644 --- a/init.lua +++ b/init.lua @@ -139,14 +139,13 @@ require('lazy').setup({ }, { - "tiagovla/tokyodark.nvim", - opts = { - -- custom options here - }, - config = function(_, opts) - require("tokyodark").setup(opts) -- calling setup is optional - vim.cmd [[colorscheme tokyodark]] + "folke/tokyonight.nvim", + lazy = false, + config = function() + vim.cmd.colorscheme 'tokyonight-night' end, + priority = 1000, + opts = {}, }, -- { @@ -165,7 +164,7 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'tokyodark', + theme = 'tokyonight', component_separators = '|', section_separators = '', }, From 9abcc60cf3981f45125699e1c02b636cf710593d Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Fri, 3 Nov 2023 22:46:39 -0400 Subject: [PATCH 4/4] More theme configuration --- init.lua | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index 5e7814f1..6c4c7753 100644 --- a/init.lua +++ b/init.lua @@ -141,21 +141,18 @@ require('lazy').setup({ { "folke/tokyonight.nvim", lazy = false, - config = function() - vim.cmd.colorscheme 'tokyonight-night' - end, priority = 1000, opts = {}, }, - -- { - -- -- Theme inspired by Atom - -- 'navarasu/onedark.nvim', - -- priority = 1000, - -- config = function() - -- vim.cmd.colorscheme 'onedark' - -- end, - -- }, + { + -- Theme inspired by Atom + 'navarasu/onedark.nvim', + priority = 1000, + config = function() + vim.cmd.colorscheme 'onedark' + end, + }, { -- Set lualine as statusline @@ -236,6 +233,14 @@ require('glow').setup({ install_path = os.getenv("GLOW_PATH") }) +-- Configure Theme +require('tokyonight').setup({ + style = 'night', + terminal_colors = true, + sidebars = { 'qf', 'vista_kind', 'terminal', 'packer' }, +}) +vim.cmd.colorscheme 'tokyonight' + -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish!