zias/omarchy
1
0
Fork 0
mirror of https://github.com/basecamp/omarchy.git synced 2026-02-17 15:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to use $TERMINAL instead of alacitty (#1648)

Browse Source 
* update to use $TERMINAL instead of alacitty

* revert

* move env to hyprconfig

* Only set if we have alacritty

* Add launcher for wifi settings so it can be used in mako config

* Set system terminal in config/uwsm/env to ensure its available everywhere

* Ensure that $TERMINAL is available after update

* Didn't work to have the TERMINAL env in Hyprland

* Configure terminal settings against a full set of options

* Make About usable with any terminal

* One more alacritty-specific setting

* Use the new wifi launcher bin

* Only require the update/relaunch if TERMINAL isn't already set in config/uwsm/env

* More alacritty usage converted to $TERMINAL

* Use new launcher

* Change scrolltouchpad input rule to apply to all terminals

* Its a singular match

* Take current font from waybar, in case we don't have alacritty

* Only set font for alacritty if its being used

* Get ready to be terminal agnostic on the refresh of config too

* Use new launcher

* Note the last reliance we have on alacritty

* Make theme setting for terminals generic and include kitty

* Set font_family for kitty as well

* Quiet grep

---------

Co-authored-by: David Heinemeier Hansson <david@hey.com>
This commit is contained in:
Ofir Miller
2025-09-16 15:32:40 +03:00
committed by GitHub
parent c8fa96f382
commit 7e1c88b932
25 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/hypr/bindings.conf
View File

@@ -1,5 +1,5 @@
# Application bindings
$terminal = uwsm app -- alacritty
$terminal = uwsm app -- $TERMINAL
$browser = omarchy-launch-browser
bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"

1
config/hypr/envs.conf
View File

@@ -1,3 +1,2 @@
# Extra env variables
# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
# env = MY_GLOBAL_ENV,setting

2
config/hypr/input.conf
View File

@@ -28,7 +28,7 @@ input {
}
# Scroll faster in the terminal
windowrule = scrolltouchpad 1.5, class:Alacritty
windowrule = scrolltouchpad 1.5, tag:terminal
# Enable touchpad gestures for changing workspaces
# See https://wiki.hyprland.org/Configuring/Gestures/

10
config/uwsm/env
View File

@@ -1,7 +1,11 @@
# Changes require a relaunch of Hyprland to take effect.
# Ensure Omarchy bins are in the path
export OMARCHY_PATH=$HOME/.local/share/omarchy
export PATH=$OMARCHY_PATH/bin/:$PATH
# Set terminal used by all default commands
export TERMINAL=alacritty
if command -v mise &> /dev/null; then
eval "$(mise activate bash)"
fi
# Activate mise if present on the system
omarchy-cmd-present mise && eval "$(mise activate bash)"

6
config/waybar/config.jsonc
View File

@@ -55,7 +55,7 @@
"cpu": {
"interval": 5,
"format": "󰍛",
"on-click": "alacritty -e btop"
"on-click": "$TERMINAL -e btop"
},
"clock": {
"format": "{:L%A %H:%M}",
@@ -74,7 +74,7 @@
"tooltip-format-disconnected": "Disconnected",
"interval": 3,
"spacing": 1,
"on-click": "alacritty --class=Impala -e impala"
"on-click": "omarchy-launch-wifi"
},
"battery": {
"format": "{capacity}% {icon}",
@@ -104,7 +104,7 @@
},
"pulseaudio": {
"format": "{icon}",
"on-click": "alacritty --class=Wiremix -e wiremix",
"on-click": "$TERMINAL --class=Wiremix -e wiremix",
"on-click-right": "pamixer -t",
"tooltip-format": "Playing at {volume}%",
"scroll-step": 5,