diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix index 84f2c44..4fdb002 100644 --- a/modules/darwin/home-manager.nix +++ b/modules/darwin/home-manager.nix @@ -62,7 +62,7 @@ in "Affinity Publisher 2" = 1606941598; # "DaisyDisk" = 409907375; # (4.32) # Don't use this, we need the official version that is not sandboxed "Fantastical - Calendar" = 975937182; - "Fedistar" = 6445863996; # (1.13.1) + "Fedistar" = 6445863996; # (1.13.1) "Home Assistant" = 1099568401; # (2025.7.1) "Ice Cubes for Mastodon" = 6444915884; # (1.11.3) "LibreOffice" = 1630474372; @@ -118,6 +118,10 @@ in style = "Block"; }; + env = { + TERM = "xterm-256color"; + }; + window = { opacity = 1.0; padding = { @@ -231,19 +235,19 @@ in }; initContent = let + zshConfigBefore = lib.mkBefore '' + if [[ "$TERM" == "alacritty" ]] && ! infocmp alacritty >/dev/null 2>&1; then + export TERM="xterm-256color" + fi + export TERMINFO_DIRS="$HOME/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo" + ''; + zshConfigEarlyInit = lib.mkOrder 500 '' if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh . /nix/var/nix/profiles/default/etc/profile.d/nix.sh fi - if [[ "$TERM" == "alacritty" ]]; then - export TERMINFO_DIRS="$HOME/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo" - if ! infocmp alacritty >/dev/null 2>&1; then - export TERM="xterm-256color" - fi - fi - # GPGAgent for SSH export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) @@ -285,6 +289,7 @@ in ''; in lib.mkMerge [ + zshConfigBefore zshConfigEarlyInit zshConfigLastInit ];