From 32bb176f79eb870f4ad6183adc8f9496857306ba Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 27 Mar 2023 12:28:56 -0500 Subject: [PATCH] Back to the OG theme --- common/helix/languages.toml | 64 ++++++++++++++++----------------- common/kitty/current-theme.conf | 57 ----------------------------- common/kitty/kitty.conf | 26 ++++++-------- common/kitty/purple.conf | 57 ----------------------------- common/tmux/conf | 14 ++++---- 5 files changed, 49 insertions(+), 169 deletions(-) delete mode 100644 common/kitty/current-theme.conf delete mode 100644 common/kitty/purple.conf diff --git a/common/helix/languages.toml b/common/helix/languages.toml index ba9d664..f73d71f 100644 --- a/common/helix/languages.toml +++ b/common/helix/languages.toml @@ -1,35 +1,35 @@ -[[language]] -name = "javascript" -shebangs = ["deno", "node"] -roots = ["deno.json", "package.json", "tsconfig.json"] -config = { enable = true, lint = true, unstable = true } -language-server = { command = "deno", args = ["lsp"], language-id = "javascript" } -auto-format = true - -[[language]] -name = "jsx" -shebangs = ["deno", "node"] -roots = ["deno.json", "package.json", "tsconfig.json"] -config = { enable = true, lint = true, unstable = true } -language-server = { command = "deno", args = ["lsp"], language-id = "javascriptreact" } -auto-format = true - -[[language]] -name = "typescript" -shebangs = ["deno", "node"] -roots = ["deno.json", "package.json", "tsconfig.json"] -config = { enable = true, lint = true, unstable = true } -language-server = { command = "deno", args = ["lsp"], language-id = "typescript" } -auto-format = true - -[[language]] -name = "tsx" -shebangs = ["deno", "node"] -roots = ["deno.json", "package.json", "tsconfig.json"] -config = { enable = true, lint = true, unstable = true } -language-server = { command = "deno", args = ["lsp"], language-id = "typescriptreact" } -auto-format = true - +# [[language]] +# name = "javascript" +# shebangs = ["deno", "node"] +# roots = ["deno.json", "package.json", "tsconfig.json"] +# config = { enable = true, lint = true, unstable = true } +# language-server = { command = "deno", args = ["lsp"], language-id = "javascript" } +# auto-format = true +# +# [[language]] +# name = "jsx" +# shebangs = ["deno", "node"] +# roots = ["deno.json", "package.json", "tsconfig.json"] +# config = { enable = true, lint = true, unstable = true } +# language-server = { command = "deno", args = ["lsp"], language-id = "javascriptreact" } +# auto-format = true +# +# [[language]] +# name = "typescript" +# shebangs = ["deno", "node"] +# roots = ["deno.json", "package.json", "tsconfig.json"] +# config = { enable = true, lint = true, unstable = true } +# language-server = { command = "deno", args = ["lsp"], language-id = "typescript" } +# auto-format = true +# +# [[language]] +# name = "tsx" +# shebangs = ["deno", "node"] +# roots = ["deno.json", "package.json", "tsconfig.json"] +# config = { enable = true, lint = true, unstable = true } +# language-server = { command = "deno", args = ["lsp"], language-id = "typescriptreact" } +# auto-format = true +# [[language]] name = "elixir" auto-format = true diff --git a/common/kitty/current-theme.conf b/common/kitty/current-theme.conf deleted file mode 100644 index 47b6434..0000000 --- a/common/kitty/current-theme.conf +++ /dev/null @@ -1,57 +0,0 @@ -# vim:ft=kitty - -## name: Wizzy Bright -## license: MIT -## author: erin -## upstream: https://github.com/erincerys/kitty-themes/blob/master/themes/wizzy-bright.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 #75c8c8 -selection_foreground #101010 - -# black -color0 #666666 -color8 #6f6f6f - -# red -color1 #bf7998 -color9 #cf7fb3 - -# green -color2 #5ba6a6 -color10 #75c8c8 - -# yellow -color3 #8d8daa -color11 #afafdc - -# blue -color4 #6c88a6 -color12 #7aade6 - -# magenta -color5 #8f79bf -color13 #af95e6 - -# cyan -color6 #6498bf -color14 #82b8df - -# white -color7 #abbec5 -color15 #bccfd4 - -# tab bar -active_tab_foreground #322a69 -active_tab_background #afafdc -inactive_tab_foreground #322a36 -inactive_tab_background #8d8daa \ No newline at end of file diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index 6391f40..1b67970 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -48,25 +48,25 @@ url_style single strip_trailing_spaces smart # open_url_modifiers ctrl -# background #111111 -# foreground #f8f8f2 +background #111111 +foreground #f8f8f2 # black -# color0 #111111 +color0 #111111 # red -# color1 #f92672 +color1 #f92672 # green -# color2 #a6e22e +color2 #a6e22e # yellow -# color3 #f4bf75 +color3 #f4bf75 # blue -# color4 #66d9ef +color4 #66d9ef # purple -# color5 #ae81ff +color5 #ae81ff # cyan -# color6 #a1efe4 +color6 #a1efe4 # white -# color7 #f8f8f2 +color7 #f8f8f2 # TODO: where did these colors come from? donokai? # color8 #75715e @@ -93,7 +93,6 @@ strip_trailing_spaces smart # color6 #a1efe4 # color7 #000000 # -# # TODO: where did these colors come from? donokai? # color8 #aaaaaa # color9 #fd971f # color10 #cccccc @@ -108,11 +107,6 @@ strip_trailing_spaces smart wheel_scroll_multiplier 5.0 touch_scroll_multiplier 5.0 -# BEGIN_KITTY_THEME -# Wizzy Bright -include current-theme.conf -# END_KITTY_THEME - # same as bg, used by tmux to ensure the same bg color is used in pane border # and statusline color19 #100814 \ No newline at end of file diff --git a/common/kitty/purple.conf b/common/kitty/purple.conf deleted file mode 100644 index 47b6434..0000000 --- a/common/kitty/purple.conf +++ /dev/null @@ -1,57 +0,0 @@ -# vim:ft=kitty - -## name: Wizzy Bright -## license: MIT -## author: erin -## upstream: https://github.com/erincerys/kitty-themes/blob/master/themes/wizzy-bright.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 #75c8c8 -selection_foreground #101010 - -# black -color0 #666666 -color8 #6f6f6f - -# red -color1 #bf7998 -color9 #cf7fb3 - -# green -color2 #5ba6a6 -color10 #75c8c8 - -# yellow -color3 #8d8daa -color11 #afafdc - -# blue -color4 #6c88a6 -color12 #7aade6 - -# magenta -color5 #8f79bf -color13 #af95e6 - -# cyan -color6 #6498bf -color14 #82b8df - -# white -color7 #abbec5 -color15 #bccfd4 - -# tab bar -active_tab_foreground #322a69 -active_tab_background #afafdc -inactive_tab_foreground #322a36 -inactive_tab_background #8d8daa \ No newline at end of file diff --git a/common/tmux/conf b/common/tmux/conf index e517077..c5f0740 100644 --- a/common/tmux/conf +++ b/common/tmux/conf @@ -31,15 +31,15 @@ set -g mode-keys vi set -g history-limit 1000000 set -g status on set -g status-position bottom -set -g status-bg colour19 +set -g status-bg colour0 set -g status-fg colour8 set -g status-interval 5 set -g status-left-length 50 -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-style "fg=colour8 bg=colour7" +set -g window-status-current-style "fg=colour8 bg=colour7" +set -g window-status-format " #W " set -g window-status-separator "" -set -g window-status-current-format " #W" +set -g window-status-current-format " #W " set -g status-right "" set -g status-left "#h:#S #W " set -ag status-left "#(pwd | $XDG_CONFIG_HOME/lytedev-dotfiles/common/bin/glancepath) " @@ -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=colour19" +set -g message-style "fg=colour7 bg=colour0" set -g pane-active-border-style fg=blue -set -g pane-border-style fg=colour19 +set -g pane-border-style fg=colour0 set -g clock-mode-colour colour8 set -g base-index 1 set -g pane-base-index 1