From 679b0687d4dab3cf8584a192c65e56b84a3cb4be Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 16 Jan 2024 08:37:15 +0100 Subject: [PATCH] Adopt prompt. Set kitty color scheme --- dot_config/kitty/current-theme.conf | 80 ++++++++++ dot_config/kitty/kitty.conf | 223 ++-------------------------- dot_config/starship.toml | 61 +------- 3 files changed, 91 insertions(+), 273 deletions(-) create mode 100644 dot_config/kitty/current-theme.conf diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf new file mode 100644 index 0000000..2533db7 --- /dev/null +++ b/dot_config/kitty/current-theme.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/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index fea916b..61f0721 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -1,45 +1,14 @@ # vim:fileencoding=utf-8:ft=conf:foldmethod=marker #: Fonts {{{ - -#: kitty has very powerful font management. You can configure -#: individual font faces and even specify special fonts for particular -#: characters. - -# font_family Source Code Pro font_family BrutalistMono Book -# font_family Fira Code Medium -# font_family Fira Code -# font_family Hack Regular bold_font BrutalistMono Book # italic_font auto # bold_italic_font auto - -#: You can specify different fonts for the bold/italic/bold-italic -#: variants. By default they are derived automatically, by the OSes -#: font system. Setting them manually is useful for font families that -#: have many weight variants like Book, Medium, Thick, etc. For -#: example:: - -#: font_family Operator Mono Book -#: bold_font Operator Mono Medium -#: italic_font Operator Mono Book Italic -#: bold_italic_font Operator Mono Medium Italic - font_size 16.0 text_composition_strategy 1.0 -#: Font size (in pts) -# adjust_line_height 0 -# adjust_column_width 0 - -#: Change the size of each character cell kitty renders. You can use -#: either numbers, which are interpreted as pixels or percentages -#: (number followed by %), which are interpreted as percentages of the -#: unmodified values. You can use negative pixels or percentages less -#: than 100% to reduce sizes (but this might cause rendering -#: artifacts). # https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points symbol_map U+E5FA-U+E62B Symbols Nerd Font Mono # Devicons @@ -80,32 +49,12 @@ symbol_map U+2500-U+259f Symbols Nerd Font Mono # nonicons symbol_map U+f101-U+f25c nonicons -#: Map the specified unicode codepoints to a particular font. Useful -#: if you need special rendering for some symbols, such as for -#: Powerline. Avoids the need for patched fonts. Each unicode code -#: point is specified in the form U+. You -#: can specify multiple code points, separated by commas and ranges -#: separated by hyphens. symbol_map itself can be specified multiple -#: times. Syntax is:: - -#: symbol_map codepoints Font Family Name - -# box_drawing_scale 0.001, 1, 1.5, 2 - -#: Change the sizes of the lines used for the box drawing unicode -#: characters These values are in pts. They will be scaled by the -#: monitor DPI to arrive at a pixel value. There must be four values -#: corresponding to thin, normal, thick, and very thick lines. - #: }}} #: Cursor customization {{{ - -cursor #32cd32 - +# cursor #32cd32 #: Default cursor color - -cursor_text_color #000000 +# cursor_text_color #000000 #: Choose the color of text under the cursor. If you want it rendered #: with the background color of the cell underneath instead, use the @@ -118,12 +67,6 @@ cursor_text_color #000000 # cursor_blink_interval 0.5 # cursor_stop_blinking_after 15.0 -#: The interval (in seconds) at which to blink the cursor. Set to zero -#: to disable blinking. Note that numbers smaller than repaint_delay -#: will be limited to repaint_delay. Stop blinking cursor after the -#: specified number of seconds of keyboard inactivity. Set to zero to -#: never stop blinking. - #: }}} #: Scrollback {{{ @@ -240,31 +183,6 @@ sync_to_monitor yes #: }}} -#: Terminal bell {{{ - -# enable_audio_bell yes - -#: Enable/disable the audio bell. Useful in environments that require -#: silence. - -# visual_bell_duration 0.0 - -#: Visual bell duration. Flash the screen when a bell occurs for the -#: specified number of seconds. Set to zero to disable. - -# window_alert_on_bell yes - -#: Request window attention on bell. Makes the dock icon bounce on -#: macOS or the taskbar flash on linux. - -# bell_on_tab yes - -#: Show a bell symbol on the tab if a bell occurs in one of the -#: windows in the tab and the window is not the currently focused -#: window - -#: }}} - #: Window layout {{{ # remember_window_size yes @@ -322,12 +240,10 @@ enabled_layouts Horizontal,Stack #: The window padding (in pts) (blank area between the text and the #: window border) - -active_border_color #d65d0e +# active_border_color #d65d0e #: The color for the border of the active window - -inactive_border_color #d5c4a1 +# inactive_border_color #d5c4a1 #: The color for the border of inactive windows @@ -347,111 +263,10 @@ inactive_border_color #d5c4a1 tab_bar_edge top -# tab_bar_margin_width 0.0 - -#: The margin to the left and right of the tab bar (in pts) - tab_bar_style separator -# tab_fade 0.25 0.5 0.75 1 - tab_separator " ┇" -#: The separator between tabs in the tab bar when using separator as -#: the tab_bar_style. - -active_tab_foreground #d65d0e -active_tab_background #665c54 -# active_tab_font_style bold-italic -inactive_tab_foreground #ebdbb2 -inactive_tab_background #32302f -# inactive_tab_font_style normal - -#: Tab bar colors and styles - -#: }}} - -#: Color scheme {{{ - -foreground #ebdbb2 -background #1b1b1b - -#: The foreground and background colors - -# background_opacity 1.0 -# dynamic_background_opacity no - -#: The opacity of the background. A number between 0 and 1, where 1 is -#: opaque and 0 is fully transparent. This will only work if -#: supported by the OS (for instance, when using a compositor under -#: X11). Note that it only sets the default background color's -#: opacity. This is so that things like the status bar in vim, -#: powerline prompts, etc. still look good. But it means that if you -#: use a color theme with a background color in your editor, it will -#: not be rendered as transparent. Instead you should change the -#: default background color in your kitty config and not use a -#: background color in the editor color scheme. Or use the escape -#: codes to set the terminals default colors in a shell script to -#: launch your editor. Be aware that using a value less than 1.0 is a -#: (possibly significant) performance hit. If you want to dynamically -#: change transparency of windows set dynamic_background_opacity to -#: yes (this is off by default as it has a performance cost) - -# dim_opacity 0.75 - -#: How much to dim text that has the DIM/FAINT attribute set. One -#: means no dimming and zero means fully dimmed (i.e. invisible). - -selection_foreground #bdae93 -selection_background #3c3836 - -#: The foreground and background for text selected with the mouse - - -#: The 16 terminal colors. There are 8 basic colors, each color has a -#: dull and bright version. You can also set the remaining colors from -#: the 256 color table as color16 to color255. - -color0 #282828 -color8 #928374 - -#: black - -color1 #cc241d -color9 #fb4934 - -#: red - -color2 #98971a -color10 #b8bb26 - -#: green - -color3 #d79921 -color11 #fabd2f - -#: yellow - -color4 #458588 -color12 #83a598 - -#: blue - -color5 #b16286 -color13 #d3869b - -#: magenta - -color6 #689d6a -color14 #8ec07c - -#: cyan - -color7 #a89984 -color15 #ebdbb2 - -#: white - #: }}} #: Advanced {{{ @@ -537,30 +352,6 @@ color15 #ebdbb2 #: OS specific tweaks {{{ -# macos_titlebar_color system - -#: Change the color of the kitty window's titlebar on macOS. A value -#: of system means to use the default system color, a value of -#: background means to use the background color of the currently -#: active window and finally you can use an arbitrary color, such as -#: #12af59 or red. WARNING: This option works by using a hack, as -#: there is no proper Cocoa API for it. It sets the background color -#: of the entire window and makes the titlebar transparent. As such it -#: is incompatible with background_opacity. If you want to use both, -#: you are probably better off just hiding the titlebar with -#: macos_hide_titlebar. - -# macos_hide_titlebar no - -#: Hide the kitty window's title bar on macOS. - -# x11_hide_window_decorations no - -#: Hide the window decorations (title bar and window borders) on X11 -#: and Wayland. Whether this works and exactly what effect it has -#: depends on the window manager, as it is the job of the window -#: manager/compositor to draw window decorations. - macos_option_as_alt yes #: Use the option key as an alt key. With this set to no, kitty will @@ -933,3 +724,9 @@ macos_custom_beam_cursor yes #: }}} # }}} + + +# BEGIN_KITTY_THEME +# Catppuccin-Mocha +include current-theme.conf +# END_KITTY_THEME diff --git a/dot_config/starship.toml b/dot_config/starship.toml index 572ef7e..686fe96 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -1,5 +1,3 @@ -[buf] -symbol = " " [golang] symbol = " " @@ -12,10 +10,6 @@ format = '\[[$symbol($version(-$name))]($style)\]' [cmd_duration] format = '\[[󰔛 $duration]($style)\]' -[conda] -symbol = " " -format = '\[[$symbol$environment]($style)\]' - [directory] read_only = " 󰌾" format = '[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ' @@ -53,13 +47,9 @@ format = '([\[$all_status$ahead_behind\]]($style))' symbol = " " format = '\[[$symbol($version)]($style)\]' -[hg_branch] -symbol = " " -format = '\[[$symbol$branch]($style)\]' - [hostname] ssh_symbol = "󰣀 " -ssh_only = false +ssh_only = true format = '[$ssh_symbol$hostname]($style):' style = 'bright-green' @@ -75,10 +65,6 @@ format = '\[[$symbol($version)]($style)\]' symbol = "󰍛 " format = '\[$symbol[$ram( | $swap)]($style)\]' -[meson] -symbol = "󰔷 " -format = '\[[$symbol$project]($style)\]' - [nodejs] symbol = " " format = '\[[$symbol($version)]($style)\]' @@ -87,50 +73,6 @@ format = '\[[$symbol($version)]($style)\]' symbol = " " format = '\[[$symbol($version)]($style)\]' -[os] -format = '\[[$symbol]($style)\]' - -[os.symbols] -Alpaquita = " " -Alpine = " " -Amazon = " " -Android = " " -Arch = " " -Artix = " " -CentOS = " " -Debian = " " -DragonFly = " " -Emscripten = " " -EndeavourOS = " " -Fedora = " " -FreeBSD = " " -Garuda = "󰛓 " -Gentoo = " " -HardenedBSD = "󰞌 " -Illumos = "󰈸 " -Linux = " " -Mabox = " " -Macos = " " -Manjaro = " " -Mariner = " " -MidnightBSD = " " -Mint = " " -NetBSD = " " -NixOS = " " -OpenBSD = "󰈺 " -openSUSE = " " -OracleLinux = "󰌷 " -Pop = " " -Raspbian = " " -Redhat = " " -RedHatEnterprise = " " -Redox = "󰀘 " -Solus = "󰠳 " -SUSE = " " -Ubuntu = " " -Unknown = " " -Windows = "󰍲 " - [package] symbol = "󰏗 " format = '\[[$symbol$version]($style)\]' @@ -165,6 +107,5 @@ format = '\[[$time]($style)\]' [username] format = '[$user@]($style)' -show_always = false style_user = 'bright-green' style_root = 'bright red'