diff --git a/data/alacritty/alacritty.yml b/data/alacritty/alacritty.yml deleted file mode 100644 index 977ae28..0000000 --- a/data/alacritty/alacritty.yml +++ /dev/null @@ -1,11 +0,0 @@ -import: - - ~/.config/alacritty/catppuccin.yml - -window: - opacity: 0.9 - -font: - normal: - family: APL385 Unicode - style: Regular - size: 18.0 diff --git a/data/alacritty/catppuccin.yml b/data/alacritty/catppuccin.yml deleted file mode 100644 index 461fcff..0000000 --- a/data/alacritty/catppuccin.yml +++ /dev/null @@ -1,38 +0,0 @@ -# https://github.com/catppuccin/alacritty -# Catppuccin! -colors: - # Default colors - primary: - background: '0x1E1D2F' - foreground: '0xD9E0EE' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '0x1E1D2F' - cursor: '0xF5E0DC' - - # Normal colors - normal: - black: '0x6E6C7E' - red: '0xF28FAD' - green: '0xABE9B3' - yellow: '0xFAE3B0' - blue: '0x96CDFB' - magenta: '0xF5C2E7' - cyan: '0x89DCEB' - white: '0xD9E0EE' - - # Bright colors - bright: - black: '0x988BA2' - red: '0xF28FAD' - green: '0xABE9B3' - yellow: '0xFAE3B0' - blue: '0x96CDFB' - magenta: '0xF5C2E7' - cyan: '0x89DCEB' - white: '0xD9E0EE' - - indexed_colors: - - { index: 16, color: '0xF8BD96' } - - { index: 17, color: '0xF5E0DC' } diff --git a/data/bat/config b/data/bat/config index f5e00ac..167b2bd 100644 --- a/data/bat/config +++ b/data/bat/config @@ -1,2 +1,2 @@ ---theme=ansi +--theme=Catppuccin --style=plain diff --git a/data/bat/themes/Catppuccin.tmTheme b/data/bat/themes/Catppuccin.tmTheme new file mode 100644 index 0000000..a27df22 --- /dev/null +++ b/data/bat/themes/Catppuccin.tmTheme @@ -0,0 +1,960 @@ + + + + + name + Catppuccin + settings + + + settings + + foreground + #d9e0ee + background + #1e1e2e + caret + #d9e0ec + invisibles + #c3bac6 + gutterForeground + #988ba2 + gutterForegroundHighlight + #abe9b3 + lineHighlight + #1e1e2e + selection + #6e6c7e + selectionBorder + #1e1e2e + activeGuide + #f8bd96 + findHighlightForeground + #161320 + findHighlight + #fae3b0 + bracketsForeground + #988ba2 + bracketContentsForeground + #988ba2 + + + + name + Comment + scope + comment + settings + + foreground + #6e6c7e + fontStyle + italic + + + + name + String + scope + string + settings + + foreground + #abe9b3 + fontStyle + + + + + name + String regex + scope + string.regexp + settings + + foreground + #f8bd96 + fontStyle + + + + + name + Number + scope + constant.numeric + settings + + foreground + #f8bd96 + fontStyle + + + + + name + Boolean + scope + constant.language.boolean + settings + + foreground + #f8bd96 + fontStyle + bold italic + + + + name + Built-in constant + scope + constant.language + settings + + foreground + #c9cbff + fontStyle + italic + + + + name + Built-in function + scope + support.function.builtin + settings + + foreground + #f8bd96 + fontStyle + italic + + + + name + User-defined constant + scope + variable.other.constant + settings + + foreground + #f8bd96 + fontStyle + + + + + name + Variable + scope + variable + settings + + + + + name + Keyword + scope + keyword + settings + + foreground + #f28fad + fontStyle + italic + + + + name + Conditional/loop + scope + keyword.control.loop, keyword.control.conditional, keyword.control.c++ + settings + + foreground + #ddb6f2 + fontStyle + bold + + + + name + Return + scope + keyword.control.return, keyword.control.flow.return + settings + + foreground + #f5c2e7 + fontStyle + bold + + + + name + Exception + scope + support.type.exception + settings + + foreground + #f8bd96 + fontStyle + italic + + + + name + Operator + scope + keyword.operator, punctuation.accessor + settings + + foreground + #89dceb + fontStyle + bold + + + + name + Punctuation separator + scope + punctuation.separator + settings + + foreground + #b5e8e0 + fontStyle + + + + + name + Punctuation terminator + scope + punctuation.terminator + settings + + foreground + #b5e8e0 + fontStyle + + + + + name + Punctuation bracket + scope + punctuation.section + settings + + foreground + #988ba2 + fontStyle + + + + + name + Include + scope + keyword.control.import.include + settings + + foreground + #b5e8e0 + fontStyle + italic + + + + name + Storage + scope + storage + settings + + foreground + #f28fad + fontStyle + + + + + name + Storage type + scope + storage.type + settings + + foreground + #fae3b0 + fontStyle + italic + + + + name + Storage modifier + scope + storage.modifier + settings + + foreground + #f28fad + fontStyle + + + + + name + Storage type namespace + scope + entity.name.namespace, meta.path + settings + + foreground + #f5e0dc + fontStyle + italic + + + + name + Storage type class + scope + storage.type.class + settings + + foreground + #f5e0dc + fontStyle + italic + + + + name + Label + scope + entity.name.label + settings + + foreground + #96cdfb + fontStyle + + + + + name + Keyword class + scope + keyword.declaration.class + settings + + foreground + #f28fad + fontStyle + italic + + + + name + Class name + scope + entity.name.class, meta.toc-list.full-identifier + settings + + foreground + #89dceb + fontStyle + + + + + name + Inherited class + scope + entity.other.inherited-class + settings + + foreground + #89dceb + fontStyle + italic + + + + name + Function name + scope + entity.name.function, variable.function + settings + + foreground + #96cdfb + fontStyle + italic + + + + name + Function macro + scope + entity.name.function.preprocessor + settings + + foreground + #f28fad + fontStyle + + + + + name + Macro directive - ifdef + scope + keyword.control.import + settings + + foreground + #f28fad + fontStyle + + + + + name + Constructor + scope + entity.name.function.constructor, entity.name.function.destructor + settings + + foreground + #c9cbff + fontStyle + + + + + name + Function argument + scope + variable.parameter.function + settings + + foreground + #f5e0dc + fontStyle + italic + + + + name + Function declaration + scope + keyword.declaration.function + settings + + foreground + #e8a2af + fontStyle + italic + + + + name + Library function + scope + support.function + settings + + foreground + #89dceb + fontStyle + + + + + name + Library constant + scope + support.constant + settings + + foreground + #96cdfb + fontStyle + + + + + name + Library class/type + scope + support.type, support.class + settings + + foreground + #96cdfb + fontStyle + italic + + + + name + Library variable + scope + support.other.variable + settings + + fontStyle + + + + + name + Variable function + scope + variable.function + settings + + foreground + #96cdfb + fontStyle + italic + + + + name + Variable parameter + scope + variable.parameter + settings + + foreground + #f5e0dc + fontStyle + italic + + + + name + Variable other + scope + variable.other + settings + + foreground + #d9e0ee + fontStyle + italic + + + + name + Variable field + scope + variable.other.member + settings + + foreground + #f5e0dc + fontStyle + + + + + name + Variable language + scope + variable.language + settings + + foreground + #b5e8e0 + fontStyle + + + + + name + Tag name + scope + entity.name.tag + settings + + foreground + #f8bd96 + fontStyle + + + + + name + Tag attribute + scope + entity.other.attribute-name + settings + + foreground + #ddb6f2 + fontStyle + italic + + + + name + Tag delimiter + scope + punctuation.definition.tag + settings + + foreground + #e8a2af + fontStyle + + + + + name + Markdown URL + scope + markup.underline.link.markdown + settings + + foreground + #f5e0dc + fontStyle + italic underline + + + + name + Markdown reference + scope + meta.link.inline.description + settings + + foreground + #c9cbff + fontStyle + bold + + + + name + Markdown literal + scope + comment.block.markdown, meta.code-fence, markup.raw.code-fence, markup.raw.inline + settings + + foreground + #b5e8e0 + fontStyle + italic + + + + name + Markdown title + scope + punctuation.definition.heading, entity.name.section + settings + + foreground + #96cdfb + fontStyle + bold + + + + name + Markdown emphasis + scope + markup.italic + settings + + foreground + #e8a2af + fontStyle + italic + + + + name + Markdown strong + scope + markup.bold + settings + + foreground + #e8a2af + fontStyle + bold + + + + name + Escape + scope + constant.character.escape + settings + + foreground + #f5c2e7 + fontStyle + + + + + name + Bash built-in function + scope + source.shell.bash meta.function.shell meta.compound.shell meta.function-call.identifier.shell + settings + + foreground + #f5c2e7 + fontStyle + + + + + name + Bash parameter + scope + variable.language.shell + settings + + foreground + #f28fad + fontStyle + italic + + + + name + Lua field + scope + source.lua meta.function.lua meta.block.lua meta.mapping.value.lua meta.mapping.key.lua string.unquoted.key.lua + settings + + foreground + #c9cbff + fontStyle + italic + + + + name + Lua constructor + scope + source.lua meta.function.lua meta.block.lua meta.mapping.key.lua string.unquoted.key.lua + settings + + foreground + #f2cdcd + fontStyle + + + + + name + Java constant + scope + entity.name.constant.java + settings + + foreground + #b5e8e0 + fontStyle + + + + + name + CSS property + scope + support.type.property-name.css + settings + + foreground + #f2cdcd + fontStyle + italic + + + + name + CSS constant + scope + support.constant.property-value.css + settings + + foreground + #d9e0ee + fontStyle + + + + + name + CSS suffix + scope + constant.numeric.suffix.css, keyword.other.unit.css + settings + + foreground + #b5e8e0 + fontStyle + italic + + + + name + CSS variable property + scope + variable.other.custom-property.name.css, support.type.custom-property.name.css, punctuation.definition.custom-property.css + settings + + foreground + #b5e8e0 + fontStyle + + + + + name + SCSS tag + scope + entity.name.tag.css + settings + + foreground + #c9cbff + fontStyle + + + + + name + SASS variable + scope + variable.other.sass + settings + + foreground + #b5e8e0 + fontStyle + + + + + name + Invalid + scope + invalid + settings + + foreground + #d9e0ee + background + #f28fad + fontStyle + + + + + name + Invalid deprecated + scope + invalid.deprecated + settings + + foreground + #d9e0ee + background + #ddb6f2 + fontStyle + + + + + name + Diff header + scope + meta.diff, meta.diff.header + settings + + foreground + #6e6c7e + fontStyle + + + + + name + Diff deleted + scope + markup.deleted + settings + + foreground + #f28fad + fontStyle + + + + + name + Diff inserted + scope + markup.inserted + settings + + foreground + #abe9b3 + fontStyle + + + + + name + Diff changed + scope + markup.changed + settings + + foreground + #fae3b0 + fontStyle + + + + + name + Message error + scope + message.error + settings + + foreground + #f28fad + fontStyle + + + + + uuid + 4d0379b5-ef82-467b-b8b8-365889420646 + colorSpaceName + sRGB + semanticClass + theme.dark.Catppuccin + author + BrunDerSchwarzmagier + + \ No newline at end of file diff --git a/data/data.json b/data/data.json index be21674..973a926 100644 --- a/data/data.json +++ b/data/data.json @@ -16,14 +16,6 @@ } ] }, - "alacritty": { - "paths": [ - { - "internal": "data/alacritty", - "external": "~/.config/alacritty" - } - ] - }, "kitty": { "paths": [ { @@ -35,8 +27,8 @@ "bat": { "paths": [ { - "internal": "data/bat/config", - "external": "~/.config/bat/config" + "internal": "data/bat", + "external": "~/.config/bat" } ] }, diff --git a/data/kitty/catppuccin.conf b/data/kitty/catppuccin.conf deleted file mode 100644 index 14c86a4..0000000 --- a/data/kitty/catppuccin.conf +++ /dev/null @@ -1,79 +0,0 @@ -# vim:ft=kitty - -## name: Catppuccin -## author: Pocco81 (https://github.com/Pocco81) -## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/catppuccin.conf -## blurb: Soothing pastel theme for the high-spirited! - -# The basic colors -foreground #D9E0EE -background #1E1E2E -selection_foreground #D9E0EE -selection_background #575268 - -# Cursor colors -cursor #F5E0DC -cursor_text_color #1E1E2E - -# URL underline color when hovering with mouse -url_color #F5E0DC - -# kitty window border colors -active_border_color #C9CBFF -inactive_border_color #575268 -bell_border_color #FAE3B0 - -# OS Window titlebar colors -wayland_titlebar_color system -macos_titlebar_color system - -#: Tab bar colors -active_tab_foreground #F5C2E7 -active_tab_background #575268 -inactive_tab_foreground #D9E0EE -inactive_tab_background #1E1E2E -tab_bar_background #161320 - -# Colors for marks (marked text in the terminal) - -mark1_foreground #1E1E2E -mark1_background #96CDFB -mark2_foreground #1E1E2E -mark2_background #F5C2E7 -mark3_foreground #1E1E2E -mark3_background #B5E8E0 - -#: The 16 terminal colors - -#: black -color0 #6E6C7E -color8 #988BA2 - -#: red -color1 #F28FAD -color9 #F28FAD - -#: green -color2 #ABE9B3 -color10 #ABE9B3 - -#: yellow -color3 #FAE3B0 -color11 #FAE3B0 - -#: blue -color4 #96CDFB -color12 #96CDFB - -#: magenta -color5 #F5C2E7 -color13 #F5C2E7 - -#: cyan -color6 #89DCEB -color14 #89DCEB - -#: white -color7 #D9E0EE -color15 #D9E0EE diff --git a/data/kitty/catppuccin/mocha.conf b/data/kitty/catppuccin/mocha.conf new file mode 100644 index 0000000..2533db7 --- /dev/null +++ b/data/kitty/catppuccin/mocha.conf @@ -0,0 +1,80 @@ +# vim:ft=kitty + +## name: Catppuccin-Mocha +## author: Pocco81 (https://github.com/Pocco81) +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #CDD6F4 +background #1E1E2E +selection_foreground #1E1E2E +selection_background #F5E0DC + +# Cursor colors +cursor #F5E0DC +cursor_text_color #1E1E2E + +# URL underline color when hovering with mouse +url_color #F5E0DC + +# Kitty window border colors +active_border_color #B4BEFE +inactive_border_color #6C7086 +bell_border_color #F9E2AF + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111B +active_tab_background #CBA6F7 +inactive_tab_foreground #CDD6F4 +inactive_tab_background #181825 +tab_bar_background #11111B + +# Colors for marks (marked text in the terminal) +mark1_foreground #1E1E2E +mark1_background #B4BEFE +mark2_foreground #1E1E2E +mark2_background #CBA6F7 +mark3_foreground #1E1E2E +mark3_background #74C7EC + +# The 16 terminal colors + +# black +color0 #45475A +color8 #585B70 + +# red +color1 #F38BA8 +color9 #F38BA8 + +# green +color2 #A6E3A1 +color10 #A6E3A1 + +# yellow +color3 #F9E2AF +color11 #F9E2AF + +# blue +color4 #89B4FA +color12 #89B4FA + +# magenta +color5 #F5C2E7 +color13 #F5C2E7 + +# cyan +color6 #94E2D5 +color14 #94E2D5 + +# white +color7 #BAC2DE +color15 #A6ADC8 diff --git a/data/kitty/kitty.conf b/data/kitty/kitty.conf index d261bd5..18401bd 100644 --- a/data/kitty/kitty.conf +++ b/data/kitty/kitty.conf @@ -1,4 +1,4 @@ -include catppuccin.conf +include catppuccin/mocha.conf # https://sw.kovidgoyal.net/kitty/conf/#color-scheme background_opacity 0.9 diff --git a/scripts/git.sh b/scripts/git.sh index 99ae850..eadc45f 100755 --- a/scripts/git.sh +++ b/scripts/git.sh @@ -19,3 +19,12 @@ git config --global alias.tg "tag --sort=-version:refname" git config --global pull.rebase true git config --global fetch.prune true git config --global init.defaultBranch main +git config --global diff.colorMoved default +git config --global merge.conflictstyle diff3 + +# Delta +# https://github.com/dandavison/delta +git config --global core.pager delta +git config --global interactive.diffFilter "delta --color-only" +git config --global delta.navigate true +git config --global delta.syntax-theme ansi