mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
10 Commits
d3b2cff9ce
...
ghostty-te
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce00b362a7 | ||
|
|
8b7fa43b31 | ||
|
|
fb8fc11225 | ||
|
|
d697ef22cd | ||
|
|
f62086f76d | ||
|
|
ce7b22967a | ||
|
|
7518b62dca | ||
|
|
310a5b1d5a | ||
|
|
85ef1cf1d2 | ||
|
|
198ead1231 |
@@ -7,7 +7,7 @@ screensaver_in_focus() {
|
|||||||
exit_screensaver() {
|
exit_screensaver() {
|
||||||
hyprctl keyword cursor:invisible false
|
hyprctl keyword cursor:invisible false
|
||||||
pkill -x tte 2>/dev/null
|
pkill -x tte 2>/dev/null
|
||||||
pkill -f "$TERMINAL --class Screensaver" 2>/dev/null
|
pkill -f "alacritty --class Screensaver" 2>/dev/null
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,11 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
|
|||||||
pkill -USR1 kitty
|
pkill -USR1 kitty
|
||||||
fi
|
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/waybar/style.css
|
||||||
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
|
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
|
||||||
xmlstarlet ed -L \
|
xmlstarlet ed -L \
|
||||||
|
|||||||
19
bin/omarchy-install-terminal
Executable file
19
bin/omarchy-install-terminal
Executable file
@@ -0,0 +1,19 @@
|
|||||||
|
#!/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
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
exec setsid uwsm app -- "$TERMINAL" --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'
|
exec setsid uwsm app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
cmd="$*"
|
cmd="$*"
|
||||||
exec setsid uwsm app -- "$TERMINAL" --class=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
|
exec setsid uwsm app -- alacritty --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Exit early if screensave is already running
|
# Exit early if screensave is already running
|
||||||
pgrep -f "$TERMINAL --class Screensaver" && exit 0
|
pgrep -f "alacritty --class Screensaver" && exit 0
|
||||||
|
|
||||||
# Allow screensaver to be turned off but also force started
|
# Allow screensaver to be turned off but also force started
|
||||||
if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
|
if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ menu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
terminal() {
|
terminal() {
|
||||||
$TERMINAL --class Omarchy -e "$@"
|
alacritty --class=Omarchy -e "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
present_terminal() {
|
present_terminal() {
|
||||||
@@ -61,6 +61,10 @@ install_font() {
|
|||||||
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
|
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() {
|
aur_install() {
|
||||||
present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
|
present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
|
||||||
}
|
}
|
||||||
@@ -228,7 +232,7 @@ show_setup_security_menu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_install_menu() {
|
show_install_menu() {
|
||||||
case $(menu "Install" " Package\n AUR\n Web App\n TUI\n Service\n Style\n Development\n Editor\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 Terminal\n AI\n Gaming") in
|
||||||
*Package*) terminal omarchy-pkg-install ;;
|
*Package*) terminal omarchy-pkg-install ;;
|
||||||
*AUR*) terminal omarchy-pkg-aur-install ;;
|
*AUR*) terminal omarchy-pkg-aur-install ;;
|
||||||
*Web*) present_terminal omarchy-webapp-install ;;
|
*Web*) present_terminal omarchy-webapp-install ;;
|
||||||
@@ -237,6 +241,7 @@ show_install_menu() {
|
|||||||
*Style*) show_install_style_menu ;;
|
*Style*) show_install_style_menu ;;
|
||||||
*Development*) show_install_development_menu ;;
|
*Development*) show_install_development_menu ;;
|
||||||
*Editor*) show_install_editor_menu ;;
|
*Editor*) show_install_editor_menu ;;
|
||||||
|
*Terminal*) show_install_terminal_menu ;;
|
||||||
*AI*) show_install_ai_menu ;;
|
*AI*) show_install_ai_menu ;;
|
||||||
*Gaming*) show_install_gaming_menu ;;
|
*Gaming*) show_install_gaming_menu ;;
|
||||||
*) show_main_menu ;;
|
*) show_main_menu ;;
|
||||||
@@ -264,6 +269,15 @@ show_install_editor_menu() {
|
|||||||
esac
|
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() {
|
show_install_ai_menu() {
|
||||||
ollama_pkg=$(
|
ollama_pkg=$(
|
||||||
(command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
|
(command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
|
||||||
|
|||||||
@@ -2,5 +2,6 @@
|
|||||||
|
|
||||||
case "$TERMINAL" in
|
case "$TERMINAL" in
|
||||||
"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
|
"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
|
||||||
"kitty") pkill -USR1 kitty ;;
|
"kitty") pkill -USRSIG1 kitty ;;
|
||||||
|
"ghostty") pkill -USRSIG2 ghostty ;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
21
config/ghostty/config
Normal file
21
config/ghostty/config
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# 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
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
# Define terminal tag to style them uniformly
|
# Define terminal tag to style them uniformly
|
||||||
windowrule = tag +terminal, class:(Alacritty|kitty|ghostty)
|
windowrule = tag +terminal, class:(Alacritty|kitty|com.mitchellh.ghostty)
|
||||||
|
|||||||
1
themes/catppuccin-latte/ghostty.conf
Normal file
1
themes/catppuccin-latte/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Catppuccin Latte
|
||||||
1
themes/catppuccin/ghostty.conf
Normal file
1
themes/catppuccin/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Catppuccin Mocha
|
||||||
1
themes/everforest/ghostty.conf
Normal file
1
themes/everforest/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Everforest Dark Hard
|
||||||
1
themes/gruvbox/ghostty.conf
Normal file
1
themes/gruvbox/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Gruvbox Dark
|
||||||
1
themes/kanagawa/ghostty.conf
Normal file
1
themes/kanagawa/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Kanagawa Wave
|
||||||
19
themes/matte-black/ghostty.conf
Normal file
19
themes/matte-black/ghostty.conf
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# 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
|
||||||
1
themes/nord/ghostty.conf
Normal file
1
themes/nord/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Nord
|
||||||
1
themes/osaka-jade/ghostty.conf
Normal file
1
themes/osaka-jade/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = TokyoNight
|
||||||
1
themes/ristretto/ghostty.conf
Normal file
1
themes/ristretto/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Monokai Pro Ristretto
|
||||||
1
themes/rose-pine/ghostty.conf
Normal file
1
themes/rose-pine/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = Rose Pine Dawn
|
||||||
1
themes/tokyo-night/ghostty.conf
Normal file
1
themes/tokyo-night/ghostty.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
theme = TokyoNight
|
||||||
Reference in New Issue
Block a user