update configs. use straight for everything

This keybind will probably change in the future.

elisp/eshell-setup.el

@@ -1,9 +1,23 @@
 ;; colors in eshell
+
 (add-hook 'eshell-mode-hook
           (lambda ()
             (setenv "TERM" "xterm-256color")))
 (add-hook 'eshell-before-prompt-hook (lambda ()
 				       (setq xterm-color-preserve-properties t)))
+
+(require 'esh-mode)
 (add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
 (setq eshell-output-filter-functions
       (remove 'eshell-handle-ansi-color eshell-output-filter-functions))
+
+;; Don't cycle through history with <up> and <down>
+;; Those keys were previously bound to:
+;; eshell-previous-matching-input-from-input and
+;; eshell-next-matching-input-from-input, respectively
+(defun my-eshell-setup ()
+  (progn
+    (define-key eshell-hist-mode-map (kbd "<up>") nil)
+    (define-key eshell-hist-mode-map (kbd "<down>") nil)))
+
+(add-hook 'eshell-mode-hook #'my-eshell-setup)

elisp/extras.el

@@ -5,45 +5,74 @@
 ;; Always use slant for italic, not underline
 '(italic ((t (:slant italic))))
 
-;;;; Load my packages
+;; Save point
-;;Default theme
+(save-place-mode 1)
-(use-package zenburn-theme
-  :config
-  (load-theme 'zenburn t))
 
-;;Org
+;; Set column width to 88 characters
+(setq-default fill-column 88)
+
+;;;; Load my packages
+;; Default theme
+;; (use-package zenburn-theme
+;;   :demand t
+;;   :config
+;;   (load-theme 'zenburn t))
+
+(load-theme 'modus-operandi-tinted t)
+
+;; Eshell
+;; (use-package eshell
+;;   :after eshell-mode
+;;   :init
+;;   (load "~/.emacs.d/elisp/eshell-setup.el"))
+
+;; Org
 (use-package org
   :config
   (load "~/.emacs.d/elisp/org-setup.el"))
 (use-package org-ref)
-(use-package org-roam
+;; (use-package org-roam
-  :disabled
+;;   :disabled
-  :config
+;;   :config
-  (load "~/.emacs.d/elisp/org-roam-setup.el"))
+;;   (load "~/.emacs.d/elisp/org-roam-setup.el"))
+
+;; Writing
+(use-package writeroom-mode)
 
 ;; modeline
 ;; configure the default one
 (load "~/.emacs.d/elisp/modeline-setup.el")
 ;; then use doom-modeline
+;; (use-package doom-modeline
+;;   :config
+;;   (progn
+;;     (setq doom-modeline-buffer-encoding nil)
+;;     (setq doom-modeline-height 15)
+;;     (when (member "Fantasque Sans Mono" (font-family-list))
+;;       (set-face-attribute 'mode-line nil :font "Fantasque Sans Mono-14")
+;;       (set-face-attribute 'mode-line-inactive nil :font "Fantasque Sans Mono-13")))
+;;   :hook
+;;   (after-init . doom-modeline-mode))
+
+;; (use-package doom-modeline
+;;    :ensure t
+;;    :init (doom-modeline-mode 1))
+
 (use-package all-the-icons)
-(use-package doom-modeline
-  :config
-  (progn
-    (setq doom-modeline-buffer-encoding nil)
-    (setq doom-modeline-height 15)
-    (when (member "Fantasque Sans Mono" (font-family-list))
-      (set-face-attribute 'mode-line nil :font "Fantasque Sans Mono-14")
-      (set-face-attribute 'mode-line-inactive nil :font "Fantasque Sans Mono-13")))
-  :hook
-  (after-init . doom-modeline-mode))
 
 (use-package dashboard
+  :demand t
   :config
   (dashboard-setup-startup-hook))
 
 ;; Reading
 (use-package nov
   :config
+  (setq nov-text-width t)
+  (setq visual-fill-column-center-text t)
+  (add-hook 'nov-mode-hook 'visual-line-mode)
+  (add-hook 'nov-mode-hook 'visual-fill-column-mode)
+  (add-hook 'nov-mode-hook 'writeroom-mode)
   (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)))
 
 (use-package pdf-tools
@@ -52,24 +81,24 @@
    (pdf-tools-install)
    (setq pdf-view-midnight-colors '("#DCDCCC" . "#3F3F3F"))))
 
-(use-package saveplace-pdf-view
+(use-package saveplace-pdf-view)
-  :straight t
-  :config
-  (save-place-mode 1))
 
-;; Mail reader
+;; ;; Mail reader
-(use-package mu4e
+;; (use-package mu4e
-  :disabled
+;;   :disabled
-  :config
+;;   :config
-  (load "~/.emacs.d/elisp/mu4e-setup.el"))
+;;   (load "~/.emacs.d/elisp/mu4e-setup.el"))
-;; mail notification in modeline
+;; ;; mail notification in modeline
-(use-package mu4e-alert
+;; (use-package mu4e-alert
-  :disabled
+;;   :disabled
-  :after mu4e
+;;   :after mu4e
-  :init
+;;   :init
-  (setq mu4e-alert-interesting-mail-query "flag:unread maildir:/posteo/INBOX")
+;;   (setq mu4e-alert-interesting-mail-query "flag:unread maildir:/posteo/INBOX")
-  :hook
+;;   :hook
-  (after-init . mu4e-alert-enable-mode-line-display))
+;;   (after-init . mu4e-alert-enable-mode-line-display))
+
+;; Matrix
+(use-package ement)
 
 ;; Read Gopher and Gemini
 (use-package elpher)
@@ -77,84 +106,46 @@
 ;; Read feeds
 (use-package elfeed)
 
-;; Write gemtext
-;(use-package gemini-mode
- ; :straight t)
-
-;; Interface with guix package manager
-(use-package guix)
 
 ;; Programming environment
 ;; We need colors in eshell
 (use-package xterm-color)
 
 ;; git
-(use-package magit)
+(use-package magit
+  :demand t)
 
-;; code completion
+;; ;; code completion
 (use-package company
+  :demand t
   :config
   (add-hook 'after-init-hook 'global-company-mode))
 
-;; language server
+;; documentation via dash docsets
-(use-package lsp-mode)
+(use-package dash-docs
-(use-package lsp-ui)
+  :config
-(use-package lsp-treemacs
+  (progn
+    (setq dash-docs-browser-func 'eww)
+    (setq dash-docs-enable-debugging nil)))
+
+(use-package tomlparse)
+
+;; TODO I'm only using demand so <f3> is set from the start
+(use-package treemacs
+  :demand t
   :config
   (global-set-key (kbd "<f3>") 'treemacs))
-(use-package lsp-ivy)
-(use-package company-lsp)
-(use-package yasnippet
-  :config
-  (yas-global-mode 1))
-(use-package dap-mode)
-
-;; R
-;(use-package ess
-  ;:config
-  ;(load "~/.emacs.d/elisp/ess-setup.el")
-;  )
 
 ;; Javascript and React
 (use-package rjsx-mode
   :config
   (add-to-list 'auto-mode-alist '("\\.js\\'" . rjsx-mode)))
 
-;; Typescript
+;; Common Lisp
-(use-package tide
+(use-package slime
   :disabled
   :config
-  (load "~/.emacs.d/elisp/typescript.el"))
+  (load "~/.emacs.d/elisp/slime-setup.el"))
-
-(use-package typescript-mode
-  :ensure t
-  :init
-  (define-derived-mode typescript-tsx-mode typescript-mode "tsx")
-  :config
-  (add-hook 'typescript-mode #'subword-mode)
-  (add-to-list 'auto-mode-alist '("\\.tsx?\\'" . typescript-tsx-mode)))
-
-(use-package tree-sitter
-  :straight t
-  :hook ((typescript-mode . tree-sitter-hl-mode)
-	 (typescript-tsx-mode . tree-sitter-hl-mode)))
-
-(use-package tree-sitter-langs
-  :straight t
-  :after tree-sitter
-  :config
-  (tree-sitter-require 'tsx)
-  (add-to-list 'tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx)))
-
-;; Geiser
-(use-package geiser)
-(use-package geiser-guile)
-
-;; Common Lisp
-;; (use-package slime
-;;   :disabled
-;;   :config
-;;   (load "~/.emacs.d/elisp/slime-setup.el"))
 
 (use-package sly)
 
@@ -177,15 +168,45 @@
   :init
   (setenv "WORKON_HOME" "~/.cache/pypoetry/virtualenvs"))
 
-;;Ivy related stuff
+(use-package python-black
+  :after python
+  :hook (python-mode . python-black-on-save-mode-enable-dwim))
+
+(use-package pydoc)
+
+(use-package pet
+  :config
+  (add-hook 'python-base-mode-hook 'pet-mode -10))
+
+;; Ivy related stuff
 (use-package ivy)
-(use-package ivy-bibtex
+(use-package ivy-bibtex)
-  :straight t)
 (use-package counsel)
 (use-package swiper)
+(use-package counsel-dash
+  :after (counsel))
 (load "~/.emacs.d/elisp/ivy-setup.el")
 
-;;TRAMP
+;; View logs
+(use-package log4j-mode)
+
+(use-package eglot
+  :straight (:type built-in)
+  :ensure t
+  :defer t
+  :hook ((python-base-mode . eglot-ensure))
+  ;:config
+  ;(setq-default eglot-workspace-configuration
+  ;              '((pylsp
+  ;                 (plugins
+  ;                  (pycodestyle (enabled . nil))
+  ;                  (pyflakes (enabled . nil))
+  ;                  (flake8 (enabled . t))
+  ;                  (black (enabled . t))
+  ;                  ))))
+  )
+
+;; TRAMP
 (load "~/.emacs.d/elisp/tramp-setup.el")
 (load "~/.emacs.d/elisp/outline-keymap.el")
 (load "~/.emacs.d/elisp/bibtex-setup.el")

elisp/keypad.el

@@ -1,5 +1,10 @@
 ;; magit
 (global-set-key (kbd "C-x g") 'magit-status)
+;; eshell
+(global-set-key (kbd "<f4>") 'eshell)
+(global-set-key (kbd "H-e") 'eshell)
+;; subsitute list-buffer for ibuffer
+(global-set-key (kbd "C-x C-b") 'ibuffer)
 
 ;; number pad keys
 (global-set-key (kbd "<kp-decimal>") 'other-window)

elisp/org-setup.el

@@ -58,7 +58,8 @@
    (haskell    . t)
    (scheme     . t)
    (shell      . t)
-   (python     . t)))
+   (python     . t)
+   (plantuml   . t)))
 
 ;; default apps to open files with org-mode
 (setq org-file-apps

elisp/settings.el

@@ -79,10 +79,10 @@
 
 ;; Removes *Completions* from buffer after you've opened a file.
 (add-hook 'minibuffer-exit-hook
-      '(lambda ()
+          #'(lambda ()
-         (let ((buffer "*Completions*"))
+              (let ((buffer "*Completions*"))
-           (and (get-buffer buffer)
+                (and (get-buffer buffer)
-                (kill-buffer buffer)))))
+                     (kill-buffer buffer)))))
 
 ;; Don't show *Buffer list* when opening multiple files at the same time.
 (setq inhibit-startup-buffer-menu t)

init.el

@@ -18,7 +18,9 @@
 ;;(straight-use-package 'use-package)
 (eval-when-compile
   (require 'use-package))
-;(setq straight-use-package-by-default t)
+(setq straight-use-package-by-default t)
+
+;;(setq use-package-always-defer t)
 
 ;; Minimal package.el use so we can explore melpa packages
 (require 'package)
@@ -32,6 +34,7 @@
 ;(load "~/.emacs.d/elisp/mu4e-setup.el")
 
 (load "~/.emacs.d/elisp/settings.el")
+(load "~/.emacs.d/elisp/eshell-setup.el")
 (load "~/.emacs.d/elisp/extras.el")
 (load "~/.emacs.d/elisp/custom.el")
 
@@ -40,9 +43,11 @@
       '(("http://lambda-the-ultimate.org/node/feed" lambda)
         ("https://acoup.blog/feed" acoup history)
         ("https://talesoftimesforgotten.com/feed" history)
+        ("https://pastsimperfect.substack.com/feed" history)
 	("https://guix.gnu.org/feeds/blog.atom" guix)
 	("https://mmhaskell.com/blog?format=rss" haskell)
 	("https://www.inspiredpython.com/feed" python)
         ("https://sachachua.com/blog/category/emacs-news/feed" emacs)
-        ("https://dthompson.us/feed.xml" guile)))
+        ("https://dthompson.us/feed.xml" guile)
+        ("https://wingolog.org/feed/atom" guile scheme)))
 (put 'upcase-region 'disabled nil)