From 265512dd171266fcb4576c9c899a379109278562 Mon Sep 17 00:00:00 2001 From: MitchMarq42 Date: Mon, 11 Jul 2022 17:59:39 -0800 Subject: [PATCH] clean up modeline and packages; add conditional SLIME --- init.el | 2 +- lisp/mitch-packages.el | 39 ++++++++++----------------------------- lisp/mitch-theme.el | 2 +- 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/init.el b/init.el index 66e9c7a..8902098 100644 --- a/init.el +++ b/init.el @@ -65,7 +65,7 @@ ;; straight.el: the better package manager? ;; minified bootstrap (split lines if you want) (or not) - (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer (url-retrieve-synchronously "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" 'silent 'inhibit-cookies) (goto-char (point-max)) (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) (straight-use-package 'use-package) (setq straight-use-package-by-default t) + (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer (url-retrieve-synchronously "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" 'silent 'inhibit-cookies) (goto-char (point-max)) (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) (straight-use-package 'use-package) (setq straight-use-package-by-default t) (require 'mitch-packages) diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el index 7e652db..29155f2 100644 --- a/lisp/mitch-packages.el +++ b/lisp/mitch-packages.el @@ -174,15 +174,7 @@ :prefix "SPC 4" "v" 'multi-vterm-other-window)) -;; Better modeline? -(use-package powerline - :init - :custom - (powerline-default-separator 'utf-8) - (powerline-utf-8-separator-left 57532) - (powerline-utf-8-separator-right 57534) - (powerline-display-hud nil) - (powerline-gui-use-vcs-glyph t)) +;; Better modeline? Better modeline. (use-package airline-themes :custom (airline-cursor-colors nil) @@ -190,23 +182,13 @@ (airline-eshell-colors t) (airline-shortened-directory-length 20) (airline-utf-glyph-separator-left 9585) - ;; (airline-utf-glyph-separator-left "") (airline-utf-glyph-separator-right 9586) + ;; (airline-utf-glyph-separator-left "") ;; (airline-utf-glyph-separator-right "") - :after powerline - ;; :after doom-modeline + :custom-face (mode-line ((t (:box (:line-width 2 :style released-button))))) :config - (load-theme 'airline-ravenpower t) ;; (load-theme 'airline-kolor t) - ) -(use-package all-the-icons - :init - (unless (member "all-the-icons" (font-family-list)) - (all-the-icons-install-fonts t))) -;; (use-package doom-modeline -;; :custom-face (mode-line ((t (:box "#303030")))) -;; :custom (doom-modeline-height 15) -;; :config (doom-modeline-mode)) + (load-theme 'airline-ravenpower t)) ;; Custom Theme. ;; Not to be confused with a color theme, or a color scheme, or a custom scheme. @@ -218,11 +200,7 @@ :config (tooltip-mode -1) (menu-bar-mode -1) - (load-theme 'mitch t) - ) -;; (use-package doom-themes -;; :init (load-theme 'doom-one t)) -;; (load-theme 'modus-vivendi t) + (load-theme 'mitch t)) ;; (use-package yascroll ;; :diminish @@ -303,8 +281,6 @@ (ob-powershell-powershell-command "pwsh")) (use-package company-org-block :after (org company)) -(use-package org-modern - :hook (org-mode . org-modern-mode)) (use-package ox-hugo :after ox) @@ -654,5 +630,10 @@ :straight (:type git :repo "https://git.mitchmarq42.xyz/mitch/ani-el" :files ("ani-el.el" "lib"))) +(use-package slime + :if (file-exists-p (expand-file-name "~/quicklisp/slime-helper.el")) + :custom (inferior-lisp-program "sbcl") + :init (load (expand-file-name "~/quicklisp/slime-helper.el"))) + (provide 'mitch-packages) ;;; mitch-packages.el ends here diff --git a/lisp/mitch-theme.el b/lisp/mitch-theme.el index 659c630..4d47a6a 100644 --- a/lisp/mitch-theme.el +++ b/lisp/mitch-theme.el @@ -125,7 +125,7 @@ (transient-heading (:inherit 'default :foreground mitch-magenta :weight 'bold)) (rainbow-delimiters-depth-1-face (:foreground mitch-light-magenta)) (rainbow-delimiters-depth-2-face (:foreground mitch-magenta :weight 'normal)) - (vertical-border (:foreground mitch-light-magenta :weight 'bold)) + (vertical-border (:foreground mitch-mid-violet :weight 'bold)) (fringe (:inherit 'default)) (whitespace-space (:foreground mitch-black)) (whitespace-tab (:foreground mitch-black))