Add Macchiato theme for GTK and Oh-my-posh

.config/bootstrap/config_common

@@ -4,6 +4,8 @@ arc-icon-theme
 bluez
 bluetooth-autoconnect
 bind
+catppuccin-cursors-macchiato
+catppuccin-gtk-theme-macchiato
 chromium
 cups
 docker
@@ -26,6 +28,7 @@ kwayland5
 libreoffice-fresh
 libusb-compat
 less
+lxappearance-gtk3
 maim
 man-db
 man-pages
@@ -42,6 +45,8 @@ obsidian
 oh-my-posh
 oh-my-zsh-git
 pacman-contrib
+papirus-icon-theme
+papirus-folders-catppuccin-git
 pass
 picom
 playerctl

.config/gtk-3.0/settings.ini

@@ -1,5 +1,16 @@
 [Settings]
-gtk-icon-theme-name = Arc
+gtk-icon-theme-name=Papirus-Dark
-gtk-theme-name = Arc
+gtk-theme-name=Catppuccin-Macchiato-Standard-Flamingo-Dark
 gtk-font-name=Noto Sans 11
 gtk-can-change-accels=1
+gtk-cursor-theme-name=Catppuccin-Macchiato-Flamingo-Cursors
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintmedium

.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

.config/picom.conf

@@ -8,7 +8,8 @@
 # unless explicitly requested using the wintypes option.
 #
 # shadow = false
-shadow = true;
+# Get rid of shadow behind corners
+shadow = false;
 
 # The blur radius for shadows, in pixels. (defaults to 12)
 # shadow-radius = 12
@@ -156,6 +157,14 @@ focus-exclude = [ "class_g = 'Cairo-clock'" ];
 #################################
 
 
+blur: {
+  method = "dual_kawase";
+  strength = 1;
+  background = true;
+  background-frame = true;
+  background-fixed = true;
+}
+
 # Parameters for background blurring, see the *BLUR* section for more information.
 # blur-method =
 # blur-size = 12
@@ -207,7 +216,8 @@ blur-background-exclude = [
 # `xrender` is the default one.
 #
 # backend = 'glx'
-backend = "xrender";
+# With xrender there is black in place of rounded corners
+backend = "glx";
 
 # Enable/disable VSync.
 # vsync = false
@@ -232,6 +242,7 @@ mark-ovredir-focused = true;
 # detect-rounded-corners = false
 detect-rounded-corners = true;
 
+corner-radius = 7.0
 # Detect '_NET_WM_OPACITY' on client windows, useful for window managers
 # not passing '_NET_WM_OPACITY' of client windows to frame windows.
 #

.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]

.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": " <transparent>\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": "<transparent,background>\ue0b0</>",
+          "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <transparent>\ue0b1</> <#121318>\uf044 {{ .Working.String }}</>{{ end }}{{ if .Staging.Changed }} <transparent>\ue0b1</> <#121318>\uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} <transparent>\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
+}
+

.init_config.sh

@@ -126,10 +126,13 @@ 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
 	# Basic directory structure
 	echo -e "* Create base home directories..."
 	mkdir -p ~/documents ~/images/screenshots ~/videos ~/downloads

.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)
+# And use Catppuccin Macchiato theme for ZSH fast hightlight plugin (LOCAL means searching in /usr/local/share/fsh)
-fast-theme LOCAL:catppuccin-mocha >/dev/null
+fast-theme LOCAL:catppuccin-macchiato >/dev/null
 
 # Preferred editor for local and remote sessions
 export EDITOR=vim