From 39e3fc297d61654b8f49f4e28ec46fad040891d0 Mon Sep 17 00:00:00 2001 From: Thomas Ulmer Date: Wed, 19 Nov 2025 10:02:59 -0800 Subject: fix modeline and small init tweaks --- emacs/init.el | 145 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 79 insertions(+), 66 deletions(-) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index da6fdbe..0c3cf01 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1,3 +1,4 @@ + ;; -*- lexical-binding: t; -*- (progn ; performance stuff: @@ -628,7 +629,19 @@ given keymap or in the global keymap." (setq-default viper-buffer-search-char ?g) (setq viper-mode t) (require 'viper) - ) + (define-key viper-vi-global-user-map (kbd "C-y") 'yank) + (define-key viper-vi-global-user-map (kbd "C-e") 'end-of-line) + (define-key viper-vi-global-user-map (kbd "C-f") 'forward-char) + (define-key viper-vi-global-user-map (kbd "C-b") 'backward-char) + (define-key viper-vi-global-user-map (kbd "C-u") 'universal-argument) + (define-key viper-insert-global-user-map (kbd "C-u") 'universal-argument) + (define-key viper-insert-global-user-map (kbd "") + #'(lambda () + (interactive) + (if completion-in-region-mode + (corfu-insert) + (viper-autoindent))))) + ;; (use-package evil ;; :demand nil ;; :custom @@ -793,10 +806,10 @@ changes." :hook (exwm-update-class . my/exwm-set-buffer-name) (exwm-update-title . my/exwm-set-buffer-name) - (after-init . exwm-randr-refresh) - (after-init . display-time-mode) - (after-init . ednc-mode) - (after-init . display-battery-mode) + ;; (after-init . exwm-randr-refresh) + ;; (after-init . display-time-mode) + ;; (after-init . ednc-mode) + ;; (after-init . display-battery-mode) :custom (exwm-replace nil) (exwm-title-length 50) @@ -923,13 +936,13 @@ changes." (minions-prominent-modes '(persp-mode auto-fill-mode eldoc-mode eglot-mode lsp-mode))) (progn ; default modeline config additions - (setq-default global-mode-string - '("" (:eval (let ((str (concat (format " [%s] " (my/shorten-path default-directory))))) - (add-face-text-property - 0 (length str) - '(:weight bold :foreground "green2") - t str) - str))))) + (let ((dir '("" (:eval (let ((str (concat (format " [%s] " (my/shorten-path default-directory))))) + (add-face-text-property + 0 (length str) + '(:weight bold :foreground "green2") + t str) + str))))) + (push dir global-mode-string))) (progn ; comfy scratch buffer (require 'iimage) @@ -1029,14 +1042,14 @@ changes." (use-package time :demand t :config - ;; (display-time-mode 1) + (display-time-mode 1) :custom (display-time-day-and-date t) (display-time-24hr-format t)) (use-package battery :demand t :config - ;; (display-battery-mode 1) + (display-battery-mode 1) ) (use-package ednc :demand t @@ -1045,58 +1058,58 @@ changes." ;; (ednc-mode 1)) ) -;; (use-package mu4e -;; :ensure nil -;; :demand nil -;; :init -;; ;; assumed Maildir layout -;; ;; ~/Maildir/Account0/{Inbox,Sent,Trash} -;; ;; ~/Maildir/Account1/{Inbox,Sent,Trash} -;; ;; where Account0 is context name -;; (defun my/make-mu4e-context (context-name full-name mail-address signature) -;; "Return a mu4e context named CONTEXT-NAME with :match-func matching -;; folder name CONTEXT-NAME in Maildir. The context's `user-mail-address', -;; `user-full-name' and `mu4e-compose-signature' is set to MAIL-ADDRESS -;; FULL-NAME and SIGNATURE respectively. -;; Special folders are set to context specific folders." -;; (let ((dir-name (concat "/" context-name))) -;; (make-mu4e-context -;; :name context-name -;; ;; we match based on the maildir of the message -;; ;; this matches maildir /Arkham and its sub-directories -;; :match-func -;; `(lambda (msg) -;; (when msg -;; (string-match-p -;; ,(concat "^" dir-name) -;; (mu4e-message-field msg :maildir)))) -;; :vars -;; `((user-mail-address . ,mail-address) -;; (user-full-name . ,full-name) -;; (mu4e-sent-folder . ,(concat dir-name "/sent")) -;; (mu4e-drafts-folder . ,(concat dir-name "/drafts")) -;; (mu4e-trash-folder . ,(concat dir-name "/trash")) -;; (mu4e-refile-folder . ,(concat dir-name "/archive")) -;; (mu4e-compose-signature . ,signature))))) -;; :custom -;; (mu4e-change-filenames-when-moving t) -;; (mu4e-get-mail-command "mbsync --all") -;; :config -;; ;;Fixing duplicate UID errors when using mbsync and mu4e -;; (setq mu4e-contexts -;; `(,(my/make-mu4e-context -;; "thomasmulmer02" "Thomas Ulmer" -;; "thomasmulmer02@gmail.com" "Thanks, -;; Thomas Ulmer"))) +(use-package mu4e + :ensure nil + :demand nil + :init + ;; assumed Maildir layout + ;; ~/Maildir/Account0/{Inbox,Sent,Trash} + ;; ~/Maildir/Account1/{Inbox,Sent,Trash} + ;; where Account0 is context name + (defun my/make-mu4e-context (context-name full-name mail-address signature) + "Return a mu4e context named CONTEXT-NAME with :match-func matching + folder name CONTEXT-NAME in Maildir. The context's `user-mail-address', + `user-full-name' and `mu4e-compose-signature' is set to MAIL-ADDRESS + FULL-NAME and SIGNATURE respectively. + Special folders are set to context specific folders." + (let ((dir-name (concat "/" context-name))) + (make-mu4e-context + :name context-name + ;; we match based on the maildir of the message + ;; this matches maildir /Arkham and its sub-directories + :match-func + `(lambda (msg) + (when msg + (string-match-p + ,(concat "^" dir-name) + (mu4e-message-field msg :maildir)))) + :vars + `((user-mail-address . ,mail-address) + (user-full-name . ,full-name) + (mu4e-sent-folder . ,(concat dir-name "/sent")) + (mu4e-drafts-folder . ,(concat dir-name "/drafts")) + (mu4e-trash-folder . ,(concat dir-name "/trash")) + (mu4e-refile-folder . ,(concat dir-name "/archive")) + (mu4e-compose-signature . ,signature))))) + :custom + (mu4e-change-filenames-when-moving t) + (mu4e-get-mail-command "mbsync --all") + :config + ;;Fixing duplicate UID errors when using mbsync and mu4e + (setq mu4e-contexts + `(,(my/make-mu4e-context + "thomasmulmer02" "Thomas Ulmer" + "thomasmulmer02@gmail.com" "Thanks, +Thomas Ulmer"))) -;; (require 'smtpmail) -;; (setq message-send-mail-function 'smtpmail-send-it) -;; (setq smtpmail-default-smtp-server "smtp.gmail.com" -;; smtpmail-smtp-server "smtp.gmail.com" -;; smtpmail-smtp-service 587 -;; starttls-use-gnutls t -;; smtpmail-starttls-credentials '(("smtp.gmail.com" 587 nil nil)) -;; smtp-auth-credentials (expand-file-name "~/.authinfo.gpg"))) + (require 'smtpmail) + (setq message-send-mail-function 'smtpmail-send-it) + (setq smtpmail-default-smtp-server "smtp.gmail.com" + smtpmail-smtp-server "smtp.gmail.com" + smtpmail-smtp-service 587 + starttls-use-gnutls t + smtpmail-starttls-credentials '(("smtp.gmail.com" 587 nil nil)) + smtp-auth-credentials (expand-file-name "~/.authinfo.gpg"))) ;; ---------------------------------------------------------------------- @@ -1114,6 +1127,7 @@ changes." (put 'downcase-region 'disabled nil) (put 'list-timers 'disabled nil) (put 'narrow-to-region 'disabled nil) +(put 'set-goal-column 'disabled nil) (custom-set-variables ;; custom-set-variables was added by Custom. @@ -1291,4 +1305,3 @@ changes." ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. ) -(put 'set-goal-column 'disabled nil) -- cgit v1.2.3