Allow custom editor, like we do custom terminal

bin/omarchy-cmd-screensaver

@@ -7,7 +7,7 @@ screensaver_in_focus() {
 exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
-  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  pkill -f "$TERMINAL --class Screensaver" 2>/dev/null
   exit 0
 }
 

bin/omarchy-font-set

@@ -13,11 +13,6 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
       pkill -USR1 kitty
     fi
 
-    if [[ -f ~/.config/ghostty/config ]]; then
-      sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
-      pkill -SIGUSR2 ghostty
-    fi
-
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
     xmlstarlet ed -L \

bin/omarchy-install-terminal

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
-  exit 1
-fi
-
-package="$1"
-
-# Install package
-omarchy-pkg-add $package
-
-# Set as default terminal
-echo "Setting $package as new default terminal..."
-sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
-
-# Relaunch is needed for new default to take effect
-echo
-gum confirm "Relaunch Hyprland to use new terminal?" && uwsm stop

bin/omarchy-launch-about

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec setsid uwsm app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'
+exec setsid uwsm app -- "$TERMINAL" --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'

bin/omarchy-launch-floating-terminal-with-presentation

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cmd="$*"
-exec setsid uwsm app -- alacritty --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+exec setsid uwsm app -- "$TERMINAL" --class=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

bin/omarchy-launch-screensaver

@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
 fi
 
 # Exit early if screensave is already running
-pgrep -f "alacritty --class Screensaver" && exit 0
+pgrep -f "$TERMINAL --class Screensaver" && exit 0
 
 # Allow screensaver to be turned off but also force started
 if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then

bin/omarchy-menu

@@ -37,7 +37,7 @@ menu() {
 }
 
 terminal() {
-  alacritty --class=Omarchy -e "$@"
+  $TERMINAL --class Omarchy -e "$@"
 }
 
 present_terminal() {
@@ -61,10 +61,6 @@ install_font() {
   present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
 }
 
-install_terminal() {
-  present_terminal "omarchy-install-terminal $1"
-}
-
 aur_install() {
   present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
 }
@@ -232,7 +228,7 @@ show_setup_security_menu() {
 }
 
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n  Gaming") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -241,7 +237,6 @@ show_install_menu() {
   *Style*) show_install_style_menu ;;
   *Development*) show_install_development_menu ;;
   *Editor*) show_install_editor_menu ;;
-  *Terminal*) show_install_terminal_menu ;;
   *AI*) show_install_ai_menu ;;
   *Gaming*) show_install_gaming_menu ;;
   *) show_main_menu ;;
@@ -269,15 +264,6 @@ show_install_editor_menu() {
   esac
 }
 
-show_install_terminal_menu() {
-  case $(menu "Install" "  Alacritty\n  Ghostty\n  Kitty") in
-  *Alacritty*) install_terminal "alacritty" ;;
-  *Ghostty*) install_terminal "ghostty" ;;
-  *Kitty*) install_terminal "kitty" ;;
-  *) show_install_menu ;;
-  esac
-}
-
 show_install_ai_menu() {
   ollama_pkg=$(
     (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||

bin/omarchy-theme-set-terminal

@@ -2,6 +2,5 @@
 
 case "$TERMINAL" in
 "alacritty") touch ~/.config/alacritty/alacritty.toml ;;
-"kitty") pkill -USRSIG1 kitty ;;
-"ghostty") pkill -USRSIG2 ghostty ;;
+"kitty") pkill -USR1 kitty ;;
 esac

config/ghostty/config

@@ -1,21 +0,0 @@
-# Dynamic theme colors
-config-file = "~/.config/omarchy/current/theme/ghostty.conf"
-
-# Font
-font-family = "CaskaydiaMono Nerd Font"
-font-style = Regular
-font-size = 9
-
-# Window
-window-padding-x = 14
-window-padding-y = 14
-window-decoration = server
-confirm-close-surface=false
-resize-overlay = never
-
-# Cursor stlying
-cursor-style = "block"
-cursor-style-blink = false
-
-# Keyboard bindings
-keybind = f11=toggle_fullscreen

default/hypr/apps/terminals.conf

@@ -1,2 +1,2 @@
 # Define terminal tag to style them uniformly
-windowrule = tag +terminal, class:(Alacritty|kitty|com.mitchellh.ghostty)
+windowrule = tag +terminal, class:(Alacritty|kitty|ghostty)

themes/catppuccin-latte/ghostty.conf

@@ -1 +0,0 @@
-theme = Catppuccin Latte

themes/catppuccin/ghostty.conf

@@ -1 +0,0 @@
-theme = Catppuccin Mocha

themes/everforest/ghostty.conf

@@ -1 +0,0 @@
-theme = Everforest Dark   Hard

themes/gruvbox/ghostty.conf

@@ -1 +0,0 @@
-theme = Gruvbox Dark

themes/kanagawa/ghostty.conf

@@ -1 +0,0 @@
-theme = Kanagawa Wave

themes/matte-black/ghostty.conf

@@ -1,19 +0,0 @@
-# normal colors
-palette = 0=#333333
-palette = 1=#D35F5F
-palette = 2=#FFC107
-palette = 3=#B91C1C
-palette = 4=#E68E0D
-palette = 5=#D35F5F
-palette = 6=#BEBEBE
-palette = 7=#BEBEBE
-
-# bright colors
-palette = 8=#8A8A8D
-palette = 9=#B91C1C
-palette = 10=#FFC107
-palette = 11=#B90A0A
-palette = 12=#F59E0B
-palette = 13=#B91C1C
-palette = 14=#EAEAEA
-palette = 15=#FFFFFF

themes/nord/ghostty.conf

@@ -1 +0,0 @@
-theme = Nord

themes/osaka-jade/ghostty.conf

@@ -1 +0,0 @@
-theme = TokyoNight

themes/ristretto/ghostty.conf

@@ -1 +0,0 @@
-theme = Monokai Pro Ristretto

themes/rose-pine/ghostty.conf

@@ -1 +0,0 @@
-theme = Rose Pine Dawn

themes/tokyo-night/ghostty.conf

@@ -1 +0,0 @@
-theme = TokyoNight