From ca981c61b8e0f0ecd8d9bbe93ce5da35d2304c73 Mon Sep 17 00:00:00 2001 From: Mateus Rodrigues Date: Mon, 13 Oct 2025 09:06:32 +0100 Subject: [PATCH] update configs. use straight for everything --- elisp/extras.el | 144 +++++++++++++++++++++------------------------ elisp/org-setup.el | 3 +- init.el | 4 +- 3 files changed, 72 insertions(+), 79 deletions(-) diff --git a/elisp/extras.el b/elisp/extras.el index e78e7f7..31cc4cf 100644 --- a/elisp/extras.el +++ b/elisp/extras.el @@ -8,6 +8,9 @@ ;; 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 @@ -28,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) @@ -40,18 +43,22 @@ ;; 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 - :straight t - :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 @@ -74,22 +81,21 @@ (pdf-tools-install) (setq pdf-view-midnight-colors '("#DCDCCC" . "#3F3F3F")))) -(use-package saveplace-pdf-view - :straight t) +(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) @@ -100,21 +106,16 @@ ;; 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 @@ -127,48 +128,24 @@ (setq dash-docs-browser-func 'eww) (setq dash-docs-enable-debugging nil))) +(use-package tomlparse) + ;; TODO I'm only using demand so is set from the start (use-package treemacs :demand t :config (global-set-key (kbd "") 'treemacs)) -(use-package eglot - :ensure t - :defer t - :hook (python-mode . eglot-ensure) - :config - (setq-default eglot-workspace-configuration - '((:pylsp . (:configurationSources ["flake8"] - :plugins ( - :pycodestyle (:enabled :json-false) - :mccabe (:enabled :json-false) - :pyflakes (:enabled :json-false) - :flake8 (:enabled t - :maxLineLength 88) - :pydocstyle (:enabled t - :convention "numpy") - :yapf (:enabled :json-false) - :autopep8 (:enabled :json-false) - :black (:enabled t - :line_length 88 - :cache_config t))))) - )) - ;; Javascript and React (use-package rjsx-mode :config (add-to-list 'auto-mode-alist '("\\.js\\'" . rjsx-mode))) -;; Geiser -(use-package geiser) -(use-package geiser-guile) - ;; Common Lisp -;; (use-package slime -;; :disabled -;; :config -;; (load "~/.emacs.d/elisp/slime-setup.el")) +(use-package slime + :disabled + :config + (load "~/.emacs.d/elisp/slime-setup.el")) (use-package sly) @@ -192,18 +169,18 @@ (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 - :straight t) +(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 @@ -211,8 +188,23 @@ (load "~/.emacs.d/elisp/ivy-setup.el") ;; View logs -(use-package log4j-mode - :straight t) +(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") diff --git a/elisp/org-setup.el b/elisp/org-setup.el index bd3d3b1..3d0aa34 100644 --- 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 diff --git a/init.el b/init.el index 0a3dab5..901d901 100644 --- a/init.el +++ b/init.el @@ -18,9 +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) +;;(setq use-package-always-defer t) ;; Minimal package.el use so we can explore melpa packages (require 'package)