From bbd092c80d5f00d7016d4f0ab6cddb0f623756d8 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 18 Sep 2024 21:10:01 -0300 Subject: [PATCH] lilipod broken; theme wezterm tabbar with stylix --- hosts/desktops/common/packages.nix | 2 +- users/desktops/common/programs/wezterm.nix | 147 ++++++++++----------- 2 files changed, 72 insertions(+), 77 deletions(-) diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix index 3e9e696..f401f6e 100644 --- a/hosts/desktops/common/packages.nix +++ b/hosts/desktops/common/packages.nix @@ -34,7 +34,7 @@ in { krita libfido2 libreoffice-qt - lilipod + # lilipod mangohud microsoft-edge mission-center diff --git a/users/desktops/common/programs/wezterm.nix b/users/desktops/common/programs/wezterm.nix index dfea71c..e9860dc 100644 --- a/users/desktops/common/programs/wezterm.nix +++ b/users/desktops/common/programs/wezterm.nix @@ -1,86 +1,81 @@ { config, pkgs, lib, ... }: -{ +let + tabbar-background = config.lib.stylix.colors.withHashtag.base01; + active-tab-background = config.lib.stylix.colors.withHashtag.base00; + foreground = config.lib.stylix.colors.withHashtag.base05; +in { programs.wezterm = { enable = true; extraConfig = '' - local act = wezterm.action - local function get_initial_cols_by_hostname() - local hostname = wezterm.hostname() - - if hostname == "rotterdam" then - return 110 - elseif hostname == "io" then - return 89 - else - return 110 - end + local act = wezterm.action + local function get_initial_cols_by_hostname() + local hostname = wezterm.hostname() + if hostname == "rotterdam" then + return 110 + elseif hostname == "io" then + return 89 + else + return 110 end - - return { - disable_default_key_bindings = true, - use_fancy_tab_bar = true, - window_frame = { - active_titlebar_bg = '#303446', - inactive_titlebar_bg = '#303446', + end + return { + disable_default_key_bindings = true, + colors = { + tab_bar = { + background = '${tabbar-background}', + active_tab = { bg_color = '${active-tab-background}', fg_color = '${foreground}', }, + inactive_tab = { bg_color = '${tabbar-background}', fg_color = '${foreground}', }, + inactive_tab_edge = '${tabbar-background}', + new_tab = { bg_color = '${tabbar-background}', fg_color = '${foreground}', }, + new_tab_hover = { bg_color = '${foreground}', fg_color = '${tabbar-background}', }, }, - colors = { - tab_bar = { - background = '#303446', - active_tab = { - bg_color = '#1e1e2e', - fg_color = '#9197b0', - }, - inactive_tab = { - bg_color = '#303446', - fg_color = '#9197b0' - }, - inactive_tab_edge = '#303062', - new_tab = { bg_color = "#303446", fg_color = "#9197b0", }, - new_tab_hover = { bg_color = "#9197b0", fg_color = "#303446", }, - }, - }, - initial_cols = get_initial_cols_by_hostname(), - initial_rows = 32, - enable_scroll_bar = true, - inactive_pane_hsb = { - saturation = 0.7, - brightness = 0.5 - }, - hide_tab_bar_if_only_one_tab = false, - show_new_tab_button_in_tab_bar = true, - front_end = "WebGpu", - keys = { - { key = 'Tab', mods = 'CTRL', action = act.ActivateTabRelative(1) }, - { key = 'Tab', mods = 'SHIFT|CTRL', action = act.ActivateTabRelative(-1) }, - { key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen }, - { key = ':', mods = 'SHIFT|CTRL', action = act.SplitVertical{ domain = 'CurrentPaneDomain' } }, - { key = '?', mods = 'SHIFT|CTRL', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } }, - { key = '+', mods = 'CTRL', action = act.IncreaseFontSize }, - { key = '=', mods = 'CTRL', action = act.IncreaseFontSize }, - { key = '-', mods = 'CTRL', action = act.DecreaseFontSize }, - { key = '_', mods = 'SHIFT|CTRL', action = act.DecreaseFontSize }, - { key = '0', mods = 'CTRL', action = act.ResetFontSize }, - { key = 'C', mods = 'SHIFT|CTRL', action = act.CopyTo 'Clipboard' }, - { key = 'F', mods = 'SHIFT|CTRL', action = act.Search 'CurrentSelectionOrEmptyString' }, - { key = 'B', mods = 'SHIFT|CTRL', action = act.ClearScrollback 'ScrollbackOnly' }, - { key = 'R', mods = 'SHIFT|CTRL', action = act.ReloadConfiguration }, - { key = 'T', mods = 'SHIFT|CTRL', action = act.SpawnTab 'CurrentPaneDomain' }, - { key = 'V', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' }, - { key = 'W', mods = 'SHIFT|CTRL', action = act.CloseCurrentTab{ confirm = true } }, - { key = 'PageUp', mods = 'SHIFT', action = act.ScrollByPage(-1) }, - { key = 'PageUp', mods = 'CTRL', action = act.ActivateTabRelative(-1) }, - { key = 'PageUp', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(-1) }, - { key = 'PageDown', mods = 'SHIFT', action = act.ScrollByPage(1) }, - { key = 'PageDown', mods = 'CTRL', action = act.ActivateTabRelative(1) }, - { key = 'PageDown', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(1) }, - { key = 'H', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Left' }, - { key = 'L', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Right' }, - { key = 'K', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Up' }, - { key = 'J', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Down' }, - { key = 'P', mods = 'SHIFT|CTRL', action = act.ActivateCommandPalette }, - }, - } + }, + window_frame = { + active_titlebar_bg = '${tabbar-background}', + inactive_titlebar_bg = '${tabbar-background}', + }, + use_fancy_tab_bar = true, + initial_cols = get_initial_cols_by_hostname(), + initial_rows = 32, + inactive_pane_hsb = { + saturation = 0.7, + brightness = 0.5 + }, + hide_tab_bar_if_only_one_tab = false, + show_new_tab_button_in_tab_bar = true, + front_end = "WebGpu", + keys = { + { key = 'Tab', mods = 'CTRL', action = act.ActivateTabRelative(1) }, + { key = 'Tab', mods = 'SHIFT|CTRL', action = act.ActivateTabRelative(-1) }, + { key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen }, + { key = ':', mods = 'SHIFT|CTRL', action = act.SplitVertical{ domain = 'CurrentPaneDomain' } }, + { key = '?', mods = 'SHIFT|CTRL', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } }, + { key = '+', mods = 'CTRL', action = act.IncreaseFontSize }, + { key = '=', mods = 'CTRL', action = act.IncreaseFontSize }, + { key = '-', mods = 'CTRL', action = act.DecreaseFontSize }, + { key = '_', mods = 'SHIFT|CTRL', action = act.DecreaseFontSize }, + { key = '0', mods = 'CTRL', action = act.ResetFontSize }, + { key = 'C', mods = 'SHIFT|CTRL', action = act.CopyTo 'Clipboard' }, + { key = 'F', mods = 'SHIFT|CTRL', action = act.Search 'CurrentSelectionOrEmptyString' }, + { key = 'B', mods = 'SHIFT|CTRL', action = act.ClearScrollback 'ScrollbackOnly' }, + { key = 'R', mods = 'SHIFT|CTRL', action = act.ReloadConfiguration }, + { key = 'T', mods = 'SHIFT|CTRL', action = act.SpawnTab 'CurrentPaneDomain' }, + { key = 'V', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' }, + { key = 'W', mods = 'SHIFT|CTRL', action = act.CloseCurrentTab{ confirm = true } }, + { key = 'PageUp', mods = 'SHIFT', action = act.ScrollByPage(-1) }, + { key = 'PageUp', mods = 'CTRL', action = act.ActivateTabRelative(-1) }, + { key = 'PageUp', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(-1) }, + { key = 'PageDown', mods = 'SHIFT', action = act.ScrollByPage(1) }, + { key = 'PageDown', mods = 'CTRL', action = act.ActivateTabRelative(1) }, + { key = 'PageDown', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(1) }, + { key = 'H', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Left' }, + { key = 'L', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Right' }, + { key = 'K', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Up' }, + { key = 'J', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Down' }, + { key = 'P', mods = 'SHIFT|CTRL', action = act.ActivateCommandPalette }, + }, + } ''; }; }