From 2be4067567d3d01bd642b9112fb52650bf0360d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 20 Nov 2024 21:34:11 +0100 Subject: [PATCH 1/2] fix(wezterm): broken font redering on 24.11 --- home/gui/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index 209f09f..9898654 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -90,12 +90,19 @@ in # Terminal wezterm = { enable = cfg.terminal == "wezterm"; - extraConfig = lib.optionalString config.jhome.styling.enable '' - config = {} - config.hide_tab_bar_if_only_one_tab = true - config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 } - return config - ''; + extraConfig = + lib.optionalString config.jhome.styling.enable # lua + '' + local wezterm = require("wezterm") + + 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"; zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in -- 2.47.0 From f295026a6ad0d8a8c40ede17701fdc36e42839ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 20 Nov 2024 21:34:11 +0100 Subject: [PATCH 2/2] feat: add language directives for embedded languages --- home/gui/default.nix | 32 ++++++++++++++++++-------------- system/gui/default.nix | 13 +++++++------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index 9898654..bd81732 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -78,14 +78,16 @@ in settings = lib.mkIf config.jhome.styling.enable ( import ./waybar-settings.nix { inherit config lib; } ); - style = lib.optionalString config.jhome.styling.enable '' - .modules-left #workspaces button { - border-bottom: 3px solid @base01; - } - .modules-left #workspaces button.persistent { - border-bottom: 3px solid transparent; - } - ''; + style = + lib.optionalString config.jhome.styling.enable # css + '' + .modules-left #workspaces button { + border-bottom: 3px solid @base01; + } + .modules-left #workspaces button.persistent { + border-bottom: 3px solid transparent; + } + ''; }; # Terminal wezterm = { @@ -109,12 +111,14 @@ in # PDF reader zathura.enable = true; # Auto start sway - zsh.loginExtra = lib.optionalString cfg.sway.autostart '' - # Start Sway on login to TTY 1 - if [ "$TTY" = /dev/tty1 ]; then - exec sway - fi - ''; + zsh.loginExtra = + lib.optionalString cfg.sway.autostart # sh + '' + # Start Sway on login to TTY 1 + if [ "$TTY" = /dev/tty1 ]; then + exec sway + fi + ''; }; services = { # Volume/Backlight control and notifications diff --git a/system/gui/default.nix b/system/gui/default.nix index 373adfe..b1ae6b1 100644 --- a/system/gui/default.nix +++ b/system/gui/default.nix @@ -95,12 +95,13 @@ in }) (lib.mkIf (enable && linuxOlderThan6_3 && cfg."8bitdoFix") { # Udev rules to start or stop systemd service when controller is connected or disconnected - services.udev.extraRules = '' - # 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" - # 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" - ''; + 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" + # 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.services."8bitdo-ultimate-xinput@" = { -- 2.47.0