From ff9c4589e423c8776d56001deca7fa887fc4492d Mon Sep 17 00:00:00 2001 From: Jakob L. Kreuze Date: Sun, 28 Nov 2021 09:17:14 -0500 Subject: Add vterm to configuration --- init.el | 1 + lisp/appearance.el | 4 ++++ lisp/appearance/theme.el | 14 ++++++++++++-- lisp/terminal.el | 12 ++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 lisp/terminal.el diff --git a/init.el b/init.el index 62fe679..1ced8ff 100644 --- a/init.el +++ b/init.el @@ -177,6 +177,7 @@ (load-module "appearance/modeline") (load-module "quality-of-life") (load-module "shell") +(load-module "terminal") (load-module "system") (load-module "documents") (load-module "irc") diff --git a/lisp/appearance.el b/lisp/appearance.el index 004e4d7..b1ca16e 100644 --- a/lisp/appearance.el +++ b/lisp/appearance.el @@ -95,3 +95,7 @@ as `org-src-fontify-natively' is non-nil." :demand t :config (global-page-break-lines-mode)) + +;; Choose a fallback with size comparible to Terminus so that we don't break +;; vterm. +(set-fontset-font "fontset-default" 'unicode (font-spec :size 10 :name "DejaVu Sans")) diff --git a/lisp/appearance/theme.el b/lisp/appearance/theme.el index 3282dd6..7bf5cc3 100644 --- a/lisp/appearance/theme.el +++ b/lisp/appearance/theme.el @@ -108,7 +108,7 @@ (with-palette (custom-theme-set-faces 'chayote - `(default ((class (:foreground white-1 :background black-5 :family "Terminus" :height 90)))) + `(default ((class (:foreground white-1 :background black-5 :family "Terminus" :height 80)))) `(italic ((class (:italic t)))) `(cursor ((class (:background white-0)))) `(variable-pitch ((class (:inherit default)))) @@ -246,7 +246,17 @@ `(erc-button ((class (:inherit link)))) ;; smartparens - `(sp-pair-overlay-face ((class (:inherit default))))) + `(sp-pair-overlay-face ((class (:inherit default)))) + + ;; vterm + `(vterm-color-black ((class (:foreground "#333333" :background "#5D5D5D")))) + `(vterm-color-red ((class (:foreground "#F2777A" :background "#CF8BA2")))) + `(vterm-color-green ((class (:foreground "#99CC99" :background "#90D6A6")))) + `(vterm-color-yellow ((class (:foreground "#FFCC66" :background "#E0BF80")))) + `(vterm-color-blue ((class (:foreground "#6699CC" :background "#5F7AB1")))) + `(vterm-color-magenta ((class (:foreground "#CC99CC" :background "#807793")))) + `(vterm-color-cyan ((class (:foreground "#66CCCC" :background "#1FB6D3")))) + `(vterm-color-white ((class (:foreground "#DDDDDD" :background "#F6F6F6"))))) (custom-theme-set-variables 'chayote diff --git a/lisp/terminal.el b/lisp/terminal.el new file mode 100644 index 0000000..6cda423 --- /dev/null +++ b/lisp/terminal.el @@ -0,0 +1,12 @@ +;;; shell.el -*- lexical-binding: t; -*- +;;; +;;; Author: Jakob L. Kreuze +;;; URL: https://git.sr.ht/~jakob/.emacs.d/ +;;; +;;; `shell' is sometimes clunky, and I can't get `alacritty' to work on my +;;; Pinebook Pro anymore, so I've been experimenting with `vterm'. Thus far, it +;;; is a nice medium between the two, so I am considering dropping `shell' +;;; altogether, albeit with a very slow transition-out. +;;; + +(use-package vterm) -- cgit v1.3