update configs. use straight for everything

use ibuffer instead of list-buffer
remove commented ess package
2025-10-13 09:06:32 +01:00 · 2024-08-27 11:13:17 +01:00 · 2024-08-27 11:12:43 +01:00 · 2024-04-01 14:02:00 +01:00 · 2023-11-27 12:10:50 +00:00 · 2023-11-27 12:10:28 +00:00
5 changed files with 111 additions and 109 deletions
--- a/elisp/eshell-setup.el
+++ b/elisp/eshell-setup.el
@@ -1,18 +1,20 @@
 ;; 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)))
-;; (add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
-;; (setq eshell-output-filter-functions
-;;       (remove 'eshell-handle-ansi-color eshell-output-filter-functions))
+
+(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)
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -5,11 +5,20 @@
 ;; Always use slant for italic, not underline
 '(italic ((t (:slant italic))))

+;; Save point
+(save-place-mode 1)
+
+;; Set column width to 88 characters
+(setq-default fill-column 88)
+
 ;;;; Load my packages
 ;; Default theme
-(use-package zenburn-theme
-  :config
-  (load-theme 'zenburn t))
+;; (use-package zenburn-theme
+;;   :demand t
+;;   :config
+;;   (load-theme 'zenburn t))
+
+(load-theme 'modus-operandi-tinted t)

 ;; Eshell
 ;; (use-package eshell
@@ -22,10 +31,10 @@
  :config
  (load "~/.emacs.d/elisp/org-setup.el"))
 (use-package org-ref)
-(use-package org-roam
-  :disabled
-  :config
-  (load "~/.emacs.d/elisp/org-roam-setup.el"))
+;; (use-package org-roam
+;;   :disabled
+;;   :config
+;;   (load "~/.emacs.d/elisp/org-roam-setup.el"))

 ;; Writing
 (use-package writeroom-mode)
@@ -34,25 +43,36 @@
 ;; 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
@@ -61,24 +81,21 @@
   (pdf-tools-install)
   (setq pdf-view-midnight-colors '("#DCDCCC" . "#3F3F3F"))))

-(use-package saveplace-pdf-view
-  :straight t
-  :config
-  (save-place-mode 1))
+(use-package saveplace-pdf-view)

-;; Mail reader
-(use-package mu4e
-  :disabled
-  :config
-  (load "~/.emacs.d/elisp/mu4e-setup.el"))
-;; mail notification in modeline
-(use-package mu4e-alert
-  :disabled
-  :after mu4e
-  :init
-  (setq mu4e-alert-interesting-mail-query "flag:unread maildir:/posteo/INBOX")
-  :hook
-  (after-init . mu4e-alert-enable-mode-line-display))
+;; ;; Mail reader
+;; (use-package mu4e
+;;   :disabled
+;;   :config
+;;   (load "~/.emacs.d/elisp/mu4e-setup.el"))
+;; ;; mail notification in modeline
+;; (use-package mu4e-alert
+;;   :disabled
+;;   :after mu4e
+;;   :init
+;;   (setq mu4e-alert-interesting-mail-query "flag:unread maildir:/posteo/INBOX")
+;;   :hook
+;;   (after-init . mu4e-alert-enable-mode-line-display))

 ;; Matrix
 (use-package ement)
@@ -89,22 +106,18 @@
 ;; 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))

@@ -115,67 +128,24 @@
    (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))

-;; language server
-(use-package lsp-mode)
-(use-package lsp-ui)
-(use-package lsp-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
-(use-package tide
+;; Common Lisp
+(use-package slime
  :disabled
  :config
-  (load "~/.emacs.d/elisp/typescript.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"))
+  (load "~/.emacs.d/elisp/slime-setup.el"))

 (use-package sly)

@@ -199,21 +169,43 @@
  (setenv "WORKON_HOME" "~/.cache/pypoetry/virtualenvs"))

 (use-package python-black
-  :straight t
-  ;; :demand t
  :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
-  :straight t)
+(use-package ivy-bibtex)
 (use-package counsel)
 (use-package swiper)
 (use-package counsel-dash
  :after (counsel))
 (load "~/.emacs.d/elisp/ivy-setup.el")

+;; 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")
--- a/elisp/keypad.el
+++ b/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)
--- a/elisp/org-setup.el
+++ b/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
--- a/init.el
+++ b/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)
@@ -41,11 +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://wingolog.org/feed/atom" guile scheme)
-        ("https://jazzfuel.com/feed/" jazz music)))
+        ("https://wingolog.org/feed/atom" guile scheme)))
 (put 'upcase-region 'disabled nil)
Author	SHA1	Message	Date
Mateus Rodrigues	ca981c61b8	update configs. use straight for everything	2025-10-13 09:06:32 +01:00
Mateus Rodrigues	a5a2d9c350	use ibuffer instead of list-buffer	2024-08-27 11:13:17 +01:00
Mateus Rodrigues	832f369ae3	remove commented ess package	2024-08-27 11:12:43 +01:00
Mateus Rodrigues	5c31808a5b	clean up	2024-04-01 14:02:00 +01:00
Mateus Rodrigues	b8262f7e82	hooks for eshell	2023-11-27 12:10:50 +00:00
Mateus Rodrigues	aecc20f5e7	update feeds list	2023-11-27 12:10:28 +00:00
Mateus Rodrigues	eeb081e2d8	use modus-operandi instead of zenburn	2023-11-27 12:10:10 +00:00
Mateus Rodrigues	07ba76396b	load company-mode eagerly	2023-04-05 14:26:29 +01:00
Mateus Rodrigues	0c0e017cc3	Add log4j-mode to view log files (works with any log format)	2023-03-29 10:07:57 +01:00
Mateus Rodrigues	dc216a2cc8	Remove some commented code	2023-03-29 10:06:43 +01:00
Mateus Rodrigues	beeb91e047	Merge branch 'master' of ssh://git.lambdashire.com:9774/mprodrigues/emacs.d	2023-03-18 14:00:10 +00:00
Mateus Rodrigues	3b8722bd90	Better defaults for nov.el	2023-03-18 13:59:00 +00:00
Mateus Rodrigues	70da73c091	Bind eshell to F4. This keybind will probably change in the future.	2023-03-09 12:40:31 +00:00
Mateus Rodrigues	a1d5f323df	Use built-in tree-sitter from emacs 29. Emacs 29 comes with native tree-sitter implementation, so I'm commenting out this stuff for now (probably will be deleted). All these configs can be eventually remade, if need be, using the native tree-sitter.	2023-03-09 12:36:51 +00:00
Mateus Rodrigues	d4bcaf300f	Add pydoc.	2023-03-02 13:02:13 +00:00
Mateus Rodrigues	ace59e979b	Taking eglot for a ride.	2023-02-28 16:00:45 +00:00
Mateus Rodrigues	da46826753	Always defer package loading (We will add demand as needed)	2023-02-28 16:00:22 +00:00