From ae30ae36eb0fab9c14340a262ce37f6e9160de2a Mon Sep 17 00:00:00 2001 From: Antonin Ruan Date: Sun, 10 Nov 2024 14:21:46 -1000 Subject: [PATCH] Change kitty theme and add config for kitten diff --- .aliases | 4 +- .config/kitty/current-theme.conf | 80 -------------------------- .config/kitty/diff.conf | 1 + .config/kitty/github-dark-dimmed.conf | 83 +++++++++++++++++++++++++++ .config/kitty/kitty.conf | 8 +-- .config/kitty/kitty.conf.bak | 7 --- 6 files changed, 91 insertions(+), 92 deletions(-) delete mode 100644 .config/kitty/current-theme.conf create mode 100644 .config/kitty/diff.conf create mode 100644 .config/kitty/github-dark-dimmed.conf delete mode 100644 .config/kitty/kitty.conf.bak diff --git a/.aliases b/.aliases index a562f13..a3a8104 100644 --- a/.aliases +++ b/.aliases @@ -21,4 +21,6 @@ alias md='mkdir -p' alias rd=rmdir alias venv='source env/bin/activate' alias which-command=whence -alias copy="xclip -selection clipboard" \ No newline at end of file +alias copy="xclip -selection clipboard" + +alias kdiff="kitten diff" \ No newline at end of file diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf deleted file mode 100644 index a45b09f..0000000 --- a/.config/kitty/current-theme.conf +++ /dev/null @@ -1,80 +0,0 @@ -# vim:ft=kitty - -## name: Catppuccin-Macchiato -## author: Pocco81 (https://github.com/Pocco81) -## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/macchiato.conf -## blurb: Soothing pastel theme for the high-spirited! - - - -# The basic colors -foreground #CAD3F5 -background #24273A -selection_foreground #24273A -selection_background #F4DBD6 - -# Cursor colors -cursor #F4DBD6 -cursor_text_color #24273A - -# URL underline color when hovering with mouse -url_color #F4DBD6 - -# Kitty window border colors -active_border_color #B7BDF8 -inactive_border_color #6E738D -bell_border_color #EED49F - -# OS Window titlebar colors -wayland_titlebar_color system -macos_titlebar_color system - -# Tab bar colors -active_tab_foreground #181926 -active_tab_background #C6A0F6 -inactive_tab_foreground #CAD3F5 -inactive_tab_background #1E2030 -tab_bar_background #181926 - -# Colors for marks (marked text in the terminal) -mark1_foreground #24273A -mark1_background #B7BDF8 -mark2_foreground #24273A -mark2_background #C6A0F6 -mark3_foreground #24273A -mark3_background #7DC4E4 - -# The 16 terminal colors - -# black -color0 #494D64 -color8 #5B6078 - -# red -color1 #ED8796 -color9 #ED8796 - -# green -color2 #A6DA95 -color10 #A6DA95 - -# yellow -color3 #EED49F -color11 #EED49F - -# blue -color4 #8AADF4 -color12 #8AADF4 - -# magenta -color5 #F5BDE6 -color13 #F5BDE6 - -# cyan -color6 #8BD5CA -color14 #8BD5CA - -# white -color7 #B8C0E0 -color15 #A5ADCB diff --git a/.config/kitty/diff.conf b/.config/kitty/diff.conf new file mode 100644 index 0000000..c308b71 --- /dev/null +++ b/.config/kitty/diff.conf @@ -0,0 +1 @@ +include github-dark-dimmed.conf \ No newline at end of file diff --git a/.config/kitty/github-dark-dimmed.conf b/.config/kitty/github-dark-dimmed.conf new file mode 100644 index 0000000..ebc4443 --- /dev/null +++ b/.config/kitty/github-dark-dimmed.conf @@ -0,0 +1,83 @@ +# vim:ft=kitty + +## name: GitHub Dark Dimmed +## author: GitHub +## license: MIT + +#: The basic colors + +foreground #adbac7 +background #22272e +selection_foreground #22272e +selection_background #539bf5 + + +#: Diff colors +pygments_style github-dark + +title_fg #adbac7 +title_bg #22272e + +margin_fg #adbac7 +margin_bg #3d4652 + +hunk_bg #243143 +hunk_margin_bg #2e4d78 + +removed_bg #3e2e34 +removed_margin_bg #5c3538 +highlight_removed_bg #813d3d + +added_bg #263834 +added_margin_bg #31503d +highlight_added_bg #335d3c + +filler_bg #262c36 + +#: Cursor colors + +cursor #539bf5 + + +#: Tab bar colors + +tab_bar_background #1c2128 +active_tab_foreground #adbac7 +active_tab_background #22272e +inactive_tab_foreground #768390 +inactive_tab_background #1c2128 + + +#: The basic 16 colors + +#: black +color0 #545d68 +color8 #636e7b + +#: red +color1 #f47067 +color9 #ff938a + +#: green +color2 #57ab5a +color10 #6bc46d + +#: yellow +color3 #c69026 +color11 #daaa3f + +#: blue +color4 #539bf5 +color12 #6cb6ff + +#: magenta +color5 #b083f0 +color13 #dcbdfb + +#: cyan +color6 #39c5cf +color14 #56d4dd + +#: white +color7 #909dab +color15 #cdd9e5 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index f7ab85b..07f123b 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,6 +1,6 @@ # BEGIN_KITTY_THEME -# Catppuccin-Macchiato -include current-theme.conf +# GitHub Dark Dimmed +include github-dark-dimmed.conf # END_KITTY_THEME map f1 launch --type=tab @@ -8,8 +8,8 @@ map f2 launch --cwd=current --type=tab # BEGIN_KITTY_FONTS -font_family family="FiraCode Nerd Font" -font_size 16.0 +font_family family="Iosevka" +font_size 18.0 bold_font auto italic_font auto bold_italic_font auto diff --git a/.config/kitty/kitty.conf.bak b/.config/kitty/kitty.conf.bak deleted file mode 100644 index 709986d..0000000 --- a/.config/kitty/kitty.conf.bak +++ /dev/null @@ -1,7 +0,0 @@ -# BEGIN_KITTY_THEME -# Catppuccin-Macchiato -include current-theme.conf -# END_KITTY_THEME - -map f1 launch --cwd=current -map f2 launch --cwd=current --type=tab