From 791428d9cd5bb86bb26456b53bac2aebdfbbeaf5 Mon Sep 17 00:00:00 2001 From: datsudo <76833632+datsudo@users.noreply.github.com> Date: Fri, 6 Jun 2025 17:30:41 +0800 Subject: [PATCH] isolate theme files --- config/nvim/lua/plugins/colorscheme.lua | 7 +++---- config/{ => theme-files}/dracula.toml | 0 config/{ => theme-files}/foot-dracula | 0 config/theme-files/foot-kanagawabones | 19 ++++++++++++++++++ config/{ => theme-files}/ghostty-dracula | 0 config/theme-files/ghostty-kanagawabones | 22 +++++++++++++++++++++ config/theme-files/kanagawabones.toml | 25 ++++++++++++++++++++++++ user/subs/alacritty.nix | 6 +++++- user/subs/foot.nix | 4 ++-- user/subs/ghostty.nix | 6 +++++- user/terminals.nix | 5 ----- 11 files changed, 81 insertions(+), 13 deletions(-) rename config/{ => theme-files}/dracula.toml (100%) rename config/{ => theme-files}/foot-dracula (100%) create mode 100644 config/theme-files/foot-kanagawabones rename config/{ => theme-files}/ghostty-dracula (100%) create mode 100644 config/theme-files/ghostty-kanagawabones create mode 100644 config/theme-files/kanagawabones.toml diff --git a/config/nvim/lua/plugins/colorscheme.lua b/config/nvim/lua/plugins/colorscheme.lua index 71e58de..800159c 100644 --- a/config/nvim/lua/plugins/colorscheme.lua +++ b/config/nvim/lua/plugins/colorscheme.lua @@ -1,12 +1,11 @@ return { { - 'Mofiqul/dracula.nvim', + 'zenbones-theme/zenbones.nvim', + dependencies = "rktjmp/lush.nvim", lazy = false, priority = 1000, config = function() - require('dracula').setup {} - - vim.cmd.colorscheme 'dracula' + vim.cmd.colorscheme 'kanagawabones' end, }, } diff --git a/config/dracula.toml b/config/theme-files/dracula.toml similarity index 100% rename from config/dracula.toml rename to config/theme-files/dracula.toml diff --git a/config/foot-dracula b/config/theme-files/foot-dracula similarity index 100% rename from config/foot-dracula rename to config/theme-files/foot-dracula diff --git a/config/theme-files/foot-kanagawabones b/config/theme-files/foot-kanagawabones new file mode 100644 index 0000000..1ed498e --- /dev/null +++ b/config/theme-files/foot-kanagawabones @@ -0,0 +1,19 @@ +[colors] +foreground=ddd8bb +background=1f1f28 +regular0=1f1f28 +regular1=e46a78 +regular2=98bc6d +regular3=e5c283 +regular4=7eb3c9 +regular5=957fb8 +regular6=7eb3c9 +regular7=ddd8bb +bright0=3c3c51 +bright1=ec818c +bright2=9ec967 +bright3=f1c982 +bright4=7bc2df +bright5=a98fd2 +bright6=7bc2df +bright7=a8a48d diff --git a/config/ghostty-dracula b/config/theme-files/ghostty-dracula similarity index 100% rename from config/ghostty-dracula rename to config/theme-files/ghostty-dracula diff --git a/config/theme-files/ghostty-kanagawabones b/config/theme-files/ghostty-kanagawabones new file mode 100644 index 0000000..691694b --- /dev/null +++ b/config/theme-files/ghostty-kanagawabones @@ -0,0 +1,22 @@ +palette = 0=#1f1f28 +palette = 1=#e46a78 +palette = 2=#98bc6d +palette = 3=#e5c283 +palette = 4=#7eb3c9 +palette = 5=#957fb8 +palette = 6=#7eb3c9 +palette = 7=#ddd8bb +palette = 8=#3c3c51 +palette = 9=#ec818c +palette = 10=#9ec967 +palette = 11=#f1c982 +palette = 12=#7bc2df +palette = 13=#a98fd2 +palette = 14=#7bc2df +palette = 15=#a8a48d +background = #1f1f28 +foreground = #ddd8bb +cursor-color = #e6e0c2 +cursor-text = #1f1f28 +selection-background = #49473e +selection-foreground = #ddd8bb diff --git a/config/theme-files/kanagawabones.toml b/config/theme-files/kanagawabones.toml new file mode 100644 index 0000000..bd2b985 --- /dev/null +++ b/config/theme-files/kanagawabones.toml @@ -0,0 +1,25 @@ +# This file is auto-generated by shipwright.nvim +[colors.bright] +black = "#3C3C51" +red = "#EC818C" +green = "#9EC967" +yellow = "#F1C982" +blue = "#7BC2DF" +magenta = "#A98FD2" +cyan = "#7BC2DF" +white = "#A8A48D" +[colors.cursor] +cursor = "#E6E0C2" +text = "#1F1F28" +[colors.normal] +black = "#1F1F28" +blue = "#7EB3C9" +cyan = "#7EB3C9" +green = "#98BC6D" +magenta = "#957FB8" +red = "#E46A78" +white = "#DDD8BB" +yellow = "#E5C283" +[colors.primary] +background = "#1F1F28" +foreground = "#DDD8BB" diff --git a/user/subs/alacritty.nix b/user/subs/alacritty.nix index 4281339..d54c132 100644 --- a/user/subs/alacritty.nix +++ b/user/subs/alacritty.nix @@ -15,7 +15,7 @@ in settings = { general.live_config_reload = true; general.import = [ - "~/.config/alacritty/themes/dracula.toml" + "~/.config/alacritty/themes/kanagawabones.toml" ]; colors.draw_bold_text_with_bright_colors = true; font = { @@ -48,5 +48,9 @@ in }; }; }; + + home.file = { + ".config/alacritty/themes/kanagawabones.toml".source = ../../config/theme-files/kanagawabones.toml; + }; }; } diff --git a/user/subs/foot.nix b/user/subs/foot.nix index e1d0bc0..c77c578 100644 --- a/user/subs/foot.nix +++ b/user/subs/foot.nix @@ -21,7 +21,7 @@ in server.enable = true; settings = { main = { - include = "~/.config/foot/themes/dracula"; + include = "~/.config/foot/themes/kanagawabones"; term = "xterm-256color"; font = "Iosevka NF Medium:size=13"; dpi-aware = "yes"; @@ -36,7 +36,7 @@ in }; home.file = { - ".config/foot/themes/dracula".source = ../../config/foot-dracula; + ".config/foot/themes/kanagawabones".source = ../../config/theme-files/foot-kanagawabones; }; }; } diff --git a/user/subs/ghostty.nix b/user/subs/ghostty.nix index be3e2ce..abd4027 100644 --- a/user/subs/ghostty.nix +++ b/user/subs/ghostty.nix @@ -16,7 +16,7 @@ in settings = { font-family = "Iosevka Nerd Font"; font-size = 14; - theme = "ghostty-dracula"; + theme = "ghostty-kanagawabones"; clipboard-read = "allow"; clipboard-write = "allow"; window-padding-x = 0; @@ -43,5 +43,9 @@ in ]; }; }; + + home.file = { + ".config/ghostty/themes/ghostty-kanagawabones".source = ../../config/theme-files/ghostty-kanagawabones; + }; }; } diff --git a/user/terminals.nix b/user/terminals.nix index bf703a9..0f6a406 100644 --- a/user/terminals.nix +++ b/user/terminals.nix @@ -31,10 +31,5 @@ in subs.alacritty.enable = cfg.alacritty.enable; home.packages = mkIf cfg.xfceTerminal.enable [ pkgs.xfce.xfce4-terminal ]; - - home.file = { - ".config/alacritty/themes/dracula.toml".source = mkIf cfg.alacritty.enable ../config/dracula.toml; - ".config/ghostty/themes/ghostty-dracula".source = mkIf cfg.ghostty.enable ../config/ghostty-dracula; - }; }; }