fix(wezterm): broken font redering on 24.11 #152

Merged
jalil merged 2 commits from fix-wezterm into main 2024-11-20 21:41:58 +01:00
2 changed files with 38 additions and 26 deletions

View file

@ -78,36 +78,47 @@ in
settings = lib.mkIf config.jhome.styling.enable ( settings = lib.mkIf config.jhome.styling.enable (
import ./waybar-settings.nix { inherit config lib; } import ./waybar-settings.nix { inherit config lib; }
); );
style = lib.optionalString config.jhome.styling.enable '' style =
.modules-left #workspaces button { lib.optionalString config.jhome.styling.enable # css
border-bottom: 3px solid @base01; ''
} .modules-left #workspaces button {
.modules-left #workspaces button.persistent { border-bottom: 3px solid @base01;
border-bottom: 3px solid transparent; }
} .modules-left #workspaces button.persistent {
''; border-bottom: 3px solid transparent;
}
'';
}; };
# Terminal # Terminal
wezterm = { wezterm = {
enable = cfg.terminal == "wezterm"; enable = cfg.terminal == "wezterm";
extraConfig = lib.optionalString config.jhome.styling.enable '' extraConfig =
config = {} lib.optionalString config.jhome.styling.enable # lua
config.hide_tab_bar_if_only_one_tab = true ''
config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 } local wezterm = require("wezterm")
return config
''; local config = wezterm.config_builder()
config.front_end = "WebGpu"
config.hide_tab_bar_if_only_one_tab = true
config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 }
return config
'';
}; };
alacritty.enable = cfg.terminal == "alacritty"; alacritty.enable = cfg.terminal == "alacritty";
zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in
# PDF reader # PDF reader
zathura.enable = true; zathura.enable = true;
# Auto start sway # Auto start sway
zsh.loginExtra = lib.optionalString cfg.sway.autostart '' zsh.loginExtra =
# Start Sway on login to TTY 1 lib.optionalString cfg.sway.autostart # sh
if [ "$TTY" = /dev/tty1 ]; then ''
exec sway # Start Sway on login to TTY 1
fi if [ "$TTY" = /dev/tty1 ]; then
''; exec sway
fi
'';
}; };
services = { services = {
# Volume/Backlight control and notifications # Volume/Backlight control and notifications

View file

@ -95,12 +95,13 @@ in
}) })
(lib.mkIf (enable && linuxOlderThan6_3 && cfg."8bitdoFix") { (lib.mkIf (enable && linuxOlderThan6_3 && cfg."8bitdoFix") {
# Udev rules to start or stop systemd service when controller is connected or disconnected # Udev rules to start or stop systemd service when controller is connected or disconnected
services.udev.extraRules = '' services.udev.extraRules = # udev
# May vary depending on your controller model, find product id using 'lsusb' ''
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106" # May vary depending on your controller model, find product id using 'lsusb'
# This device (2dc8:3016) is "connected" when the above device disconnects SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106"
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106" # This device (2dc8:3016) is "connected" when the above device disconnects
''; SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106"
'';
# Systemd service which starts xboxdrv in xbox360 mode # Systemd service which starts xboxdrv in xbox360 mode
systemd.services."8bitdo-ultimate-xinput@" = { systemd.services."8bitdo-ultimate-xinput@" = {