Revert "Replace kitty with wezterm"
This reverts commit 8964db51013418570b0d449fab9c882b1454d905.
Wezterm has a number of issues, so I'm switching back to kitty, probably for
good
diff --git a/modules/kitty.nix b/modules/kitty.nix
new file mode 100644
index 0000000..10f7dee
--- /dev/null
+++ b/modules/kitty.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }: {
+ home = {
+ programs.kitty = {
+ enable = true;
+
+ theme = "One Half Dark";
+
+ settings = {
+ enable_audio_bell = "no";
+ visual_bell_duration = "0.1";
+ symbol_map = "U+E0A0-U+E0A3 PowerlineSymbols";
+ disable_ligatures = "cursor";
+ };
+ };
+ programs.zsh.initExtra = ''
+ if test -n "$KITTY_INSTALLATION_DIR"; then
+ export KITTY_SHELL_INTEGRATION="enabled"
+ autoload -Uz -- "$KITTY_INSTALLATION_DIR"/shell-integration/zsh/kitty-integration
+ kitty-integration
+ unfunction kitty-integration
+ fi
+ '';
+
+ home.shellAliases = {
+ icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+ };
+ };
+}
diff --git a/modules/ssh.nix b/modules/ssh.nix
index f269500..743c207 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -44,5 +44,9 @@
};
};
};
+
+ home.shellAliases = {
+ ssh = "kitty +kitten ssh";
+ };
};
}
diff --git a/modules/wezterm.nix b/modules/wezterm.nix
deleted file mode 100644
index b2cf6fe..0000000
--- a/modules/wezterm.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ pkgs, ... }: {
- home = {
- programs.wezterm = {
- enable = true;
-
- extraConfig = ''
- return {
- color_scheme = "OneHalfDark",
- visual_bell = {
- fade_in_duration_ms = 50,
- fade_out_duration_ms = 50,
- },
- window_padding = {
- left = '0.5cell',
- right = '0.5cell',
- top = '3px',
- bottom = '3px',
- },
- hide_tab_bar_if_only_one_tab = true,
- window_frame = {
- active_titlebar_bg = '#313640',
- inactive_titlebar_bg = '#313640',
- },
- colors = {
- tab_bar = {
- inactive_tab = {
- bg_color = '#474e5d',
- fg_color = 'white',
- },
- new_tab = {
- bg_color = '#474e5d',
- fg_color = 'white',
- },
- active_tab = {
- bg_color = '#98c379',
- fg_color = '#474e5d',
- },
- },
- },
- default_cursor_style = 'BlinkingBar',
- cursor_blink_rate = 600,
- cursor_blink_ease_in = 'Constant',
- cursor_blink_ease_out = 'Constant',
- }
- '';
- };
- home.shellAliases = {
- icat = "wezterm imgcat";
- imgcat = "wezterm imgcat";
- };
- };
-}
diff --git a/modules/xmonad/xmonad.hs b/modules/xmonad/xmonad.hs
index eaa4034..553522c 100644
--- a/modules/xmonad/xmonad.hs
+++ b/modules/xmonad/xmonad.hs
@@ -51,7 +51,7 @@
volumeChangeCmd = "${{./vol_change.py}}"
-terminal = "/usr/bin/env SHLVL=0 wezterm"
+terminal = "/usr/bin/env SHLVL=0 kitty" -- Kitty, my beloved <3
launcher = "pkill rofi; rofi -show combi"
networkManager = "wpa_cli select_network $(wpa_cli list_networks | tail -n +3 | awk '!seen[$2]++' | rofi -dmenu -window-title 'Select Network' | awk '{print $1;}')"