Merge branch 'master' of notabug.org:mprodrigues/emacs-config

elisp/eshell-setup.el

@@ -1,9 +1,21 @@
 ;; colors in eshell
-(add-hook 'eshell-mode-hook
+;; (add-hook 'eshell-mode-hook
-          (lambda ()
+;;           (lambda ()
-            (setenv "TERM" "xterm-256color")))
+;;             (setenv "TERM" "xterm-256color")))
-(add-hook 'eshell-before-prompt-hook (lambda ()
+;; (add-hook 'eshell-before-prompt-hook (lambda ()
-				       (setq xterm-color-preserve-properties t)))
+;; 				       (setq xterm-color-preserve-properties t)))
-(add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
+;; (add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
-(setq eshell-output-filter-functions
+;; (setq eshell-output-filter-functions
-      (remove 'eshell-handle-ansi-color 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

@@ -6,12 +6,18 @@
 '(italic ((t (:slant italic))))
 
 ;;;; Load my packages
-;;Default theme
+;; Default theme
 (use-package zenburn-theme
   :config
   (load-theme 'zenburn t))
 
-;;Org
+;; 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"))
@@ -21,6 +27,9 @@
   :config
   (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")
@@ -71,6 +80,9 @@
   :hook
   (after-init . mu4e-alert-enable-mode-line-display))
 
+;; Matrix
+(use-package ement)
+
 ;; Read Gopher and Gemini
 (use-package elpher)
 
@@ -96,12 +108,21 @@
   :config
   (add-hook 'after-init-hook 'global-company-mode))
 
+;; documentation via dash docsets
+(use-package dash-docs
+  :config
+  (progn
+    (setq dash-docs-browser-func 'eww)
+    (setq dash-docs-enable-debugging nil)))
+
+(use-package treemacs
+  :config
+  (global-set-key (kbd "<f3>") 'treemacs))
+
 ;; language server
 (use-package lsp-mode)
 (use-package lsp-ui)
-(use-package lsp-treemacs
+(use-package lsp-treemacs)
-  :config
-  (global-set-key (kbd "<f3>") 'treemacs))
 (use-package lsp-ivy)
 (use-package company-lsp)
 (use-package yasnippet
@@ -177,15 +198,23 @@
   :init
   (setenv "WORKON_HOME" "~/.cache/pypoetry/virtualenvs"))
 
-;;Ivy related stuff
+(use-package python-black
+  :straight t
+  ;; :demand t
+  :after python
+  :hook (python-mode . python-black-on-save-mode-enable-dwim))
+
+;; Ivy related stuff
 (use-package ivy)
 (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
+;; TRAMP
 (load "~/.emacs.d/elisp/tramp-setup.el")
 (load "~/.emacs.d/elisp/outline-keymap.el")
 (load "~/.emacs.d/elisp/bibtex-setup.el")

elisp/settings.el

@@ -79,7 +79,7 @@
 
 ;; Removes *Completions* from buffer after you've opened a file.
 (add-hook 'minibuffer-exit-hook
-      '(lambda ()
+          #'(lambda ()
               (let ((buffer "*Completions*"))
                 (and (get-buffer buffer)
                      (kill-buffer buffer)))))

init.el

@@ -32,6 +32,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")
 
@@ -44,5 +45,7 @@
 	("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)
+        ("https://jazzfuel.com/feed/" jazz music)))
 (put 'upcase-region 'disabled nil)