diff --git a/modules/graphical/sway/default.nix b/modules/graphical/sway/default.nix index 27b8f192..205b2e4b 100644 --- a/modules/graphical/sway/default.nix +++ b/modules/graphical/sway/default.nix @@ -73,8 +73,8 @@ in down = "j"; up = "k"; right = "l"; - terminal = "${pkgs.kitty}/bin/kitty"; - menu = "${terminal} --class launcher -e ${launcher}/bin/launcher"; + terminal = "${pkgs.wezterm}/bin/wezterm"; + menu = "${terminal} start --class launcher -- ${launcher}/bin/launcher"; fonts = { names = [ "Fira Code" ]; size = 9.0; style = "Normal"; }; bars = [ { diff --git a/modules/graphical/sway/launcher.nix b/modules/graphical/sway/launcher.nix index 0152a1b0..08fa0e3c 100644 --- a/modules/graphical/sway/launcher.nix +++ b/modules/graphical/sway/launcher.nix @@ -5,7 +5,6 @@ let inherit (pkgs) fzy jq - kitty libqalculate nix pass diff --git a/modules/graphical/terminal/default.nix b/modules/graphical/terminal/default.nix index 2dfa9410..9afa42ef 100644 --- a/modules/graphical/terminal/default.nix +++ b/modules/graphical/terminal/default.nix @@ -8,45 +8,8 @@ config = lib.mkIf config.chvp.graphical.terminal.enable { home-manager.users.charlotte = { pkgs, ... }: { - programs.kitty = { - enable = true; - settings = { - font_family = "Fira Code"; - font_size = 9; - disable_ligatures = "cursor"; - background = "#ffffff"; - foreground = "#000000"; - cursor = "#777777"; - url_color = "#0031a9"; - # black - color0 = "#282828"; - color8 = "#000000"; - # red - color1 = "#a60000"; - color9 = "#972500"; - # green - color2 = "#005e00"; - color10 = "#315b00"; - # yellow - color3 = "#813e00"; - color11 = "#70480f"; - # blue - color4 = "#0031a9"; - color12 = "#2544bb"; - # magenta - color5 = "#721045"; - color13 = "#8f0075"; - # cyan - color6 = "#00538b"; - color14 = "#30517f"; - # white - color7 = "#f8f8f8"; - color15 = "#ffffff"; - enable_audio_bell = false; - visual_bell_duration = "0.25"; - remember_window_size = false; - }; - }; + home.packages = [ pkgs.wezterm ]; + xdg.configFile."wezterm/wezterm.lua".source = ./wezterm.lua; }; }; } diff --git a/modules/graphical/terminal/wezterm.lua b/modules/graphical/terminal/wezterm.lua new file mode 100644 index 00000000..d27e8b50 --- /dev/null +++ b/modules/graphical/terminal/wezterm.lua @@ -0,0 +1,30 @@ +local wezterm = require 'wezterm'; + +return { + font = wezterm.font("Fira Code"), + font_size = 9.0, + colors = { + foreground = "#000000", + background = "#ffffff", + cursor_bg = "#777777", + cursor_fg = "#ffffff", + selection_bg = "#000000", + selection_fg = "#ffffff", + ansi = { "#282828", "#a60000", "#005e00", "#813e00", "#0031a9", "#721045", "#00538b", "#f8f8f8" }, + brights = { "#000000", "#972500", "#315b00", "#70480f", "#2544bb", "#8f0075", "#30517f", "#ffffff" }, + }, + enable_scroll_bar = false, + audible_bell = "Disabled", + check_for_updates = false, + enable_tab_bar = false, + cursor_blink_ease_in = "Constant", + cursor_blink_ease_out = "Constant", + default_cursor_style = "BlinkingBlock", + unicode_version = 14, + visual_bell = { + fade_in_function = "EaseIn", + fade_in_duration_ms = 150, + fade_out_function = "EaseOut", + fade_out_duration_ms = 150, + }, +}