From 1074886cf3c82319eee1e632f7e974322072ef31 Mon Sep 17 00:00:00 2001 From: Quentin Duchemin Date: Sun, 28 Jan 2024 21:07:25 +0100 Subject: [PATCH] Add Macchiato theme for GTK and Oh-my-posh --- .config/i3/config_common | 41 ++++++++- .config/polybar/config_common | 2 +- .config/theme/quick-term.omp.json | 137 ++++++++++++++++++++++++++++++ .init_config.sh | 4 +- .zshrc | 4 +- 5 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 .config/theme/quick-term.omp.json diff --git a/.config/i3/config_common b/.config/i3/config_common index 7b065af..f523cd0 100644 --- a/.config/i3/config_common +++ b/.config/i3/config_common @@ -1,5 +1,41 @@ # i3 config file (v4) +# Catppuccin Macchiato : https://github.com/catppuccin/i3/blob/main/themes/catppuccin-macchiato +set $rosewater #f4dbd6 +set $flamingo #f0c6c6 +set $pink #f5bde6 +set $mauve #c6a0f6 +set $red #ed8796 +set $maroon #ee99a0 +set $peach #f5a97f +set $yellow #eed49f +set $green #a6da95 +set $teal #8bd5ca +set $sky #91d7e3 +set $sapphire #7dc4e4 +set $blue #8aadf4 +set $lavender #b7bdf8 +set $text #cad3f5 +set $subtext1 #b8c0e0 +set $subtext0 #a5adcb +set $overlay2 #939ab7 +set $overlay1 #8087a2 +set $overlay0 #6e738d +set $surface2 #5b6078 +set $surface1 #494d64 +set $surface0 #363a4f +set $base #24273a +set $mantle #1e2030 +set $crust #181926i + +# target title bg text indicator border +client.focused $lavender $base $text $rosewater $lavender +client.focused_inactive $overlay0 $base $text $rosewater $overlay0 +client.unfocused $overlay0 $base $text $rosewater $overlay0 +client.urgent $peach $base $peach $overlay0 $peach +client.placeholder $overlay0 $base $text $overlay0 $overlay0 +client.background $base + ################################## # STARTING CONFIGURATION ################################## @@ -17,6 +53,8 @@ floating_modifier $mod # no border nor title new_window none +default_border pixel 0 +default_floating_border pixel 5 # hide borders when touching edges hide_edge_borders both @@ -209,9 +247,6 @@ bindsym Shift+BackSpace exec dunstctl close # OPERATIONS FOR SPECIFIC WINDOWS ################################## -# enable window icons for all windows -for_window [all] title_window_icon yes - # some windows will float automatically for_window [class="(?i)Thunderbird"] floating enable for_window [window_role="About"] floating enable diff --git a/.config/polybar/config_common b/.config/polybar/config_common index d51cd4f..c858c39 100644 --- a/.config/polybar/config_common +++ b/.config/polybar/config_common @@ -1,6 +1,6 @@ [global/wm] margin-top=50 -include-file = $HOME/.config/polybar/mocha.ini +include-file = $HOME/.config/polybar/macchiato.ini ; Common to top and bottom bars [bar/common] diff --git a/.config/theme/quick-term.omp.json b/.config/theme/quick-term.omp.json new file mode 100644 index 0000000..b7cc891 --- /dev/null +++ b/.config/theme/quick-term.omp.json @@ -0,0 +1,137 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "palette": { + "text": "#ffffff", + "darktext": "#6e738d", + "blue": "#8aadf4", + "lavender": "#b7bdf8", + "mauve": "#c6a0f6", + "green": "#a6da95", + "maroon": "#ee99a0", + "grey": "#e4e4e4", + "ahead": "#54433a" + }, + "blocks": [ + { + "alignment": "left", + "newline": true, + "segments": [ + { + "background": "p:mauve", + "foreground": "p:text", + "properties": { + "alpine": "\uf300", + "arch": "\uf303", + "centos": "\uf304", + "debian": "\uf306", + "elementary": "\uf309", + "fedora": "\uf30a", + "gentoo": "\uf30d", + "linux": "\ue712", + "macos": "\ue711", + "manjaro": "\uf312", + "mint": "\uf30f", + "opensuse": "\uf314", + "raspbian": "\uf315", + "ubuntu": "\uf31c", + "windows": "\ue70f" + }, + "style": "diamond", + "leading_diamond": "\u256d\u2500\ue0b2", + "template": " {{ .Icon }} ", + "type": "os" + }, + { + "background": "p:grey", + "foreground": "p:darktext", + "style": "powerline", + "powerline_symbol": "\ue0b0", + "template": " {{ .UserName }} ", + "type": "session" + }, + { + "background": "p:blue", + "foreground": "p:text", + "properties": { + "style": "agnoster_short", + "max_depth": 3, + "folder_icon": "\u2026", + "folder_separator_icon": " \ue0b1 " + }, + "style": "powerline", + "powerline_symbol": "\ue0b0", + "template": " {{ .Path }} ", + "type": "path" + }, + { + "background": "p:green", + "foreground": "p:text", + "background_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}p:maroon{{ end }}" + ], + "properties": { + "branch_max_length": 25, + "fetch_stash_count": true, + "fetch_status": true, + "branch_icon": "\uf418 ", + "branch_identical_icon": "\uf444", + "branch_gone_icon": "\ueab8" + }, + "style": "diamond", + "leading_diamond": "\ue0b0", + "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \ue0b1 <#121318>\uf044 {{ .Working.String }}{{ end }}{{ if .Staging.Changed }} \ue0b1 <#121318>\uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \ue0b1 <#121318>\ueb4b {{ .StashCount }}{{ end }} ", + "trailing_diamond": "\ue0b0", + "type": "git" + } + ], + "type": "prompt" + }, + { + "alignment": "right", + "segments": [ + { + "background": "p:grey", + "foreground": "p:darktext", + "properties": { + "style": "austin", + "always_enabled": true + }, + "invert_powerline": true, + "style": "powerline", + "powerline_symbol": "\ue0b2", + "template": " \ueba2 {{ .FormattedMs }} ", + "type": "executiontime" + }, + { + "background": "p:mauve", + "foreground": "p:text", + "properties": { + "time_format": "15:04:05" + }, + "invert_powerline": true, + "style": "diamond", + "template": " \uf073 {{ .CurrentDate | date .Format }} ", + "trailing_diamond": "\ue0b0", + "type": "time" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "p:mauve", + "style": "plain", + "template": "\u2570\u2500 {{ if .Root }}#{{else}}${{end}}", + "type": "text" + } + ], + "type": "prompt" + } + ], + "final_space": true, + "version": 2 +} + diff --git a/.init_config.sh b/.init_config.sh index e90d35e..7e19a3a 100755 --- a/.init_config.sh +++ b/.init_config.sh @@ -126,10 +126,10 @@ if [ ! -z "$INIT" ]; then sudo git clone https://github.com/unixorn/fzf-zsh-plugin.git /usr/share/oh-my-zsh/plugins/fzf-zsh-plugin echo -e "* Install everything we need for Catppuccin themes..." echo -e "\tFor polybar..." - wget https://raw.githubusercontent.com/catppuccin/polybar/main/themes/mocha.ini -O ~/.config/polybar/mocha.ini + wget https://raw.githubusercontent.com/catppuccin/polybar/main/themes/macchiato.ini -O ~/.config/polybar/macchiato.ini echo -e "\tFor zsh..." sudo mkdir -p /usr/local/share/fsh - sudo wget https://raw.githubusercontent.com/catppuccin/zsh-fsh/main/themes/catppuccin-mocha.ini -O /usr/local/share/fsh/catppuccin-mocha.ini + sudo wget https://raw.githubusercontent.com/catppuccin/zsh-fsh/main/themes/catppuccin-macchiato.ini -O /usr/local/share/fsh/catppuccin-macchiato.ini echo -e "\tFor gtk..." # Change icon color for Papirus Icon Theme papirus-folders -C cat-latte-flamingo --theme Papirus-Dark diff --git a/.zshrc b/.zshrc index 4090d03..c3bcb4a 100644 --- a/.zshrc +++ b/.zshrc @@ -60,8 +60,8 @@ source $ZSH/oh-my-zsh.sh # Use Quick Term prompt theme made for Oh My Posh, in zsh eval "$(oh-my-posh init zsh --config ~/.config/theme/quick-term.omp.json)" -# And use Catppuccin Mocha theme for ZSH fast hightlight plugin (LOCAL means searching in /usr/local/share/fsh) -fast-theme LOCAL:catppuccin-mocha >/dev/null +# And use Catppuccin Macchiato theme for ZSH fast hightlight plugin (LOCAL means searching in /usr/local/share/fsh) +fast-theme LOCAL:catppuccin-macchiato >/dev/null # Preferred editor for local and remote sessions export EDITOR=vim