Skip to content

Commit

Permalink
term: Remove Ghostty
Browse files Browse the repository at this point in the history
Good replacement for the Apple Terminal, but too barebones to justify
the switch from anything else for me:

- no copy mode
  ghostty-org/ghostty#3488
- only a single tab is visible while sharing the Ghostty window
  ghostty-org/ghostty#692
- no Windows support
  ghostty-org/ghostty#2563
- no scrollback search
  ghostty-org/ghostty#189

This reverts commit 71f7167.
  • Loading branch information
antoineco committed Jan 23, 2025
1 parent 9160750 commit 8c442b1
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 104 deletions.
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,6 @@ endif
~/.wezterm.sh:
curl -fsSo $@ https://raw.githubusercontent.com/wez/wezterm/main/assets/shell-integration/wezterm.sh

# -------- Ghostty --------

.PHONY: ghostty
ghostty: ~/.config/ghostty ## Set up the Ghostty terminal emulator

~/.config/ghostty: | ~/.config
ifeq ($(gnu_ln),0)
ln -srTf -- ghostty $@
else
@rm -rvf -- $@
ln -sf -- $(abspath ghostty) $@
endif

# -------- Neovim ---------

.PHONY: nvim clean-nvim
Expand Down
5 changes: 0 additions & 5 deletions ghostty/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions ghostty/config

This file was deleted.

29 changes: 0 additions & 29 deletions ghostty/themes/Mellifluous Dark

This file was deleted.

29 changes: 0 additions & 29 deletions ghostty/themes/Mellifluous Light

This file was deleted.

17 changes: 2 additions & 15 deletions nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ vim.opt.rtp:prepend(lazypath)

-- Setup {{{

local lazy_spec = {
require "lazy".setup({
-- Shared Plugin Libraries {{{

"nvim-lua/plenary.nvim",
Expand Down Expand Up @@ -589,20 +589,7 @@ local lazy_spec = {
}

-- }}}
}

if vim.env.GHOSTTY_RESOURCES_DIR then
local gty_rtp = vim.env.GHOSTTY_RESOURCES_DIR .. "/../vim/vimfiles"
if vim.fn.isdirectory(gty_rtp) then
table.insert(lazy_spec, {
"ghostty",
dir = gty_rtp,
lazy = false
})
end
end

require "lazy".setup(lazy_spec, {
}, {
defaults = {
lazy = true
},
Expand Down
10 changes: 1 addition & 9 deletions zsh/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ export VISUAL=nvim

# Fpath mangling for user functions
fpath=(${HOME}/.local/share/zsh/site-functions $fpath)
if (( ${+GHOSTTY_RESOURCES_DIR} )) && [[ -d ${GHOSTTY_RESOURCES_DIR} ]]; then
fpath=(${GHOSTTY_RESOURCES_DIR}/../zsh/site-functions $fpath)
fi


# -----------------
Expand Down Expand Up @@ -159,9 +156,6 @@ path=(${HOME}/.local/bin $path)
export GOPATH=${HOME}/go
path=(${GOPATH}/bin $path)

# Ghostty
path=(${GHOSTTY_BIN_DIR} $path)

# Allow command line editing in an external editor in the "vicmd" keymap.
# Zim's "input" module already enables this in the default keymap ("viins").
bindkey -M vicmd "${key_info[Control]}x${key_info[Control]}e" edit-command-line
Expand All @@ -184,9 +178,7 @@ termtitle() {
for zhook in ${zhooks}; do
add-zsh-hook -d ${zhook} termtitle_update_${zhook}
done
local -a print_args=(-rn)
(( $+_ghostty_fd )) && print_args+=(-u $_ghostty_fd)
print $print_args $'\e]2;'${(q)@}$'\a'
print -rn $'\e]2;'${(q)@}$'\a'
}

# Source local environment
Expand Down

0 comments on commit 8c442b1

Please sign in to comment.