From 9639e69920461d23d58b1142637193981ccd59fc Mon Sep 17 00:00:00 2001 From: agryphus Date: Mon, 22 May 2023 16:34:27 -0400 Subject: [PATCH] Updated colors to be more bland lol --- after/plugin/colors.lua | 57 ++++++++++++++++++++++++++++++----------- lua/andrew/packer.lua | 10 +++++--- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index 08838c0..ce64bd0 100755 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -1,22 +1,49 @@ -vim.o.background = "dark" - -require("vscode.colors").get_colors() -require("vscode").setup({ - transparent = true -}) +local palette = { + none = "NONE", + fg = "#E1E1E1", + bg = "#151515", + alt_bg = "#171717", + accent = "#202020", + white = "#E1E1E1", + gray = "#373737", + medium_gray = "#727272", + light_gray = "#AFAFAF", + blue = "#BAD7FF", + gray_blue = "#7E97AB", + medium_gray_blue = "#A2B5C1", + cyan = "#88afa2", + red = "#b46958", + green = "#90A959", + yellow = "#F4BF75", + orange = "#FFA557", + purple = "#AA749F", + magenta = "#AA759F", + cursor_fg = "#151515", + cursor_bg = "#D0D0D0", + sign_add = "#586935", + sign_change = "#51657B", + sign_delete = "#984936", + error = "#984936", + warning = "#ab8550", + info = "#ab8550", + hint = "#576f82", + neogit_light_green = "#2A2E19", + neogit_blue = "#1B1F27", + neogit_green = "#212513", + neogit_light_red = "#402020", + neogit_red = "#351D1D", +} require("no-clown-fiesta").setup({ transparent = true, -- Enable this to disable the bg color - styles = { - -- You can set any of the style values specified for `:h nvim_set_hl` - comments = {}, - keywords = {}, - functions = {}, - variables = {}, - type = { bold = true }, - lsp = { underline = true } - }, }) vim.cmd[[colorscheme no-clown-fiesta]] +-- My own color overrides +local hl = vim.api.nvim_set_hl +hl(0, 'TSConstant', { fg = palette.yellow }) +hl(0, 'ErrorMsg', { fg = palette.yellow }) +hl(0, 'LineNr', { fg = palette.medium_gray }) +hl(0, 'NvimTreeFolderIcon', { fg = palette.yellow }) + diff --git a/lua/andrew/packer.lua b/lua/andrew/packer.lua index 4cc30e6..735fa2b 100755 --- a/lua/andrew/packer.lua +++ b/lua/andrew/packer.lua @@ -13,12 +13,11 @@ return require("packer").startup(function(use) use({"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}) -- Themes - use { - "Mofiqul/vscode.nvim", - commit = "db9ee33" - } use "aktersnurra/no-clown-fiesta.nvim" + -- Referencing a hex code highlights it in that color + use "lilydjwg/colorizer" + -- Left-side file tree dispaly use { "nvim-tree/nvim-tree.lua", @@ -55,6 +54,9 @@ return require("packer").startup(function(use) } } + -- Linting + use "jose-elias-alvarez/null-ls.nvim" + -- Git wrapper use("tpope/vim-fugitive")