From 9bb56be12a3133457d6879167a8391eb16721af7 Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Thu, 11 Jan 2024 11:11:38 -0500 Subject: [PATCH] [emacs] Bankruptcy --- emacs/.config/doom/config.el | 46 ++++++++-------------------------- emacs/.config/doom/init.el | 35 ++++++++++++++++---------- emacs/.config/doom/packages.el | 5 +--- 3 files changed, 34 insertions(+), 52 deletions(-) diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el index 2c953c0..66d6aaa 100644 --- a/emacs/.config/doom/config.el +++ b/emacs/.config/doom/config.el @@ -3,8 +3,6 @@ (setq user-full-name "Colin Powell" user-mail-address "colin@unbl.ink") -(add-to-list 'load-path "~/.config/doom/") - (pixel-scroll-precision-mode t) (nyan-mode) ;; progress in the form of a rainbow cat. @@ -13,9 +11,20 @@ doom-big-font (font-spec :family "Iosevka" :size 18 :weight 'regular) doom-variable-pitch-font (font-spec :family "Overpass" :size 12)) +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type t) + (add-hook 'after-init-hook #'global-emojify-mode) ;; emojis?! (add-hook 'prog-mode-hook #'goto-address-mode) ;; linify links! +(setq shell-file-name (executable-find "bash")) +(setq-default vterm-shell (executable-find "fish")) +(setq-default explicit-shell-file-name (executable-find "fish")) + +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/var/org/") + (map! ;; Easier window movement :n "C-h" 'evil-window-left :n "C-j" 'evil-window-down @@ -43,14 +52,6 @@ (file-notify-rm-watch key)) file-notify-descriptors)) -(setq +format-on-save-enabled-modes - '(not - emacs-lisp-mode ; elisp's mechanisms are good enough - sql-mode ; sqlformat is currently broken - tex-mode ; latexindent is broken - org-mode - html-mode - latex-mode)) (setq frame-title-format '("" @@ -65,7 +66,6 @@ (unless (string= "-" project-name) (format (if (buffer-modified-p) " ◉ %s" "  ●  %s") project-name)))))) - (load! "+agenda-fix") (defun vulpea-agenda-files-update (&rest _) (setq org-agenda-files vulpea-project-files)) @@ -82,30 +82,6 @@ (setq mm-text-html-renderer 'w3m) (setq w3m-fill-column 88) -(setq message-kill-buffer-on-exit t) -(setq message-auto-save-directory "~/Mail/colin@unbl.ink/Drafts/") -(setq message-directory "~/Mail/colin@unbl.ink/") - -;; sendmail-program "/usr/local/bin/msmtpq" <--- this doesn't work as advertised right now -(setq send-mail-function 'sendmail-send-it - sendmail-program "/usr/local/bin/msmtp" - mail-specify-envelope-from t - message-sendmail-f-is-evil t - message-sendmail-envelope-from 'header - message-sendmail-extra-arguments '("--read-envelope-from") - mail-envelope-from 'header) - -(after! notmuch - (set-popup-rule! "^\\*notmuch*" :ignore t) - ) - -(map! :leader - (:prefix "e" - :desc "(s)end queued mail" "s" #'smtpmail-send-queued-mail - :desc "Open (i)nbox" "i" #'=notmuch - :desc "Open (n)otmuch" "n" #'notmuch - :desc "(C)ompose mail" "c" #'notmuch-mua-new-mail)) - (after! eshell (set-eshell-alias! "djsh" "~/src/github.com/sureapp/surepreme/make shell" diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el index f77ad8c..0bfaeec 100644 --- a/emacs/.config/doom/init.el +++ b/emacs/.config/doom/init.el @@ -1,3 +1,5 @@ +;;; ../../.dotfiles/emacs/.config/doom/init.el -*- lexical-binding: t; -*- + ;;; init.el -*- lexical-binding: t; -*- ;; This file controls what Doom modules are enabled and what order they load @@ -15,12 +17,20 @@ ;; directory (for easy access to its source code). (doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row :completion company ; the ultimate code completion backend - (vertico +icons) ; the search engine of the future + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + (vertico +icons) ; the search engine of the future :ui + ;;deft ; notational velocity for Emacs doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs ;;doom-quit ; DOOM quit-message prompts when you quit Emacs @@ -31,8 +41,8 @@ ligatures ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API - nav-flash ; blink cursor line after big motions - neotree ; a project drawer, like NERDTree for vim + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows ;;tabs ; a tab bar for Emacs @@ -61,7 +71,7 @@ :emacs dired ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management + ;;ibuffer ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree @@ -84,9 +94,9 @@ direnv docker editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs + ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) - gist ; interacting with github gists + ;;gist ; interacting with github gists lookup ; navigate your code and its documentation lsp ; M-x vscode magit ; a git porcelain for Emacs @@ -103,11 +113,11 @@ :os (:if IS-MAC macos) ; improve compatibility with macOS - ;;tty ; improve the terminal Emacs experience + tty ; improve the terminal Emacs experience :lang ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP + beancount ; mind the GAAP ;;(cc +lsp) ; C > C++ == 1 ;;clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all @@ -135,7 +145,7 @@ ;;idris ; a language you can depend on json ; At least it ain't XML ;;(java +lsp) ; the poster child for carpal tunnel syndrome - (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) + (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) ;;latex ; writing papers in Emacs has never been so fun @@ -160,7 +170,7 @@ ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp +pyright) ; beautiful is better than ugly + (python +lsp) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 @@ -175,8 +185,8 @@ ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - ;;web ; the tubes - ;;yaml ; JSON, but readable + (web +lsp) ; the tubes + yaml ; JSON, but readable ;;zig ; C, but simpler :email @@ -195,4 +205,3 @@ :config ;;literate (default +bindings +smartparens)) - diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el index 5e049b7..44c7ecc 100644 --- a/emacs/.config/doom/packages.el +++ b/emacs/.config/doom/packages.el @@ -26,7 +26,6 @@ ;(package! mpdel) (package! elfeed-protocol) (package! deadgrep) -(package! mastodon) (package! wordgen) (package! openwith) (package! pdf-tools) @@ -37,7 +36,5 @@ (package! keycast) ;; pretty things up -(package! srcery-theme) -(package! moe-theme) -(package! kaolin-themes) +(package! ef-themes) (package! nyan-mode)