From 10d7142b695966bb173d68fd284d060896242057 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:19:49 +0200 Subject: [PATCH] Change colorscheme --- home/.config/foot/foot.ini | 36 ++++++------ home/.config/nvim/init.lua | 1 + .../nvim/lua/pluginconf/colorscheme.lua | 56 +++++++++++++++++++ home/.config/nvim/lua/pluginconf/lualine.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 12 ++-- home/.config/nvim/lua/settings.lua | 3 - 6 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/colorscheme.lua diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 00ddce0..ca08a5b 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -foreground=CDCECF -background=192330 -regular0=393B44 -regular1=C94F6D -regular2=81B29A -regular3=DBC074 -regular4=719CD6 -regular5=9D79D6 -regular6=63CDCF -regular7=DFDFE0 -bright0=7F8C98 -bright1=D6616B -bright2=58CD8B -bright3=FFE37E -bright4=84CEE4 -bright5=B8A1E3 -bright6=59F0FF -bright7=F2F2F2 +foreground = D7DAE0 +background = 1E1E28 +regular0 = 6E6C7C +regular1 = E28C8C +regular2 = B3E1A3 +regular3 = EADDA0 +regular4 = A4B9EF +regular5 = C6AAE8 +regular6 = F0AFE1 +regular7 = D7DAE0 +bright0 = 6E6C7C +bright1 = E28C8C +bright2 = B3E1A3 +bright3 = EADDA0 +bright4 = A4B9EF +bright5 = C6AAE8 +bright6 = F0AFE1 +bright7 = D7DAE0 diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index beecaa3..f1cce2a 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,3 +13,4 @@ require 'pluginconf.treesitter' require 'pluginconf.telescope' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' +require 'pluginconf.colorscheme' diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua new file mode 100644 index 0000000..46056f7 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -0,0 +1,56 @@ +require("catppuccin").setup( + { + transparent_background = false, + term_colors = false, + styles = { + comments = "italic", + functions = "italic", + keywords = "italic", + strings = "NONE", + variables = "NONE", + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = "italic", + hints = "italic", + warnings = "italic", + information = "italic", + }, + underlines = { + errors = "underline", + hints = "underline", + warnings = "underline", + information = "underline", + }, + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = { + enabled = false, + show_root = false, + }, + which_key = false, + indent_blankline = { + enabled = true, + colored_indent_levels = false, + }, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false, + }, + } +) +vim.cmd[[colorscheme catppuccin]] diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/pluginconf/lualine.lua index 2479044..205c0bb 100644 --- a/home/.config/nvim/lua/pluginconf/lualine.lua +++ b/home/.config/nvim/lua/pluginconf/lualine.lua @@ -1,3 +1,3 @@ require'lualine'.setup { - options = {theme = 'onedark'}, + options = {theme = 'catppuccin'}, } diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index a4a42e4..5a2b07f 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use 'EdenEast/nightfox.nvim' + use({"catppuccin/nvim", as = "catppuccin"}) -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -65,11 +65,11 @@ require('packer').startup(function() use 'williamboman/nvim-lsp-installer' -- Completion - use 'hrsh7th/nvim-cmp' -- Autocompletion plugin - use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp - use 'hrsh7th/cmp-path' -- Path source for nvim-cmp - use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp - use 'L3MON4D3/LuaSnip' -- Snippets plugin + use 'hrsh7th/nvim-cmp' -- Autocompletion plugin + use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp + use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp + use 'L3MON4D3/LuaSnip' -- Snippets plugin -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 57bd0d7..8ff3474 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -4,9 +4,6 @@ local cmd = vim.cmd ------ Appearance ------ --- Set colorscheme -require('nightfox').load() - -- True colors o.termguicolors = true