# HG changeset patch # User zegervdv # Date 1669828267 -3600 # Node ID 587765960227991cba54b17d851f8efd2c3f2fa2 # Parent 45c34cfecc3e9176457e980f03a73634fe4d28df feat: set global dark option diff -r 45c34cfecc3e -r 587765960227 .chezmoi.toml.tmpl --- a/.chezmoi.toml.tmpl Sun Nov 27 09:15:27 2022 +0100 +++ b/.chezmoi.toml.tmpl Wed Nov 30 18:11:07 2022 +0100 @@ -26,11 +26,19 @@ {{- $font_size = promptString "font_size" -}} {{- end -}} +{{- $dark := "" -}} +{{- if (hasKey . "dark") -}} +{{- $dark = .dark -}} +{{- else -}} +{{- $dark = promptBool "dark" -}} +{{- end -}} + [data] email = {{ $email | quote }} name = {{ $name | quote }} signingkey = {{ $signingkey | quote }} font_size = {{ $font_size | quote }} + dark = {{ $dark }} [merge] command = "nvim" diff -r 45c34cfecc3e -r 587765960227 .chezmoitemplates/init.lua --- a/.chezmoitemplates/init.lua Sun Nov 27 09:15:27 2022 +0100 +++ b/.chezmoitemplates/init.lua Wed Nov 30 18:11:07 2022 +0100 @@ -641,9 +641,15 @@ } use { local_plugin 'espresso-tutti-colori.nvim', + config = function() require('tutti-colori').setup() end, + } + use { + 'catppuccin/nvim', + as = 'catppuccin', config = function() - require('tutti-colori').setup() - require('tutti-colori').load() + require('catppuccin').setup { + flavour = 'mocha', + } end, } @@ -683,6 +689,12 @@ vim.cmd.packadd 'dirbuf.nvim' +if os.getenv 'DARKMODE' then + vim.cmd.colorscheme 'catppuccin' +else + vim.cmd.colorscheme 'espresso-tutti-colori' +end + -- Configuration local opt = vim.opt diff -r 45c34cfecc3e -r 587765960227 dot_config/kitty/colors/catppuccin.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/kitty/colors/catppuccin.conf Wed Nov 30 18:11:07 2022 +0100 @@ -0,0 +1,81 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Mocha +## author: Catppuccin Org +## 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 -r 45c34cfecc3e -r 587765960227 dot_config/kitty/colors/espresso-tutti.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/kitty/colors/espresso-tutti.conf Wed Nov 30 18:11:07 2022 +0100 @@ -0,0 +1,34 @@ +cursor #facbcb + +foreground #000000 +background #FBFAFC + +color0 #000000 +color8 #d1d1d1 + +color1 #d44950 +color9 #d44950 + +color2 #73b00a +color10 #73b00a + +color3 #faa500 +color11 #faa500 + +color4 #2f6f9f +color12 #2f6f9f + +color5 #3a1d72 +color13 #3a1d72 + +color6 #4f9fcf +color14 #4f9fcf + +color7 #ffffff +color15 #ffffff + +selection_background #dbebff + +active_border_color #b3deef +inactive_border_color #282c34 + diff -r 45c34cfecc3e -r 587765960227 dot_config/kitty/kitty.conf.tmpl --- a/dot_config/kitty/kitty.conf.tmpl Sun Nov 27 09:15:27 2022 +0100 +++ b/dot_config/kitty/kitty.conf.tmpl Wed Nov 30 18:11:07 2022 +0100 @@ -6,47 +6,14 @@ symbol_map U+F100-U+F2FF nonicons -cursor #facbcb - window_margin_width 4 window_padding_width 4 -foreground #000000 -background #FBFAFC - -color0 #000000 -color8 #d1d1d1 - -color1 #d44950 -color9 #d44950 - -color2 #73b00a -color10 #73b00a - -color3 #faa500 -color11 #faa500 - -color4 #2f6f9f -color12 #2f6f9f - -color5 #3a1d72 -color13 #3a1d72 - -color6 #4f9fcf -color14 #4f9fcf - -color7 #ffffff -color15 #ffffff - scrollback_lines 10000 -selection_background #dbebff - clipboard_control write-primary write-clipboard no-append draw_minimal_borders yes -active_border_color #b3deef -inactive_border_color #282c34 mark1_foreground white mark1_background #f43753 @@ -58,3 +25,9 @@ map ctrl+g kitten hints --type=linenum nvim +{line} {path} confirm_os_window_close 0 + +{{ if .dark }} +include colors/catppuccin.conf +{{ else }} +include colors/espresso-tutti.conf +{{ end }} diff -r 45c34cfecc3e -r 587765960227 dot_config/zsh.env.zsh.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/zsh.env.zsh.tmpl Wed Nov 30 18:11:07 2022 +0100 @@ -0,0 +1,3 @@ +{{ if .dark }} +export DARKMODE=1 +{{ end }} diff -r 45c34cfecc3e -r 587765960227 dot_config/zsh/fzf/colors.zsh.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/zsh/fzf/colors.zsh.tmpl Wed Nov 30 18:11:07 2022 +0100 @@ -0,0 +1,11 @@ +{{ if .dark }} +export FZF_DEFAULT_OPTS=" \ +--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \ +--color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \ +--color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8" +{{ else }} +export FZF_DEFAULT_OPTS="--color=fg:#000000,bg:#fbfafc,hl:#0b51a6 \ + --color=fg+:#000000,bg+:#dbebff,hl+:#0b51a6 \ + --color=info:#4f9fcf,prompt:#d44950,pointer:#d71707 \ + --color=marker:#d71707,spinner:#4f9fcf,header:#7653c1" +{{ end }} diff -r 45c34cfecc3e -r 587765960227 dot_config/zsh/prompt/colors.zsh.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/zsh/prompt/colors.zsh.tmpl Wed Nov 30 18:11:07 2022 +0100 @@ -0,0 +1,7 @@ +{{ if .dark }} +PROMPT=$'%F{#89dceb}%T%f%k %F{#f38ba8}%m%f %F{#89b4fa}%~%b%f%k +%j ->\u00A0' +{{ else }} +PROMPT=$'%F{#2f6f9f}%K{#f4faff}%T%f%k %F{#d71707}%m%f %F{#0b51a6}%~%b%f%k +%j ->\u00A0' +{{ end }} diff -r 45c34cfecc3e -r 587765960227 dot_zshrc --- a/dot_zshrc Sun Nov 27 09:15:27 2022 +0100 +++ b/dot_zshrc Wed Nov 30 18:11:07 2022 +0100 @@ -12,8 +12,8 @@ autoload -U colors && colors -PROMPT=$'%F{#2f6f9f}%K{#f4faff}%T%f%k %F{#d71707}%m%f %F{#0b51a6}%~%b%f%k -%j ->\u00A0' +source ~/.config/zsh.env.zsh +source ~/.config/zsh/prompt/colors.zsh vim_ins_mode="%F{black}%K{yellow} INS %k%f" vim_cmd_mode="%F{white}%K{red} NRM %k%f" @@ -288,10 +288,7 @@ zsh-defer source ~/.zsh/jq-zsh-plugin/jq.plugin.zsh -export FZF_DEFAULT_OPTS="--color=fg:#000000,bg:#fbfafc,hl:#0b51a6 \ - --color=fg+:#000000,bg+:#dbebff,hl+:#0b51a6 \ - --color=info:#4f9fcf,prompt:#d44950,pointer:#d71707 \ - --color=marker:#d71707,spinner:#4f9fcf,header:#7653c1" +source ~/.config/zsh/fzf/colors.zsh unix-word-rubout() { local WORDCHARS=$'!"#$%&\'()*+,-.:;<=>?@[\\]^_`{|}~'