From c0324fffbf9c7e844fe6c5d0b25b611796de9bd1 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 6 Dec 2022 11:28:15 -0600 Subject: [PATCH] New kitty theme for winter and for fun, update helix theme to use terminal colors --- common/helix/themes/donokai.toml | 133 ++++++++++++++----------------- common/kitty/.gitignore | 1 + common/kitty/current-theme.conf | 60 ++++++++++++++ common/kitty/kitty.conf | 53 +++++++----- common/kitty/kitty.conf.bak | 111 ++++++++++++++++++++++++++ common/tmux/conf | 12 +-- 6 files changed, 268 insertions(+), 102 deletions(-) create mode 100644 common/kitty/.gitignore create mode 100644 common/kitty/current-theme.conf create mode 100644 common/kitty/kitty.conf.bak diff --git a/common/helix/themes/donokai.toml b/common/helix/themes/donokai.toml index 8c76db2..d29e058 100644 --- a/common/helix/themes/donokai.toml +++ b/common/helix/themes/donokai.toml @@ -1,101 +1,84 @@ -# Author: Shafkath Shuhan +"namespace" = { fg = "yellow" } +"module" = { fg = "yellow" } -"namespace" = { fg = "type" } -"module" = { fg = "type" } +"type" = { fg = "cyan" } +"type.builtin" = { fg = "cyan" } +"type.enum.variant" = { fg = "white" } +"constructor" = { fg = "white" } +"variable.other.member" = { fg = "white" } -"type" = { fg = "type" } -"type.builtin" = { fg = "#66D9EF" } -"type.enum.variant" = { fg = "text" } -"constructor" = { fg = "text" } -"variable.other.member" = { fg = "variable" } +"keyword" = { fg = "blue" } +"keyword.directive" = { fg = "blue" } +"keyword.control" = { fg = "blue" } +"label" = { fg = "blue" } -"keyword" = { fg = "keyword" } -"keyword.directive" = { fg = "keyword" } -"keyword.control" = { fg = "keyword" } -"label" = { fg = "keyword" } +"special" = { fg = "blue" } +"operator" = { fg = "magenta" } -"special" = { fg = "keyword" } -"operator" = { fg = "text" } +"punctuation" = { fg = "yellow" } +"punctuation.delimiter" = { fg = "yellow" } -"punctuation" = { fg = "text" } -"punctuation.delimiter" = { fg = "text" } +"variable" = { fg = "white" } +"variable.parameter" = { fg = "white" } +"variable.builtin" = { fg = "blue" } +"constant" = { fg = "red" } +"constant.builtin" = { fg = "red" } -"variable" = { fg = "variable" } -"variable.parameter" = { fg = "#fd971f" } -"variable.builtin" = { fg = "keyword" } -"constant" = { fg = "variable" } -"constant.builtin" = { fg = "#ae81ff" } +"function" = { fg = "green" } +"function.builtin" = { fg = "green" } +"function.macro" = { fg = "green" } +"attribute" = { fg = "green" } -"function" = { fg = "fn_declaration" } -"function.builtin" = { fg = "fn_declaration" } -"function.macro" = { fg = "keyword" } -"attribute" = { fg = "fn_declaration" } - -"comment" = { fg = "#88846F" } -"ui.virtual" = "#888888" +"comment" = { fg = "gray" } +"ui.virtual" = "gray" # "ui.virtual.ruler" = { bg = "#333333" } -"string" = { fg = "#e6db74" } -"constant.character" = { fg = "#e6db74" } -"string.regexp" = { fg = "regex" } -"constant.numeric" = { fg = "#ae81ff" } -"constant.character.escape" = { fg = "#ae81ff" } +"string" = { fg = "yellow" } +"constant.character" = { fg = "yellow" } +"string.regexp" = { fg = "yellow" } +"constant.numeric" = { fg = "blue" } +"constant.character.escape" = { fg = "blue" } -"markup.heading" = "blue" +"markup.heading" = "Cyan" "markup.list" = "red" "markup.bold" = { fg = "yellow", modifiers = ["bold"] } "markup.italic" = { fg = "magenta", modifiers = ["italic"] } "markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } -"markup.link.text" = "red" -"markup.quote" = "cyan" +"markup.link.text" = "blue" +"markup.quote" = "yellow" "markup.raw" = "green" -"diff.plus" = { fg = "#a6e22e" } -"diff.delta" = { fg = "#fd971f" } -"diff.minus" = { fg = "#f92672" } +"diff.plus" = { fg = "green" } +"diff.delta" = { fg = "blue" } +"diff.minus" = { fg = "red" } -"ui.background" = { fg = "text", bg = "background" } +"ui.background" = { fg = "fg", bg = "bg" } -"ui.window" = { bg = "widget" } -"ui.popup" = { bg = "widget" } -"ui.help" = { bg = "widget" } -"ui.menu" = { bg = "widget" } -"ui.menu.selected" = { bg = "blue", fg = "background" } +"ui.window" = { bg = "bg" } +"ui.popup" = { bg = "bg", fg = "white" } +"ui.help" = { bg = "bg" } +"ui.menu" = { bg = "bg" } +"ui.menu.selected" = { bg = "blue", fg = "bg" } -"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] } -"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] } -"ui.cursor.match" = { fg = "#888888", modifiers = ["reversed"] } +"ui.cursor" = { bg = "white", modifiers = ["reversed"] } +"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } +"ui.cursor.match" = { fg = "gray", bg = "white", modifiers = ["reversed"] } -"ui.selection" = { bg = "#878b91" } -"ui.selection.primary" = { bg = "#575b61" } +"ui.selection" = { bg = "cyan", fg = "bg" } +"ui.selection.primary" = { bg = "cyan", fg = "bg" } -"ui.linenr" = { fg = "#90908a" } -"ui.linenr.selected" = { fg = "#c2c2bf" } +"ui.linenr" = { fg = "gray" } +"ui.linenr.selected" = { fg = "white" } -"ui.statusline" = { fg = "active_text", bg = "#333333" } -"ui.statusline.inactive" = { fg = "active_text", bg = "#222222" } +"ui.statusline" = { fg = "gray", bg = "bg" } +"ui.statusline.inactive" = { fg = "bg", bg = "gray" } -"ui.text" = { fg = "text", bg = "background" } -"ui.text.focus" = { fg = "active_text" } +"ui.text" = { fg = "gray", bg = "bg" } +"ui.text.focus" = { fg = "white" } -"warning" = { fg = "#cca700" } -"error" = { fg = "#f48771" } -"info" = { fg = "#75beff" } -"hint" = { fg = "#eeeeeb3" } +"warning" = { fg = "yellow" } +"error" = { fg = "red" } +"info" = { fg = "blue" } +"hint" = { fg = "green" } diagnostic = { modifiers = ["underlined"] } - -[palette] -type = "#A6E22E" -keyword = "#F92672" -regex = "#CE9178" -special = "#C586C0" -variable = "#F8F8F2" -fn_declaration = "#A6E22E" - -background = "#111111" -text = "#f8f8f2" -active_text = "#ffffff" -cursor = "#a6a6a6" -inactive_cursor = "#878b91" -widget = "#1e1f1c" diff --git a/common/kitty/.gitignore b/common/kitty/.gitignore new file mode 100644 index 0000000..9026134 --- /dev/null +++ b/common/kitty/.gitignore @@ -0,0 +1 @@ +kitty-themes diff --git a/common/kitty/current-theme.conf b/common/kitty/current-theme.conf new file mode 100644 index 0000000..39fa1ed --- /dev/null +++ b/common/kitty/current-theme.conf @@ -0,0 +1,60 @@ +# vim:ft=kitty + +## name: Wizzy Muted +## license: MIT +## author: erin +## upstream: https://github.com/erincerys/kitty-themes/blob/master/themes/wizzy-muted.conf +## blurb: A variant of Wryan for a certain special Lain + +background #100814 +selection_background #4d4d4d +cursor #9d9eca + +# a nearly imperceptible purple +foreground #b2b8c4 +# alternate, deeper shades of purple +#foreground #8a8dae +#foreground #9b9ebf +url_color #64b7b7 +selection_foreground #101010 + +# black +color0 #444444 +color8 #4e4e4e + +# red +color1 #9d5776 +color9 #cf5e91 + +# green +color2 #398484 +color10 #64b7b7 + +# yellow +color3 #6b6b88 +color11 #8d8dba + +# blue +color4 #4a6684 +color12 #588bc4 + +# magenta +color5 #6f579d +color13 #8f73c4 + +# cyan +color6 #42769d +color14 #71a7cf + +# white +color7 #9aadb2 +color15 #d1d1d1 + +# tab bar +active_tab_foreground #100847 +active_tab_background #8d8dba +inactive_tab_foreground #100814 +inactive_tab_background #6b6b88 + +# same as bg +color19 #100814 \ No newline at end of file diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index 6fba7ee..0566544 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -45,30 +45,36 @@ url_style single strip_trailing_spaces smart # open_url_modifiers ctrl +# background #111111 +# foreground #f8f8f2 -background #111111 -foreground #f8f8f2 - -color0 #111111 -color1 #f92672 -color2 #a6e22e -color3 #f4bf75 -color4 #66d9ef -color5 #ae81ff -color6 #a1efe4 -color7 #f8f8f2 +# black +# color0 #111111 +# red +# color1 #f92672 +# green +# color2 #a6e22e +# yellow +# color3 #f4bf75 +# blue +# color4 #66d9ef +# purple +# color5 #ae81ff +# cyan +# color6 #a1efe4 +# white +# color7 #f8f8f2 # TODO: where did these colors come from? donokai? -color8 #75715e -color9 #fd971f -color10 #383830 -color11 #49483e -color12 #a59f85 -color13 #f5f4f1 -color14 #cc6633 -color15 #f9f8f5 - -color18 #333333 +# color8 #75715e +# color9 #fd971f +# color10 #383830 +# color11 #49483e +# color12 #a59f85 +# color13 #f5f4f1 +# color14 #cc6633 +# color15 #f9f8f5 +# color18 #333333 # # light theme # @@ -98,3 +104,8 @@ color18 #333333 wheel_scroll_multiplier 5.0 touch_scroll_multiplier 5.0 + +# BEGIN_KITTY_THEME +# Wizzy Muted +include current-theme.conf +# END_KITTY_THEME \ No newline at end of file diff --git a/common/kitty/kitty.conf.bak b/common/kitty/kitty.conf.bak new file mode 100644 index 0000000..97048d8 --- /dev/null +++ b/common/kitty/kitty.conf.bak @@ -0,0 +1,111 @@ +font_family IosevkaLyteTerm Nerd Font +bold_font IosevkaLyteTerm Heavy Nerd Font +italic_font IosevkaLyteTerm Italic Nerd Font +bold_italic_font IosevkaLyteTerm Heavy Italic Nerd Font +font_size 12.5 + +# use `kitty + list-fonts --psnames` to get the font's PostScript name +# font_features IosevkaLyte +# font_features Iosevka-Heavy +calt +dlig +# font_features Iosevka-Italic +calt +dlig +# font_features Iosevka-Heavy-Italic +calt +dlig + +allow_remote_control yes +# listen_on unix:/$TMPDIR/kitty +repaint_delay 5 +input_delay 5 +sync_to_monitor yes + +adjust_line_height 0 +window_padding_width 10.0 +window_margin_width 0.0 + +enabled_layouts tall:bias=50;full_size=1;mirrored=true + +map ctrl+shift+1 change_font_size all 12.5 +map ctrl+shift+2 change_font_size all 18.5 +map ctrl+shift+3 change_font_size all 26 + +map ctrl+shift+equal change_font_size all +0.5 +map ctrl+shift+minus change_font_size all -0.5 +map shift+insert paste_from_clipboard +map ctrl+shift+v paste_from_selection +map ctrl+shift+c copy_to_clipboard + +map ctrl+shift+h neighboring_window left +map ctrl+shift+l neighboring_window right +map ctrl+shift+k neighboring_window up +map ctrl+shift+j neighboring_window down +map ctrl+shift+h nth_window -1 + +enable_audio_bell no + +url_style single + +strip_trailing_spaces smart + +# open_url_modifiers ctrl +# background #111111 +# foreground #f8f8f2 + +# black +# color0 #111111 +# red +# color1 #f92672 +# green +# color2 #a6e22e +# yellow +# color3 #f4bf75 +# blue +# color4 #66d9ef +# purple +# color5 #ae81ff +# cyan +# color6 #a1efe4 +# white +# color7 #f8f8f2 + +# TODO: where did these colors come from? donokai? +# color8 #75715e +# color9 #fd971f +# color10 #383830 +# color11 #49483e +# color12 #a59f85 +# color13 #f5f4f1 +# color14 #cc6633 +# color15 #f9f8f5 +# color18 #333333 + +# # light theme +# +# background #eeeeee +# foreground #000000 +# +# color0 #eeeeee +# color1 #f92672 +# color2 #a6e22e +# color3 #f4bf75 +# color4 #66d9ef +# color5 #ae81ff +# color6 #a1efe4 +# color7 #000000 +# +# # TODO: where did these colors come from? donokai? +# color8 #aaaaaa +# color9 #fd971f +# color10 #cccccc +# color11 #49483e +# color12 #a59f85 +# color13 #f5f4f1 +# color14 #cc6633 +# color15 #f9f8f5 +# +# color18 #cccccc + +wheel_scroll_multiplier 5.0 +touch_scroll_multiplier 5.0 + +# BEGIN_KITTY_THEME +# Wombat +include current-theme.conf +# END_KITTY_THEME \ No newline at end of file diff --git a/common/tmux/conf b/common/tmux/conf index aca309b..a68a264 100644 --- a/common/tmux/conf +++ b/common/tmux/conf @@ -31,12 +31,12 @@ set -g mode-keys vi set -g history-limit 1024000 set -g status on set -g status-position bottom -set -g status-bg colour0 +set -g status-bg colour19 set -g status-fg colour8 set -g status-interval 5 set -g status-left-length 50 -set -g window-status-style "fg=colour8 bg=colour0" -set -g window-status-current-style "fg=colour8 bg=colour0" +set -g window-status-style "fg=colour8 bg=colour19" +set -g window-status-current-style "fg=colour8 bg=colour19" set -g window-status-format " #W" set -g window-status-separator "" set -g window-status-current-format " #W" @@ -48,9 +48,9 @@ set -g status-left-length 1000 # set -g status-right-length 280 # set -ag status-right "#{pane_current_command}" -set -g message-style "fg=colour7 bg=colour18" -set -g pane-active-border-style bg=black,fg=blue -set -g pane-border-style bg=black,fg=colour18 +set -g message-style "fg=colour7 bg=colour19" +set -g pane-active-border-style fg=blue +set -g pane-border-style fg=colour19 set -g clock-mode-colour colour8 set -g base-index 1 set -g pane-base-index 1