From 4f2b6749ff18a457b03c4b289ff981cb735265bf Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sat, 16 Nov 2024 21:10:07 -0800 Subject: [PATCH] feat(home): Wezterm --- homes/x86_64-linux/marley@nyx/default.nix | 4 ++ modules/home/programs/wezterm/default.nix | 87 +++++++++++++++++++++++ old/home/programs/wezterm.nix | 67 ----------------- 3 files changed, 91 insertions(+), 67 deletions(-) create mode 100644 modules/home/programs/wezterm/default.nix delete mode 100644 old/home/programs/wezterm.nix diff --git a/homes/x86_64-linux/marley@nyx/default.nix b/homes/x86_64-linux/marley@nyx/default.nix index 82ad135..0020c75 100644 --- a/homes/x86_64-linux/marley@nyx/default.nix +++ b/homes/x86_64-linux/marley@nyx/default.nix @@ -5,6 +5,8 @@ in { home.keyboard.options = [ "apple:alupckeys" ]; + targets.genericLinux = enabled; + ${namespace} = { isDesktop = true; @@ -13,6 +15,7 @@ in gtk = enabled; qt = enabled; }; + # TODO: Seperate out into graphical/shell/tui? programs = { amfora = enabled; bat = enabled; @@ -42,6 +45,7 @@ in starship = enabled; systemctl = enabled; tmux = enabled; + wezterm = enabled; }; xorg = { xsession = enabled; diff --git a/modules/home/programs/wezterm/default.nix b/modules/home/programs/wezterm/default.nix new file mode 100644 index 0000000..264ea1a --- /dev/null +++ b/modules/home/programs/wezterm/default.nix @@ -0,0 +1,87 @@ +{ + lib, + config, + namespace, + pkgs, + ... +}: +let + inherit (lib) mkIf; + inherit (lib.${namespace}) mkEnableModule; + + cfg = config.${namespace}.programs.wezterm; + inherit (config.${namespace}) theme; + + isGenericLinux = config.targets.genericLinux.enable; +in +{ + options = mkEnableModule "programs.wezterm"; + + config = mkIf cfg.enable { + programs.wezterm = { + enable = true; + + # Non-NixOS Linux systems don't have proper GPU integration, so we + # unfortunately need to use the native package manager version. + package = mkIf isGenericLinux pkgs.emptyDirectory; + + # TODO: create `local config` & return it seperately, so other modules can + # insert config in the middle + extraConfig = + let + # TODO: Set this in marleyos.theme + fonts = config.fonts.fontconfig.defaultFonts.monospace; + in + # lua + '' + local config = wezterm.config_builder() + + config.enable_tab_bar = false + + config.color_scheme = "${theme.colors.base}" + + config.font = wezterm.font_with_fallback({ + { + family = "Maple Mono NF", + -- TODO: Set this in marleyos.theme + harfbuzz_features = { + "cv02", + "ss01", + "ss02", + "ss03", + "ss04", + "ss05", + } + }, + ${toString (map (font: "{ family = \"${font}\" },") fonts)} + { family = "FairiesevkaTerm Nerd Font Mono" }, + { + family = "FiraCode Nerd Font", + harfbuzz_features = { + "cv02", + "cv06", + "ss01", + "cv14", + "onum", + "ss04", + "cv18", + "cv31", + "cv30", + "cv25", + "cv26", + "cv32", + "ss06", + "ss07", + }, + }, + { family = "Apple Color Emoji" }, + }) + + -- TODO: on mairley this should be set to 14.0 + config.font_size = 11.0 + + return config + ''; + }; + }; +} diff --git a/old/home/programs/wezterm.nix b/old/home/programs/wezterm.nix deleted file mode 100644 index d884d6d..0000000 --- a/old/home/programs/wezterm.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ pkgs, config, ... }: -{ - programs.wezterm = { - enable = true; - - # Non-NixOS Linux systems don't have proper GPU integration, so we - # unfortunately need to use the native package manager version. - package = pkgs.emptyDirectory; - - # TODO: create `local config` & return it seperately, so other modules can - # insert config in the middle - extraConfig = - let - fonts = config.fonts.fontconfig.defaultFonts.monospace; - in - # lua - '' - local config = wezterm.config_builder() - - config.enable_tab_bar = false - - -- TODO: auto-set this depending on color scheme - config.color_scheme = "rose-pine" - - config.font = wezterm.font_with_fallback({ - { - family = "Maple Mono NF", - harfbuzz_features = { - "cv02", - "ss01", - "ss02", - "ss03", - "ss04", - "ss05", - } - }, - ${toString (map (font: "{ family = \"${font}\" },") fonts)} - { family = "FairiesevkaTerm Nerd Font Mono" }, - { - family = "FiraCode Nerd Font", - harfbuzz_features = { - "cv02", - "cv06", - "ss01", - "cv14", - "onum", - "ss04", - "cv18", - "cv31", - "cv30", - "cv25", - "cv26", - "cv32", - "ss06", - "ss07", - }, - }, - { family = "Apple Color Emoji" }, - }) - - -- TODO: on mairley this should be set to 14.0 - config.font_size = 11.0 - - return config - ''; - }; -}