From efc6c3271b52d73cfb0ab7b3d9dad852afe2b2de Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Sat, 25 Mar 2023 14:10:38 +0530 Subject: [PATCH] nvim: move away from old theme EdenEast/nightfox to catppuccin/nvim --- .config/nvim/lua/plug-init.lua | 3 +- .config/nvim/lua/plug-setup.lua | 98 ++++++++++++++++++-------------- .config/nvim/lua/vim-options.lua | 2 +- 3 files changed, 58 insertions(+), 45 deletions(-) diff --git a/.config/nvim/lua/plug-init.lua b/.config/nvim/lua/plug-init.lua index 915503e..db51367 100644 --- a/.config/nvim/lua/plug-init.lua +++ b/.config/nvim/lua/plug-init.lua @@ -30,7 +30,7 @@ require('lazy').setup({ 'tpope/vim-sleuth', -- theme - 'EdenEast/nightfox.nvim', + { "catppuccin/nvim", name = "catppuccin" }, { -- Rust lang 'rust-lang/rust.vim', @@ -159,4 +159,3 @@ require('lazy').setup({ }, }, {}) - diff --git a/.config/nvim/lua/plug-setup.lua b/.config/nvim/lua/plug-setup.lua index 9365c9a..98dba3a 100644 --- a/.config/nvim/lua/plug-setup.lua +++ b/.config/nvim/lua/plug-setup.lua @@ -519,52 +519,66 @@ cmp.setup { -------------------------------------------------------------------------------- --- nightfox.nvim +-- catppuccin.nvim -------------------------------------------------------------------------------- ---[[ -require('nightfox').setup({ - options = { - compile_path = vim.fn.stdpath('cache') .. '/nightfox', - compile_file_suffix = '_compiled', - transparent = false, - terminal_colors = true, - dim_inactive = false, - module_default = true, - colorblind = { - enable = true, - -- Only show simulated colorblind colors and not diff shifted - simulate_only = true, - severity = { - protan = 1, -- red - deutan = 1, -- green - tritan = 0, -- blue - }, - }, - styles = { - -- :help attr-list - comments = 'NONE', - conditionals = 'bold,standout', - constants = 'bold,standout', - functions = 'bold', - keywords = 'bold', - numbers = 'NONE', - operators = 'NONE', - strings = 'NONE', - types = 'NONE', - variables = 'NONE', - }, - inverse = { - match_paren = false, - visual = false, - search = false, +require("catppuccin").setup { + flavour = "mocha", -- latte, frappe, macciato, mocha + background = { + light = "latte", + dark = "mocha", + }, + transparent_background = false, + show_end_of_buffer = false, + term_colors = false, + dim_inactive = { + enabled = false, + shade = "dark", + percentage = 0.15, + }, + no_italic = false, -- force no_italic + no_bold = false, + styles = { + comments = { "italic" }, + conditionals = { "italic" }, + loops = {}, + functions = {}, + keywords = {}, + strings = {}, + variables = { "bold" }, + numbers = {}, + booleans = { "italic" }, + properties = {}, + types = {}, + operators = { "bold" }, + }, + color_overrides = { + mocha = { + base = "#000000", + mantle = "#000000", + crust = "#000000", }, }, - palettes = {}, - specs = {}, - groups = {}, -}) ---]] + highlight_overrides = { + mocha = function(C) + return { + TabLineSel = { bg = C.pink }, + CmpBorder = {fg = C.surface }, + Pmenu = { bg = C.none }, + TelescopeBorder = { link = "FloatBorder" }, + } + end, + }, + custom_highlights = {}, + integrations = { + cmp = true, + gitsigns = true, + nvimtree = false, + telescope = true, + markdown = true, + mason = true, + }, +} -------------------------------------------------------------------------------- -- indent-blankline.nvim diff --git a/.config/nvim/lua/vim-options.lua b/.config/nvim/lua/vim-options.lua index dc554d4..b69d370 100644 --- a/.config/nvim/lua/vim-options.lua +++ b/.config/nvim/lua/vim-options.lua @@ -1,5 +1,5 @@ -- appearance -vim.cmd.colorscheme 'carbonfox' +vim.cmd.colorscheme 'catppuccin' vim.opt.colorcolumn = '80' vim.opt.cursorcolumn = true vim.opt.cursorline = true