From 78342c07ad5041ee27634f9d37872577ccc852ce Mon Sep 17 00:00:00 2001 From: Von Random Date: Tue, 25 Feb 2025 13:53:36 +0200 Subject: [PATCH 1/2] Revert "wezterm: move os specific stuff into a single function call" This reverts commit c2fbb28170856e966b961ceab78f45f2d4a46ce4. --- dot_config/wezterm/wezterm.lua | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dot_config/wezterm/wezterm.lua b/dot_config/wezterm/wezterm.lua index 567ca3e..19dba86 100644 --- a/dot_config/wezterm/wezterm.lua +++ b/dot_config/wezterm/wezterm.lua @@ -8,18 +8,6 @@ local tab_fg = '#ebdbb2' local tab_bg = '#504945' local tab_bg_active = '#282828' --- os specific stuff -local myos = fn.set_by_os{ - Darwin = { - font_size = 14, - window_decorations = "TITLE | RESIZE" - }, - others = { - font_size = 10, - window_decorations = "RESIZE" - } -} - -- misc local cfg = wt.config_builder() cfg.leader = kb.leader @@ -32,10 +20,14 @@ cfg.cursor_blink_rate = 0 cfg.bold_brightens_ansi_colors = false cfg.font = wt.font('Cascadia Mono PL') cfg.harfbuzz_features = {"ss01", "ss19", "ss20"} -cfg.font_size = myos.font_size +cfg.font_size = fn.set_by_os{ + Darwin = 14, + others = 10 +} + -- visuals cfg.native_macos_fullscreen_mode = false -cfg.window_decorations = myos.window_decorations +cfg.window_decorations = 'RESIZE' cfg.xcursor_theme = 'Adwaita' cfg.use_fancy_tab_bar = false cfg.hide_tab_bar_if_only_one_tab = false From 3168e01c952d83be2261ace25b83c46e746dafe0 Mon Sep 17 00:00:00 2001 From: Von Random Date: Tue, 25 Feb 2025 14:01:02 +0200 Subject: [PATCH 2/2] wezterm: better implemenation of set_by_os to avoid checking for os multiple times --- dot_config/wezterm/functions.lua | 5 +++-- dot_config/wezterm/wezterm.lua | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dot_config/wezterm/functions.lua b/dot_config/wezterm/functions.lua index 1827dd2..f9a7b0a 100644 --- a/dot_config/wezterm/functions.lua +++ b/dot_config/wezterm/functions.lua @@ -5,11 +5,12 @@ local function get_os() end local function set_by_os(values) - local my_os = get_os() - if values[my_os] then return values[my_os] end + if values[MY_OS] then return values[MY_OS] end return values.others end +MY_OS = get_os() + return { set_by_os = set_by_os } diff --git a/dot_config/wezterm/wezterm.lua b/dot_config/wezterm/wezterm.lua index 19dba86..c6776d4 100644 --- a/dot_config/wezterm/wezterm.lua +++ b/dot_config/wezterm/wezterm.lua @@ -26,11 +26,12 @@ cfg.font_size = fn.set_by_os{ } -- visuals +-- maybe enable these back one day +-- cfg.window_decorations = 'RESIZE' +-- cfg.hide_tab_bar_if_only_one_tab = false cfg.native_macos_fullscreen_mode = false -cfg.window_decorations = 'RESIZE' cfg.xcursor_theme = 'Adwaita' cfg.use_fancy_tab_bar = false -cfg.hide_tab_bar_if_only_one_tab = false cfg.show_new_tab_button_in_tab_bar = false cfg.tab_max_width = 24 cfg.window_padding = {