diff --git a/.config/gtk-3.0/settings.ini.cgt b/.config/gtk-3.0/settings.ini.cgt index 6719dc3..d41523f 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-Red-Dark +gtk-theme-name=<% opt.gtk_theme %> 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 842d57b..e6bce18 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-Red-Dark +gtk-theme-name=<% opt.gtk_theme %> gtk-icon-theme-name=<% opt.icon_theme %> gtk-font-name=<% opt.font %> 11 gtk-cursor-theme-name=<% opt.cursor.theme %> diff --git a/.gtkrc-2.0.cgt b/.gtkrc-2.0.cgt index f2a91ef..248368d 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-Red-Dark" +gtk-theme-name="<% opt.gtk_theme %>" diff --git a/cg_opts.lua b/cg_opts.lua index 03d49b6..70527e1 100644 --- a/cg_opts.lua +++ b/cg_opts.lua @@ -19,6 +19,7 @@ opts.cursor = { size = 24, } +opts.gtk_theme = "Catppuccin-Mocha-Standard-Red-dark" opts.icon_theme = "candy-icons" opts.commands = { diff --git a/scripts/mzteinit/build.zig b/scripts/mzteinit/build.zig index 9c2d81e..822a34c 100644 --- a/scripts/mzteinit/build.zig +++ b/scripts/mzteinit/build.zig @@ -1,6 +1,7 @@ const std = @import("std"); +const common = @import("build_common.zig"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.build.Builder) !void { const target = b.standardTargetOptions(.{}); const mode = b.standardOptimizeOption(.{}); @@ -15,6 +16,14 @@ pub fn build(b: *std.build.Builder) void { exe.addModule("ansi-term", b.dependency("ansi_term", .{}).module("ansi-term")); + const cg_opt = try common.confgenGet(struct { + gtk_theme: []const u8, + }, "../..", b.allocator); + + const opts = b.addOptions(); + opts.addOption([]const u8, "gtk_theme", cg_opt.gtk_theme); + exe.addOptions("opts", opts); + b.installArtifact(exe); const run_cmd = b.addRunArtifact(exe); diff --git a/scripts/mzteinit/build_common.zig b/scripts/mzteinit/build_common.zig new file mode 120000 index 0000000..821d564 --- /dev/null +++ b/scripts/mzteinit/build_common.zig @@ -0,0 +1 @@ +../../build_common.zig \ No newline at end of file diff --git a/scripts/mzteinit/src/env.zig b/scripts/mzteinit/src/env.zig index 35ae4b8..4ae5b97 100644 --- a/scripts/mzteinit/src/env.zig +++ b/scripts/mzteinit/src/env.zig @@ -69,7 +69,7 @@ pub fn populateEnvironment(env: *std.process.EnvMap) !bool { // GUI options { try env.put("QT_QPA_PLATFORMTHEME", "qt5ct"); - try env.put("GTK_THEME", "Catppuccin-Mocha-Standard-Red-Dark"); + try env.put("GTK_THEME", @import("opts").gtk_theme); // gtk theme from confgen // use xdg-desktop-portal try env.put("GTK_USE_PORTAL", "1"); diff --git a/scripts/startriver.sh b/scripts/startriver.sh index 1937bf5..eedfc11 100755 --- a/scripts/startriver.sh +++ b/scripts/startriver.sh @@ -10,9 +10,4 @@ export QT_QPA_PLATFORM="wayland" # this is necessary for tray icons export XDG_CURRENT_DESKTOP="river" -# theming -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' - exec river