diff --git a/Makefile b/Makefile index c0dbc3a..b7b5b77 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/ghostty/README.md b/ghostty/README.md deleted file mode 100644 index 88d04f2..0000000 --- a/ghostty/README.md +++ /dev/null @@ -1,5 +0,0 @@ -### Ghostty terminal emulator - -The configuration files belongs in `~/.config/ghostty` as described in the [documentation][documentation]. - -[documentation]: https://ghostty.org/docs/config diff --git a/ghostty/config b/ghostty/config deleted file mode 100644 index be29bb7..0000000 --- a/ghostty/config +++ /dev/null @@ -1,4 +0,0 @@ -font-family = MonoLisa -font-size = 14.0 -theme = dark:Mellifluous Dark,light:Mellifluous Light -shell-integration-features = sudo,no-title diff --git a/ghostty/themes/Mellifluous Dark b/ghostty/themes/Mellifluous Dark deleted file mode 100644 index 8b8c123..0000000 --- a/ghostty/themes/Mellifluous Dark +++ /dev/null @@ -1,29 +0,0 @@ -# bg4, red, green, orange, blue, purple, yellow, fg:lightened(8) -palette = 0=#323232 -palette = 1=#d59192 -palette = 2=#b3b393 -palette = 3=#cbaa88 -palette = 4=#a8a1be -palette = 5=#b99bb5 -palette = 6=#bfaf8e -palette = 7=#f1f1f1 -# bg5, {red, green, orange, blue, purple, yellow}:lightened(10), fg:lightened(12) -palette = 8=#373737 -palette = 9=#f2acad -palette = 10=#cecfae -palette = 11=#e7c5a3 -palette = 12=#c3bcda -palette = 13=#d5b6d1 -palette = 14=#dbcaa9 -palette = 15=#fcfcfc - -# bg, fg -background = 1f1f1f -foreground = dadada - -# fg -cursor-color = dadada - -selection-invert-fg-bg = true - -# vim: ft=ghostty diff --git a/ghostty/themes/Mellifluous Light b/ghostty/themes/Mellifluous Light deleted file mode 100644 index 2d60cee..0000000 --- a/ghostty/themes/Mellifluous Light +++ /dev/null @@ -1,29 +0,0 @@ -# dark_bg, red, green, orange, blue, purple, yellow, fg3 -palette = 0=#e5e5e5 -palette = 1=#b73242 -palette = 2=#63611e -palette = 3=#a16927 -palette = 4=#5a418a -palette = 5=#863e7f -palette = 6=#9c792a -palette = 7=#686868 -# dark_bg2, {red, green, orange, blue, purple, yellow}:darkened(10), fg2 -palette = 8=#d5d5d5 -palette = 9=#990b2a -palette = 10=#4b4800 -palette = 11=#865000 -palette = 12=#42286f -palette = 13=#6b2465 -palette = 14=#815f00 -palette = 15=#414141 - -# bg, fg -background = ececec -foreground = 1b1b1b - -# fg -cursor-color = 1b1b1b - -selection-invert-fg-bg = true - -# vim: ft=ghostty diff --git a/nvim/init.lua b/nvim/init.lua index e0b1367..ad94a08 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -102,7 +102,7 @@ vim.opt.rtp:prepend(lazypath) -- Setup {{{ -local lazy_spec = { +require "lazy".setup({ -- Shared Plugin Libraries {{{ "nvim-lua/plenary.nvim", @@ -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 }, diff --git a/zsh/zshrc b/zsh/zshrc index 62a967a..87e3a1b 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -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 # ----------------- @@ -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 @@ -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