Skip to content

Commit 8c442b1

Browse files
committed
term: Remove Ghostty
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.
1 parent 9160750 commit 8c442b1

File tree

7 files changed

+3
-104
lines changed

7 files changed

+3
-104
lines changed

Makefile

-13
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,6 @@ endif
6969
~/.wezterm.sh:
7070
curl -fsSo $@ https://raw.githubusercontent.com/wez/wezterm/main/assets/shell-integration/wezterm.sh
7171

72-
# -------- Ghostty --------
73-
74-
.PHONY: ghostty
75-
ghostty: ~/.config/ghostty ## Set up the Ghostty terminal emulator
76-
77-
~/.config/ghostty: | ~/.config
78-
ifeq ($(gnu_ln),0)
79-
ln -srTf -- ghostty $@
80-
else
81-
@rm -rvf -- $@
82-
ln -sf -- $(abspath ghostty) $@
83-
endif
84-
8572
# -------- Neovim ---------
8673

8774
.PHONY: nvim clean-nvim

ghostty/README.md

-5
This file was deleted.

ghostty/config

-4
This file was deleted.

ghostty/themes/Mellifluous Dark

-29
This file was deleted.

ghostty/themes/Mellifluous Light

-29
This file was deleted.

nvim/init.lua

+2-15
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ vim.opt.rtp:prepend(lazypath)
102102

103103
-- Setup {{{
104104

105-
local lazy_spec = {
105+
require "lazy".setup({
106106
-- Shared Plugin Libraries {{{
107107

108108
"nvim-lua/plenary.nvim",
@@ -589,20 +589,7 @@ local lazy_spec = {
589589
}
590590

591591
-- }}}
592-
}
593-
594-
if vim.env.GHOSTTY_RESOURCES_DIR then
595-
local gty_rtp = vim.env.GHOSTTY_RESOURCES_DIR .. "/../vim/vimfiles"
596-
if vim.fn.isdirectory(gty_rtp) then
597-
table.insert(lazy_spec, {
598-
"ghostty",
599-
dir = gty_rtp,
600-
lazy = false
601-
})
602-
end
603-
end
604-
605-
require "lazy".setup(lazy_spec, {
592+
}, {
606593
defaults = {
607594
lazy = true
608595
},

zsh/zshrc

+1-9
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ export VISUAL=nvim
1313

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

2017

2118
# -----------------
@@ -159,9 +156,6 @@ path=(${HOME}/.local/bin $path)
159156
export GOPATH=${HOME}/go
160157
path=(${GOPATH}/bin $path)
161158

162-
# Ghostty
163-
path=(${GHOSTTY_BIN_DIR} $path)
164-
165159
# Allow command line editing in an external editor in the "vicmd" keymap.
166160
# Zim's "input" module already enables this in the default keymap ("viins").
167161
bindkey -M vicmd "${key_info[Control]}x${key_info[Control]}e" edit-command-line
@@ -184,9 +178,7 @@ termtitle() {
184178
for zhook in ${zhooks}; do
185179
add-zsh-hook -d ${zhook} termtitle_update_${zhook}
186180
done
187-
local -a print_args=(-rn)
188-
(( $+_ghostty_fd )) && print_args+=(-u $_ghostty_fd)
189-
print $print_args $'\e]2;'${(q)@}$'\a'
181+
print -rn $'\e]2;'${(q)@}$'\a'
190182
}
191183

192184
# Source local environment

0 commit comments

Comments
 (0)