diff --git a/.config/gtk-3.0/settings.ini.cgt b/.config/gtk-3.0/settings.ini.cgt index dc6e60c..6719dc3 100644 --- a/.config/gtk-3.0/settings.ini.cgt +++ b/.config/gtk-3.0/settings.ini.cgt @@ -1,5 +1,5 @@ [Settings] -gtk-theme-name=Catppuccin-Mocha-Standard-Pink-Dark +gtk-theme-name=Catppuccin-Mocha-Standard-Red-Dark gtk-icon-theme-name=<% opt.icon_theme %> gtk-font-name=<% opt.font %> 11 gtk-cursor-theme-name=<% opt.cursor.theme %> diff --git a/.config/gtk-4.0/settings.ini.cgt b/.config/gtk-4.0/settings.ini.cgt index cb434cc..842d57b 100644 --- a/.config/gtk-4.0/settings.ini.cgt +++ b/.config/gtk-4.0/settings.ini.cgt @@ -1,5 +1,5 @@ [Settings] -gtk-theme-name=Catppuccin-Mocha-Standard-Pink-Dark +gtk-theme-name=Catppuccin-Mocha-Standard-Red-Dark gtk-icon-theme-name=<% opt.icon_theme %> gtk-font-name=<% opt.font %> 11 gtk-cursor-theme-name=<% opt.cursor.theme %> diff --git a/.config/i3/config.cgt b/.config/i3/config.cgt index a0c0503..972a46a 100644 --- a/.config/i3/config.cgt +++ b/.config/i3/config.cgt @@ -287,9 +287,9 @@ set $base #1e1e2e set $mantle #181825 set $crust #11111b -client.focused $pink $crust $text $rosewater $pink -client.focused_inactive $mauve $base $text $rosewater $mauve -client.unfocused $mauve $base $text $rosewater $mauve +client.focused $red $crust $text $rosewater $red +client.focused_inactive $maroon $base $text $rosewater $maroon +client.unfocused $maroon $base $text $rosewater $maroon client.urgent $peach $base $peach $overlay0 $peach client.placeholder $overlay0 $base $text $overlay0 $overlay0 client.background $base diff --git a/.config/wired/wired.ron.cgt b/.config/wired/wired.ron.cgt index cf16b6e..bb792bd 100644 --- a/.config/wired/wired.ron.cgt +++ b/.config/wired/wired.ron.cgt @@ -1,3 +1,15 @@ + ( notifications_spawn_paused: false, max_notifications: 0, @@ -14,10 +26,10 @@ hook: Hook(parent_anchor: TL, self_anchor: TL), offset: Vec2(x: 25.0, y: 25.0), params: NotificationBlock(( - background_color: Color(hex: "#d0282a36"), - border_color: Color(hex: "#50fa7b"), - border_color_critical: Color(hex: "#ff5555"), - border_color_low: Color(hex: "#6272a4"), + background_color: Color(hex: "<% mantle %>"), + border_color: Color(hex: "<% red %>"), + border_color_critical: Color(hex: "<% peach %>"), + border_color_low: Color(hex: "<% sky %>"), border_rounding: 0.0, border_width: 4.0, gap: Vec2(x: 0.0, y: 12.0), @@ -32,7 +44,7 @@ hook: Hook(parent_anchor: TR, self_anchor: TL), offset: Vec2(x: 0.0, y: 0.0), params: ScrollingTextBlock(( - color: Color(hex: "#8be9fd"), + color: Color(hex: "<% red %>"), ellipsize: End, font: "<% opt.font %> Bold 12", lhs_dist: 25.0, @@ -52,7 +64,7 @@ offset: Vec2(x: 0.0, y: 0.0), params: TextBlock(( text: "%b", - color: Color(hex: "#f8f8f2"), + color: Color(hex: "<% text %>"), ellipsize: End, font: "<% opt.font %> Bold 12", padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0), @@ -85,10 +97,10 @@ render_criteria: [Or([Progress])], params: ProgressBlock(( background_color: Color(hex: "#00000000"), - border_color: Color(hex: "#ff79c6"), + border_color: Color(hex: "<% surface0 %>"), border_rounding: 0.0, border_width: 0.4, - fill_color: Color(hex: "#ffb86c"), + fill_color: Color(hex: "<% teal %>"), fill_rounding: 0.0, height: 10.0, padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0), diff --git a/.gtkrc-2.0.cgt b/.gtkrc-2.0.cgt index 174a8e3..f2a91ef 100644 --- a/.gtkrc-2.0.cgt +++ b/.gtkrc-2.0.cgt @@ -1,3 +1,3 @@ gtk-icon-theme-name="<% opt.icon_theme %>" gtk-cursor-theme-name="<% opt.cursor.theme %>" -gtk-theme-name="Catppuccin-Mocha-Standard-Pink-Dark" +gtk-theme-name="Catppuccin-Mocha-Standard-Red-Dark" diff --git a/scripts/mzteinit/src/env.zig b/scripts/mzteinit/src/env.zig index 8cc4c03..7477a75 100644 --- a/scripts/mzteinit/src/env.zig +++ b/scripts/mzteinit/src/env.zig @@ -68,8 +68,8 @@ pub fn populateEnvironment(env: *std.process.EnvMap) !bool { // GUI options { - try env.put("QT_QPA_PLATFORMTHEME", "gtk2"); - try env.put("GTK_THEME", "Catppuccin-Mocha-Standard-Pink-Dark"); + try env.put("QT_STYLE_OVERRIDE", "kvantum"); + try env.put("GTK_THEME", "Catppuccin-Mocha-Standard-Red-Dark"); // icon path icons: { diff --git a/scripts/startriver.sh b/scripts/startriver.sh index 87b18b9..1937bf5 100755 --- a/scripts/startriver.sh +++ b/scripts/startriver.sh @@ -11,7 +11,7 @@ export QT_QPA_PLATFORM="wayland" export XDG_CURRENT_DESKTOP="river" # theming -export GTK_THEME=Catppuccin-Mocha-Standard-Pink-Dark +export GTK_THEME=Catppuccin-Mocha-Standard-Red-Dark export QT_QPA_PLATFORMTHEME=gtk2 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'