diff --git a/README.md b/README.md index e4a571d..0dfe2c5 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ List of programs and tools I use. | Component | Program | |-------------------|------------| |🪟 Windows Manager | [hyprland](https://github.com/hyprwm/Hyprland) | -|🖥️ Terminal | [foot](https://codeberg.org/dnkl/foot) / [ghostty](https://ghostty.org/) (system updater) | +|🖥️ Terminal | [ghostty](https://ghostty.org/) / [foot](https://codeberg.org/dnkl/foot) (fallback) | |🐚 Shell | [zsh](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH) + oh-my-zsh / [oh-my-posh](https://ohmyposh.dev/) prompt (`.config/ohmyposh/zen.toml`) | |📁 File Manager | [thunar](https://wiki.archlinux.org/title/Thunar) | |📝 Editor | [vs code](https://github.com/microsoft/vscode) / [neovim (changing to soon)](https://github.com/neovim/neovim) | diff --git a/dotfiles/.config/ghostty/config b/dotfiles/.config/ghostty/config index 2afbc0e..447c51e 100644 --- a/dotfiles/.config/ghostty/config +++ b/dotfiles/.config/ghostty/config @@ -1,6 +1,6 @@ # Ported from foot/foot.ini — same look and bindings, so the two can be -# tried side by side. foot is still $term in Hyprland; launch this with -# `ghostty`. Check edits with `ghostty +validate-config`. +# tried side by side. Ghostty is now the default terminal ($term in +# hypr/input/keybinds.lua). Check edits with `ghostty +validate-config`. # --- Font / window --- font-family = JetBrainsMono Nerd Font @@ -17,9 +17,10 @@ window-padding-balance = true window-width = 135 window-height = 31 -# No title bar / tabs strip from GTK — Hyprland draws the borders. +# No title bar or tab strip — Hyprland draws the borders. (window-show-tab-bar +# replaces the deprecated gtk-tabs-location = hidden.) window-decoration = none -gtk-tabs-location = hidden +window-show-tab-bar = never # --- Terminal type --- # foot forced TERM=xterm-256color everywhere so SSH'd hosts wouldn't lack diff --git a/dotfiles/.config/hypr/core/env.lua b/dotfiles/.config/hypr/core/env.lua index e33efd3..6e5d7ac 100644 --- a/dotfiles/.config/hypr/core/env.lua +++ b/dotfiles/.config/hypr/core/env.lua @@ -40,6 +40,9 @@ hl.env("HYPRCURSOR_SIZE", "24") hl.env("XCURSOR_THEME", "Bibata-Modern-Classic") hl.env("XCURSOR_SIZE", "24") +-- Default terminal for anything that asks $TERMINAL (rofi-sensible-terminal, scripts) +hl.env("TERMINAL", "ghostty") + -- firefox hl.env("MOZ_ENABLE_WAYLAND", "1") diff --git a/dotfiles/.config/hypr/input/keybinds.lua b/dotfiles/.config/hypr/input/keybinds.lua index bb5f0dc..f62f22d 100644 --- a/dotfiles/.config/hypr/input/keybinds.lua +++ b/dotfiles/.config/hypr/input/keybinds.lua @@ -10,7 +10,7 @@ local userScripts = os.getenv("HOME") .. "/.config/hypr/UserScripts" local edit = os.getenv("EDITOR") or "nvim" -- These two are for UserKeybinds.conf & Waybar Modules -local term = "foot" -- Terminal +local term = "ghostty" -- Terminal (foot is still installed as a fallback) local files = "thunar" -- File Manager -- Default Search Engine for ROFI Search (SUPER S) diff --git a/dotfiles/.config/xfce4/helpers.rc b/dotfiles/.config/xfce4/helpers.rc new file mode 100644 index 0000000..94ac819 --- /dev/null +++ b/dotfiles/.config/xfce4/helpers.rc @@ -0,0 +1 @@ +TerminalEmulator=ghostty diff --git a/dotfiles/.local/share/xfce4/helpers/ghostty.desktop b/dotfiles/.local/share/xfce4/helpers/ghostty.desktop new file mode 100644 index 0000000..85af377 --- /dev/null +++ b/dotfiles/.local/share/xfce4/helpers/ghostty.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +# exo helper so Thunar's "Open Terminal Here" (exo-open --launch TerminalEmulator) +# opens Ghostty; selected by ~/.config/xfce4/helpers.rc +NoDisplay=true +Version=1.0 +Type=X-XFCE-Helper +X-XFCE-Category=TerminalEmulator +Name=Ghostty +Icon=com.mitchellh.ghostty +X-XFCE-Binaries=ghostty; +X-XFCE-Commands=%B; +X-XFCE-CommandsWithParameter=%B -e "%s";