From fb6dabfb8de27e9ef069b3de8c293b494bcc79ee Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sun, 5 Apr 2020 16:10:32 +0100 Subject: [PATCH] Drop support for wpc-terminal As I mentioned in the previous commit, I now use vterm.el as my primary terminal. I wrote most of this Elisp when I first started using Emacs. I know longer need it. --- emacs/.emacs.d/init.el | 1 - emacs/.emacs.d/wpc/wpc-keybindings.el | 1 - emacs/.emacs.d/wpc/wpc-terminal.el | 70 --------------------------- 3 files changed, 72 deletions(-) delete mode 100644 emacs/.emacs.d/wpc/wpc-terminal.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 1771b4097..4841cfdb7 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -40,7 +40,6 @@ (require 'window-manager) (require 'wpc-ui) (require 'wpc-dired) -(require 'wpc-terminal) (require 'wpc-org) (require 'wpc-company) ;; TODO: Re-enable flycheck for all languages besides Elisp once I learn more diff --git a/emacs/.emacs.d/wpc/wpc-keybindings.el b/emacs/.emacs.d/wpc/wpc-keybindings.el index c5306f08d..7d6e57db2 100644 --- a/emacs/.emacs.d/wpc/wpc-keybindings.el +++ b/emacs/.emacs.d/wpc/wpc-keybindings.el @@ -106,7 +106,6 @@ "hp" #'helpful-at-point "s" #'flyspell-mode "S" #'sort-lines - "a" #'wpc-terminal/toggle "=" #'align "p" #'flycheck-previous-error "f" #'wpc/find-file diff --git a/emacs/.emacs.d/wpc/wpc-terminal.el b/emacs/.emacs.d/wpc/wpc-terminal.el deleted file mode 100644 index c232bb85a..000000000 --- a/emacs/.emacs.d/wpc/wpc-terminal.el +++ /dev/null @@ -1,70 +0,0 @@ -;;; terminal.el --- My cobbled together terminal -*- lexical-binding: t -*- -;; Author: William Carroll - -;;; Commentary: -;; My attempts at creating a sane Emacs terminal. Most of this work was created -;; before I discovered and fully adopted EXWM. Prior to this, the appeal of -;; having terminals inside of Emacs was appealing. So appealing in fact that I -;; was willing to work with inferior alternatives to non-Emacs terminals -;; (e.g. `ansi-term') instead of GUI alternatives like `alacritty` because the -;; productivity gains of having a terminal inside of Emacs might outweigh the -;; shortcomings of that particular terminal. -;; -;; All of this changed, however, after discovering EXWM, since I can embed X11 -;; GUI windows inside of Emacs. Therefore, most of this module is maintained -;; for historical purposes. -;; -;; Benefits of `ansi-term': -;; - Color scheme remains consistent between Emacs and terminal. -;; - Same applies to my fonts. -;; -;; Downsides of `ansi-term': -;; - Paging feels sluggish with programs like `cat` and `less`. -;; - KBDs don't provide 100% coverage of what I expect from a terminal since -;; they were created to cooperate with Emacs. - -;;; Code: - -(require 'window) -(require 'buffer) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Library -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; TODO: Model all open terminals within a dictionary. - -(defconst wpc-terminal/name - "wpc/terminal" - "The name of my terminal buffers.") - -(defun wpc-terminal/find-window () - "Return a reference to an existing terminal window or nil." - (->> wpc-terminal/name - wpc/add-earmuffs - window/find)) - -(defun wpc-terminal/find-buffer () - "Return a reference to an existing terminal buffer." - (->> wpc-terminal/name - wpc/add-earmuffs - buffer/find)) - -(defun wpc-terminal/find-or-create () - "Find or create a terminal window." - (let ((buffer (wpc-terminal/find-buffer))) - (if buffer - (buffer/show buffer) - (ansi-term "/usr/bin/zsh" wpc-terminal/name)))) - -;; TODO: Focus terminal after toggling it. -(defun wpc-terminal/toggle () - "Toggle a custom terminal session in Emacs." - (interactive) - (let ((window (wpc-terminal/find-window))) - (if window - (window/delete window) - (wpc-terminal/find-or-create)))) - -(provide 'wpc-terminal) -;;; wpc-terminal.el ends here