From a9415caa6eaf56b89f99a3180f0b9b7f808efca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Sat, 7 Mar 2026 08:04:11 +0100 Subject: [PATCH] nvim: add lupanbones colorscheme (my variant for zenbones) - also add lupanbones colors for kitty and st - remove zutty config --- kitty/.config/kitty/kitty.conf | 4 +- .../.config/kitty/themes/lupanbones-dark.conf | 33 +++++ .../kitty/themes/lupanbones-light.conf | 34 +++++ nvim/.config/nvim/colors/lupanbones.lua | 55 ++++++++ nvim/.config/nvim/lua/plugins/colorscheme.lua | 4 +- nvim/.config/nvim/nvim-pack-lock.json | 8 ++ xsession/.Xresources | 120 ++++++------------ xsession/bin/lupan-set-theme | 4 +- 8 files changed, 176 insertions(+), 86 deletions(-) create mode 100644 kitty/.config/kitty/themes/lupanbones-dark.conf create mode 100644 kitty/.config/kitty/themes/lupanbones-light.conf create mode 100644 nvim/.config/nvim/colors/lupanbones.lua diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 9305b45..8240fdd 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -17,8 +17,6 @@ open_url_with qutebrowser action_alias launch_tab_home launch --type tab --cwd=~ kitten_alias hints hints --hints-background-color red --hints-foreground-color white -cursor_trail 1 - map ctrl+shift+6 no_op map ctrl+shift+0 nth_window -1 @@ -68,6 +66,6 @@ map ctrl+alt+shift+w detach_window map ctrl+alt+shift+x close_session . # BEGIN_KITTY_THEME -# Flexoki (Dark) +# Lupanbones-Dark include current-theme.conf # END_KITTY_THEME diff --git a/kitty/.config/kitty/themes/lupanbones-dark.conf b/kitty/.config/kitty/themes/lupanbones-dark.conf new file mode 100644 index 0000000..3d0a9ba --- /dev/null +++ b/kitty/.config/kitty/themes/lupanbones-dark.conf @@ -0,0 +1,33 @@ +# vim:ft=kitty + +foreground #9da0af +background #1f212e +selection_foreground #808080 +selection_background #4d5580 + +cursor #bf8040 +cursor_text_color #1f212e + +active_border_color #862d2d +inactive_border_color #4d5580 + +active_tab_foreground #9da0af +active_tab_background #4d5580 +inactive_tab_foreground #1f212e +inactive_tab_background #808080 + +color1 #862d2d +color2 #3a783a +color3 #707010 +color4 #345eb2 +color5 #cc66cc +color6 #3a7878 +color7 #a1a3aa +color8 #4d4d4d +color9 #c27070 +color10 #40bf40 +color11 #acac53 +color12 #6b8ac7 +color13 #8f248f +color14 #509595 +color15 #dbdff0 diff --git a/kitty/.config/kitty/themes/lupanbones-light.conf b/kitty/.config/kitty/themes/lupanbones-light.conf new file mode 100644 index 0000000..0ec8c1f --- /dev/null +++ b/kitty/.config/kitty/themes/lupanbones-light.conf @@ -0,0 +1,34 @@ +# vim:ft=kitty + +foreground #1f212e +background #faf8f5 +selection_foreground #1f212e +selection_background #a6c7f2 + +cursor #1f212e +cursor_text_color #faf8f5 + +active_border_color #862d2d +inactive_border_color #a6c7f2 + +active_tab_foreground #1f212e +active_tab_background #a6c7f2 +inactive_tab_foreground #faf8f5 +inactive_tab_background #808080 + +color0 #1f212e +color1 #862d2d +color2 #3a783a +color3 #707010 +color4 #345eb2 +color5 #cc66cc +color6 #3a7878 +color7 #a1a3aa +color8 #73778c +color9 #c27070 +color10 #40bf40 +color11 #acac53 +color12 #6b8ac7 +color13 #8f248f +color14 #509595 +color15 #dae4f1 diff --git a/nvim/.config/nvim/colors/lupanbones.lua b/nvim/.config/nvim/colors/lupanbones.lua new file mode 100644 index 0000000..7918e6f --- /dev/null +++ b/nvim/.config/nvim/colors/lupanbones.lua @@ -0,0 +1,55 @@ +local colors_name = "lupanbones" +vim.g.colors_name = colors_name -- Required when defining a colorscheme + +local lush = require "lush" +local hsluv = lush.hsluv -- Human-friendly hsl +local util = require "zenbones.util" + +local bg = vim.o.background + +-- Define a palette. Use `palette_extend` to fill unspecified colors +local palette +if bg == "light" then + palette = util.palette_extend({ + bg = hsluv "#faf8f5", + fg = hsluv "#1f212e", + rose = hsluv "#bf8040", + leaf = hsluv "#3d8f66", + wood = hsluv "#acac53", + water = hsluv "#6b8ac7", + blossom = hsluv "#93806c", + sky = hsluv "#7461d1", + }, bg) +else + palette = util.palette_extend({ + bg = hsluv "#1f212e", + fg = hsluv "#9da0af", + rose = hsluv "#bf8040", + leaf = hsluv "#3d8f66", + wood = hsluv "#d1d147", + water = hsluv "#6b8ac7", + blossom = hsluv "#93806c", + sky = hsluv "#7461d1", + }, bg) +end + +-- Generate the lush specs using the generator util +local generator = require "zenbones.specs" +local base_specs = generator.generate(palette, bg, generator.get_global_config(colors_name, bg)) + +-- Optionally extend specs using Lush +local specs = lush.extends({ base_specs }).with(function() + return { + Statement { base_specs.Statement, fg = palette.rose }, + String { fg = palette.leaf }, + Special { fg = palette.water }, + Type { fg = palette.sky, gui = "italic" }, + Delimiter { fg = palette.blossom }, + } +end) + +-- Pass the specs to lush to apply +lush(specs) + +-- Optionally set term colors +require("zenbones.term").apply_colors(palette) diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua index b5f1953..d9d58ca 100644 --- a/nvim/.config/nvim/lua/plugins/colorscheme.lua +++ b/nvim/.config/nvim/lua/plugins/colorscheme.lua @@ -2,8 +2,10 @@ vim.pack.add({ "https://github.com/EdenEast/nightfox.nvim", "https://github.com/rebelot/kanagawa.nvim", "https://github.com/kepano/flexoki-neovim", + "https://github.com/rktjmp/lush.nvim", + "https://github.com/zenbones-theme/zenbones.nvim", }) local cs = require("config.colorscheme") -cs.set_colorschemes("flexoki", "flexoki") +cs.set_colorschemes("lupanbones", "lupanbones") cs.update_colorscheme() diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 6722b22..1099111 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -41,6 +41,10 @@ "rev": "aef7f5cec0a40dbe7f3304214850c472e2264b10", "src": "https://github.com/rebelot/kanagawa.nvim" }, + "lush.nvim": { + "rev": "9c60ec2279d62487d942ce095e49006af28eed6e", + "src": "https://github.com/rktjmp/lush.nvim" + }, "multicursor.nvim": { "rev": "630dd29dd696bc977cb81d7dd2fa6bb280f60fc4", "src": "https://github.com/jake-stewart/multicursor.nvim", @@ -84,6 +88,10 @@ "which-key.nvim": { "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a", "src": "https://github.com/folke/which-key.nvim" + }, + "zenbones.nvim": { + "rev": "22b7fb75593412e0dc81b4bdefae718e9e84aa82", + "src": "https://github.com/zenbones-theme/zenbones.nvim" } } } \ No newline at end of file diff --git a/xsession/.Xresources b/xsession/.Xresources index a33586f..1cf4eb8 100644 --- a/xsession/.Xresources +++ b/xsession/.Xresources @@ -67,86 +67,46 @@ Zutty.fontsize: 20 #ifdef THEME_DARK st.lightmode: 0 -st.background: #1f1f28 -st.foreground: #dcd7ba -st.cursorColor: #cbd9d8 -st.reverse-cursor: #e6eaea -st.color0: #090618 -st.color1: #c34043 -st.color2: #76946a -st.color3: #c0a36e -st.color4: #7e9cd8 -st.color5: #957fb8 -st.color6: #6a9589 -st.color7: #c8c093 -st.color8: #727169 -st.color9: #e82424 -st.color10: #98bb6c -st.color11: #e6c384 -st.color12: #7fb4ca -st.color13: #938aa9 -st.color14: #7aa89f -st.color15: #dcd7ba - -Zutty.bg: #1f1f28 -Zutty.fg: #dcd7ba -Zutty.cr: #cbd9d8 -Zutty.color0: #090618 -Zutty.color1: #c34043 -Zutty.color2: #76946a -Zutty.color3: #c0a36e -Zutty.color4: #7e9cd8 -Zutty.color5: #957fb8 -Zutty.color6: #6a9589 -Zutty.color7: #c8c093 -Zutty.color8: #727169 -Zutty.color9: #e82424 -Zutty.color10: #98bb6c -Zutty.color11: #e6c384 -Zutty.color12: #7fb4ca -Zutty.color13: #938aa9 -Zutty.color14: #7aa89f -Zutty.color15: #dcd7ba +st.background: #1f212e +st.foreground: #9da0af +st.cursorColor: #bf8040 +st.reverse-cursor: #1f212e +st.color0: #1f212e +st.color1: #862d2d +st.color2: #3a783a +st.color3: #707010 +st.color4: #345eb2 +st.color5: #cc66cc +st.color6: #3a7878 +st.color7: #a1a3aa +st.color8: #4d4d4d +st.color9: #c27070 +st.color10: #40bf40 +st.color11: #acac53 +st.color12: #6b8ac7 +st.color13: #8f248f +st.color14: #509595 +st.color15: #dbdff0 #else st.lightmode: 1 -st.background: #f6f2ee -st.foreground: #3d2b5a -st.cursorColor: #643f61 -st.reverse-cursor: #3d2b5a -st.color0: #352c24 -st.color1: #a5222f -st.color2: #396847 -st.color3: #ac5402 -st.color4: #2848a9 -st.color5: #6e33ce -st.color6: #287980 -st.color7: #f2e9e1 -st.color8: #534c45 -st.color9: #b3434e -st.color10: #577f63 -st.color11: #b86e28 -st.color12: #4863b6 -st.color13: #8452d5 -st.color14: #488d93 -st.color15: #f4ece6 - -Zutty.bg: #f6f2ee -Zutty.fg: #3d2b5a -Zutty.cr: #643f61 -Zutty.color0: #352c24 -Zutty.color1: #a5222f -Zutty.color2: #396847 -Zutty.color3: #ac5402 -Zutty.color4: #2848a9 -Zutty.color5: #6e33ce -Zutty.color6: #287980 -Zutty.color7: #f2e9e1 -Zutty.color8: #534c45 -Zutty.color9: #b3434e -Zutty.color10: #577f63 -Zutty.color11: #b86e28 -Zutty.color12: #4863b6 -Zutty.color13: #8452d5 -Zutty.color14: #488d93 -Zutty.color15: #f4ece6 +st.background: #faf8f5 +st.foreground: #1f212e +st.cursorColor: #bf8040 +st.reverse-cursor: #1f212e +st.color0: #1f212e +st.color1: #862d2d +st.color2: #3a783a +st.color3: #707010 +st.color4: #345eb2 +st.color5: #cc66cc +st.color6: #3a7878 +st.color7: #a1a3aa +st.color8: #73778c +st.color9: #c27070 +st.color10: #40bf40 +st.color11: #acac53 +st.color12: #6b8ac7 +st.color13: #8f248f +st.color14: #509595 +st.color15: #dae4f1 #endif diff --git a/xsession/bin/lupan-set-theme b/xsession/bin/lupan-set-theme index d91b78b..9b7c0b7 100755 --- a/xsession/bin/lupan-set-theme +++ b/xsession/bin/lupan-set-theme @@ -46,9 +46,9 @@ fi XSET=$(readlink -e ~/.config/xsettingsd/xsettingsd.conf) if [ "$THEME" = dark ]; then - kitten themes --reload-in=all 'Flexoki (Dark)' + kitten themes --reload-in=all 'lupanbones-dark' elif [ "$THEME" = light ]; then - kitten themes --reload-in=all 'Flexoki (Light)' + kitten themes --reload-in=all 'lupanbones-light' fi # GTK