From 79957ef1c0619bc6c18dc36e6fd46e220acf3e33 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Wed, 5 Jun 2024 08:36:36 +0930 Subject: [PATCH] feat: change theme to kanagawa --- .config/alacritty/alacritty.toml | 2 +- .config/alacritty/themes/kanagawa_dragon.toml | 38 ++++ .config/alacritty/themes/kanagawa_wave.toml | 38 ++++ .config/nvim/lua/tovi/plugins/colorscheme.lua | 163 +++++++++++------- .config/nvim/lua/tovi/plugins/lualine.lua | 2 +- .config/nvim/lua/tovi/plugins/tmux.lua | 5 + .tmux.conf | 10 +- 7 files changed, 191 insertions(+), 67 deletions(-) create mode 100644 .config/alacritty/themes/kanagawa_dragon.toml create mode 100644 .config/alacritty/themes/kanagawa_wave.toml diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index da30d14..223ce39 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,5 +1,5 @@ import = [ - "~/.config/alacritty/themes/gruvbox_dark.toml" + "~/.config/alacritty/themes/kanagawa_wave.toml" ] [env] diff --git a/.config/alacritty/themes/kanagawa_dragon.toml b/.config/alacritty/themes/kanagawa_dragon.toml new file mode 100644 index 0000000..a3dc784 --- /dev/null +++ b/.config/alacritty/themes/kanagawa_dragon.toml @@ -0,0 +1,38 @@ +# Colors (Kanagawa Dragon) +# Source https//github.com/rebelot/kanagawa.nvim + +[colors.primary] +background = '#181616' +foreground = '#c5c9c5' + +[colors.normal] +black = '#0d0c0c' +blue = '#8ba4b0' +cyan = '#8ea4a2' +green = '#8a9a7b' +magenta = '#a292a3' +red = '#c4746e' +white = '#C8C093' +yellow = '#c4b28a' + +[colors.bright] +black = '#a6a69c' +blue = '#7FB4CA' +cyan = '#7AA89F' +green = '#87a987' +magenta = '#938AA9' +red = '#E46876' +white = '#c5c9c5' +yellow = '#E6C384' + +[colors.selection] +background = '#2d4f67' +foreground = '#c8c093' + +[[colors.indexed_colors]] +index = 16 +color = '#ffa066' + +[[colors.indexed_colors]] +index = 17 +color = '#ff5d62' diff --git a/.config/alacritty/themes/kanagawa_wave.toml b/.config/alacritty/themes/kanagawa_wave.toml new file mode 100644 index 0000000..73ae8fb --- /dev/null +++ b/.config/alacritty/themes/kanagawa_wave.toml @@ -0,0 +1,38 @@ +# Colors (Kanagawa Wave) +# Source https//github.com/rebelot/kanagawa.nvim + +[colors.primary] +background = '#1f1f28' +foreground = '#dcd7ba' + +[colors.normal] +black = '#090618' +red = '#c34043' +green = '#76946a' +yellow = '#c0a36e' +blue = '#7e9cd8' +magenta = '#957fb8' +cyan = '#6a9589' +white = '#c8c093' + +[colors.bright] +black = '#727169' +red = '#e82424' +green = '#98bb6c' +yellow = '#e6c384' +blue = '#7fb4ca' +magenta = '#938aa9' +cyan = '#7aa89f' +white = '#dcd7ba' + +[colors.selection] +background = '#2d4f67' +foreground = '#c8c093' + +[[colors.indexed_colors]] +index = 16 +color = '#ffa066' + +[[colors.indexed_colors]] +index = 17 +color = '#ff5d62' diff --git a/.config/nvim/lua/tovi/plugins/colorscheme.lua b/.config/nvim/lua/tovi/plugins/colorscheme.lua index 9d44f1a..6e4e562 100644 --- a/.config/nvim/lua/tovi/plugins/colorscheme.lua +++ b/.config/nvim/lua/tovi/plugins/colorscheme.lua @@ -1,65 +1,102 @@ --- return { --- "catppuccin/nvim", --- name = "catppuccin", --- priority = 1000, --- config = function () --- require("catppuccin").setup({ --- flavour = "mocha", -- latte, frappe, macchiato, mocha --- background = { -- :h background --- light = "latte", --- dark = "mocha", --- }, --- transparent_background = false, -- disables setting the background color. --- show_end_of_buffer = false, -- shows the '~' characters after the end of buffers --- term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) --- dim_inactive = { --- enabled = false, -- dims the background color of inactive window --- shade = "dark", --- percentage = 0.15, -- percentage of the shade to apply to the inactive window --- }, --- no_italic = false, -- Force no italic --- no_bold = false, -- Force no bold --- no_underline = false, -- Force no underline --- styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): --- comments = { "italic" }, -- Change the style of comments --- conditionals = { "italic" }, --- loops = {}, --- functions = {}, --- keywords = {}, --- strings = {}, --- variables = {}, --- numbers = {}, --- booleans = {}, --- properties = {}, --- types = {}, --- operators = {}, --- -- miscs = {}, -- Uncomment to turn off hard-coded styles --- }, --- color_overrides = {}, --- custom_highlights = {}, --- default_integrations = true, --- integrations = { --- cmp = true, --- gitsigns = true, --- nvimtree = true, --- treesitter = true, --- notify = false, --- mini = { --- enabled = true, --- indentscope_color = "", --- }, --- }, --- }) --- --- vim.cmd("colorscheme catppuccin") --- end --- } - return { - "ellisonleao/gruvbox.nvim", - priority = 1000 , - config = function () - require("gruvbox").setup() - vim.cmd("colorscheme gruvbox") - end, + { + "catppuccin/nvim", + enabled = false, + name = "catppuccin", + priority = 1000, + config = function () + require("catppuccin").setup({ + flavour = "mocha", -- latte, frappe, macchiato, mocha + background = { -- :h background + light = "latte", + dark = "mocha", + }, + transparent_background = false, -- disables setting the background color. + show_end_of_buffer = false, -- shows the '~' characters after the end of buffers + term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) + dim_inactive = { + enabled = false, -- dims the background color of inactive window + shade = "dark", + percentage = 0.15, -- percentage of the shade to apply to the inactive window + }, + no_italic = false, -- Force no italic + no_bold = false, -- Force no bold + no_underline = false, -- Force no underline + styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): + comments = { "italic" }, -- Change the style of comments + conditionals = { "italic" }, + loops = {}, + functions = {}, + keywords = {}, + strings = {}, + variables = {}, + numbers = {}, + booleans = {}, + properties = {}, + types = {}, + operators = {}, + -- miscs = {}, -- Uncomment to turn off hard-coded styles + }, + color_overrides = {}, + custom_highlights = {}, + default_integrations = true, + integrations = { + cmp = true, + gitsigns = true, + nvimtree = true, + treesitter = true, + notify = false, + mini = { + enabled = true, + indentscope_color = "", + }, + }, + }) + + -- vim.cmd("colorscheme catppuccin") + end + }, + { + "ellisonleao/gruvbox.nvim", + enabled = false, + priority = 1000 , + config = function () + require("gruvbox").setup() + vim.cmd("colorscheme gruvbox") + end, + }, + { + "rebelot/kanagawa.nvim", + priority = 1000 , + config = function () + -- Default options: + require('kanagawa').setup({ + compile = false, -- enable compiling the colorscheme + undercurl = true, -- enable undercurls + commentStyle = { italic = true }, + functionStyle = {}, + keywordStyle = { italic = true}, + statementStyle = { bold = true }, + typeStyle = {}, + transparent = false, -- do not set background color + dimInactive = false, -- dim inactive window `:h hl-NormalNC` + terminalColors = true, -- define vim.g.terminal_color_{0,17} + colors = { -- add/modify theme and palette colors + palette = {}, + theme = { wave = {}, lotus = {}, dragon = {}, all = {} }, + }, + overrides = function(colors) -- add/modify highlights + return {} + end, + theme = "wave", -- Load "wave" theme when 'background' option is not set + background = { -- map the value of 'background' option to a theme + dark = "wave", -- try "dragon" ! + light = "lotus" + }, + }) + + -- setup must be called before loading + vim.cmd("colorscheme kanagawa") + end + }, } diff --git a/.config/nvim/lua/tovi/plugins/lualine.lua b/.config/nvim/lua/tovi/plugins/lualine.lua index 6e990a9..b15d9d4 100644 --- a/.config/nvim/lua/tovi/plugins/lualine.lua +++ b/.config/nvim/lua/tovi/plugins/lualine.lua @@ -7,7 +7,7 @@ return { lualine.setup({ options = { - theme = 'gruvbox', + theme = 'kanagawa', component_separators = { left = '', right = '' }, section_separators = { left = '', right = '' }, }, diff --git a/.config/nvim/lua/tovi/plugins/tmux.lua b/.config/nvim/lua/tovi/plugins/tmux.lua index 0844590..2bc4e13 100644 --- a/.config/nvim/lua/tovi/plugins/tmux.lua +++ b/.config/nvim/lua/tovi/plugins/tmux.lua @@ -5,6 +5,11 @@ return { copy_sync = { enable = false }, + navigation = { + cycle_navigation = true, + enable_default_keybindings = true, + persist_zoom = true, + }, resize = { -- enables default keybindings (A-hjkl) for normal mode enable_default_keybindings = false, diff --git a/.tmux.conf b/.tmux.conf index 050ea9a..829d1f8 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -65,8 +65,14 @@ bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer" set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'egel/tmux-gruvbox' -set -g @tmux-gruvbox 'dark' # or 'light' +set -g @plugin 'Nybkox/tmux-kanagawa' + +set -g @kanagawa-show-powerline true + +set -g @kanagawa-theme 'wave' + +# set -g @plugin 'egel/tmux-gruvbox' +# set -g @tmux-gruvbox 'dark' # or 'light' # set -g @plugin 'catppuccin/tmux' #