X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/5b47fe7fd03e0599688902e6804b32803d8ca53c..b0b341898d6649882e3d9f9dbdc5af1937168af8:/.emacs.d/init.el?ds=inline diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 8bf43bf..d6c94f8 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -181,8 +181,6 @@ (setq use-package-always-defer t) (require 'bind-key) -(use-package delight) - ;;; Initial setup @@ -396,6 +394,7 @@ For disabling the behaviour for certain buffers and/or modes." ;; time and battery in mode-line (use-feature time + :demand :config (display-time-mode) :custom @@ -403,6 +402,7 @@ For disabling the behaviour for certain buffers and/or modes." (display-time-format "%a %b %-e, %-l:%M%P")) (use-feature battery + :demand :config (display-battery-mode) :custom @@ -563,22 +563,27 @@ For disabling the behaviour for certain buffers and/or modes." (use-package exwm :demand :config - (require 'exwm-config) - - (setq - exwm-workspace-number 4 - exwm-workspace-index-map (lambda (i) (number-to-string (1+ i)))) - - ;; Make class name the buffer name, truncating beyond 60 characters - (defun exwm-rename-buffer () + ;; make class name the buffer name, truncating beyond 60 characters + (defun b/exwm-rename-buffer () (interactive) (exwm-workspace-rename-buffer (concat exwm-class-name ":" (if (<= (length exwm-title) 60) exwm-title (concat (substring exwm-title 0 59) "..."))))) - (add-hook 'exwm-update-class-hook 'exwm-rename-buffer) - (add-hook 'exwm-update-title-hook 'exwm-rename-buffer) + ;; Enable EXWM + (exwm-enable) + :hook ((exwm-update-class . b/exwm-rename-buffer) + (exwm-update-title . b/exwm-rename-buffer))) +(use-feature exwm-config + :demand + :after exwm + :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame)) + +(use-feature exwm-input + :demand + :after exwm + :config (defun b/exwm-ws-prev-index () "Return the index for the previous EXWM workspace, wrapping around if needed." @@ -594,55 +599,90 @@ around if needed." 0 (1+ exwm-workspace-current-index))) - ;; 's-R': Reset - (exwm-input-set-key (kbd "s-R") #'exwm-reset) - ;; 's-\': Switch workspace - (exwm-input-set-key (kbd "s-\\") #'exwm-workspace-switch) - ;; 's-N': Switch to certain workspace - (dotimes (i exwm-workspace-number) - (exwm-input-set-key - (kbd (format "s-%d" i)) - (lambda () - (interactive) - (exwm-workspace-switch-create (1- i))))) - ;; 's-[': Switch to previous workspace - (defun b/exwm-ws-prev () - "Switch to previous EXWM workspace, wrapping around if needed." - (interactive) - (exwm-workspace-switch-create (b/exwm-ws-prev-index))) - (exwm-input-set-key (kbd "s-[") #'b/exwm-ws-prev) - ;; 's-]': Switch to next workspace - (defun b/exwm-ws-next () - "Switch to next EXWM workspace, wrapping around if needed." - (interactive) - (exwm-workspace-switch-create (b/exwm-ws-next-index))) - (exwm-input-set-key (kbd "s-]") #'b/exwm-ws-next) - ;; 's-{': Move window to previous workspace - (defun b/exwm-move-window-to-prev-ws () - "Move window to previous EXWM workspace, wrapping around if -needed." - (interactive) - (exwm-workspace-move-window (b/exwm-ws-prev-index))) - (exwm-input-set-key (kbd "s-{") #'b/exwm-move-window-to-prev-ws) - ;; 's-}': Move window to next workspace - (defun b/exwm-move-window-to-next-ws () - "Move window to next EXWM workspace, wrapping around if -needed." - (interactive) - (exwm-workspace-move-window (b/exwm-ws-next-index))) - (exwm-input-set-key (kbd "s-}") #'b/exwm-move-window-to-next-ws) - ;; 's-SPC': Launch application - ;; (exwm-input-set-key - ;; (kbd "s-SPC") - ;; (lambda (command) - ;; (interactive (list (read-shell-command "➜ "))) - ;; (start-process-shell-command command nil command))) - - (exwm-input-set-key (kbd "M-s-SPC") #'counsel-linux-app) - - ;; Shorten 'C-c C-q' to 'C-q' + ;; shorten 'C-c C-q' to 'C-q' (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key) + (setq exwm-input-global-keys + `(([?\s-R] . exwm-reset) + ([?\s-\\] . exwm-workspace-switch) + ([?\s-\s] . (lambda (command) + (interactive + (list (read-shell-command "➜ "))) + (start-process-shell-command + command nil command))) + ([s-return] . (lambda () + (interactive) + (start-process "" nil "urxvt"))) + ([?\C-\s-\s] . counsel-linux-app) + ([?\M-\s-\s] . (lambda () + (interactive) + (start-process-shell-command + "rofi-pass" nil "rofi-pass"))) + ([?\s-\[] . (lambda () + (interactive) + (exwm-workspace-switch-create + (b/exwm-ws-prev-index)))) + ([?\s-\]] . (lambda () + (interactive) + (exwm-workspace-switch-create + (b/exwm-ws-next-index)))) + ([?\s-{] . (lambda () + (interactive) + (exwm-workspace-move-window + (b/exwm-ws-prev-index)))) + ([?\s-}] . (lambda () + (interactive) + (exwm-workspace-move-window + (b/exwm-ws-next-index)))) + ,@(mapcar (lambda (i) + `(,(kbd (format "s-%d" i)) . + (lambda () + (interactive) + (exwm-workspace-switch-create ,i)))) + (number-sequence 0 (1- exwm-workspace-number))) + ([?\s-t] . exwm-floating-toggle-floating) + ([?\s-f] . exwm-layout-toggle-fullscreen) + ([?\s-w] . (lambda () + (interactive) + (kill-buffer (current-buffer)))) + ([?\s-q] . (lambda () + (interactive) + (exwm-manage--kill-client))) + ([?\s-\'] . (lambda () + (interactive) + (start-process-shell-command + "rofi-light" nil "rofi-light"))) + ([XF86AudioMute] . + (lambda () + (interactive) + (start-process "" nil "pamixer" "--toggle-mute"))) + ([XF86AudioLowerVolume] . + (lambda () + (interactive) + (start-process + "" nil "pamixer" "--allow-boost" "--decrease" "5"))) + ([XF86AudioRaiseVolume] . + (lambda () + (interactive) + (start-process + "" nil "pamixer" "--allow-boost" "--increase" "5"))) + ([XF86AudioPlay] . + (lambda () + (interactive) + (start-process "" nil "mpc" "toggle"))) + ([XF86AudioPrev] . + (lambda () + (interactive) + (start-process "" nil "mpc" "prev"))) + ([XF86AudioNext] . + (lambda () + (interactive) + (start-process "" nil "mpc" "next"))) + ([XF86ScreenSaver] . + (lambda () + (interactive) + (start-process "" nil "dm-tool" "lock"))))) + ;; Line-editing shortcuts (setq exwm-input-simulation-keys '(;; movement @@ -657,129 +697,37 @@ needed." ([?\M-v] . [prior]) ([?\C-v] . [next]) ([?\C-d] . [delete]) - ([?\C-k] . [S-end delete]) + ([?\C-k] . [S-end ?\C-x]) + ([?\M-<] . C-home) + ([?\M->] . C-end) ;; cut/copy/paste - ;; ([?\C-w] . [?\C-x]) + ([?\C-w] . [?\C-x]) ([?\M-w] . [?\C-c]) ([?\C-y] . [?\C-v]) + ([?\M-d] . [C-S-right ?\C-x]) + ([?\M-\d] . [C-S-left ?\C-x]) ;; search - ([?\C-s] . [?\C-f]))) + ([?\C-s] . [?\C-f]) + ;; escape + ([?\C-g] . [escape])))) - ;; Enable EXWM - (exwm-enable) +(use-feature exwm-randr + :demand + :after exwm + :config + (exwm-randr-enable)) - (add-hook 'exwm-init-hook #'exwm-config--fix/ido-buffer-window-other-frame) - - (require 'exwm-systemtray) - (exwm-systemtray-enable) - - (require 'exwm-randr) - (exwm-randr-enable) - - ;; (exwm-input-set-key - ;; (kbd "s-") - ;; (lambda () - ;; (interactive) - ;; (start-process "urxvt" nil "urxvt"))) - - ;; (exwm-input-set-key - ;; (kbd "s-SPC") ;; rofi doesn't properly launch programs when started from emacs - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "rofi-run" nil "rofi -show run -display-run '> ' -display-window ' 🗔 '"))) - - ;; (exwm-input-set-key - ;; (kbd "s-/") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "rofi-win" nil "rofi -show window -display-run '> ' -display-window ' 🗔 '"))) - - ;; (exwm-input-set-key - ;; (kbd "M-SPC") - ;; (lambda () - ;; (interactive) - ;; (start-process "rofi-pass" nil "rofi-pass"))) - - ;; (exwm-input-set-key - ;; (kbd "") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "pamixer" nil "pamixer --toggle-mute"))) - - ;; (exwm-input-set-key - ;; (kbd "") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "pamixer" nil "pamixer --allow-boost --decrease 5"))) - - ;; (exwm-input-set-key - ;; (kbd "") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "pamixer" nil "pamixer --allow-boost --increase 5"))) - - ;; (exwm-input-set-key - ;; (kbd "") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "mpc" nil "mpc toggle"))) - - ;; (exwm-input-set-key - ;; (kbd "") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "mpc" nil "mpc prev"))) - - ;; (exwm-input-set-key - ;; (kbd "") - ;; (lambda () - ;; (interactive) - ;; (start-process-shell-command "mpc" nil "mpv next"))) +(use-feature exwm-systemtray + :demand + :after exwm + :config + (exwm-systemtray-enable)) - (comment - (defun b/exwm-pasystray () - "A command used to start pasystray." - (interactive) - (if (executable-find "pasystray") - (progn - (message "EXWM: starting pasystray ...") - (start-process-shell-command "pasystray" nil "pasystray --notify=all")) - (message "EXWM: pasystray is not installed, abort!"))) - (add-hook 'exwm-init-hook #'b/exwm-pasystray)) - - (defun b/exwm-nm-applet () - "A command used to start nm-applet." - (interactive) - (if (executable-find "nm-applet") - (progn - (message "EXWM: starting nm-applet ...") - (start-process-shell-command "nm-applet" nil "nm-applet")) - (message "EXWM: nm-applet is not installed, abort!"))) - (add-hook 'exwm-init-hook #'b/exwm-nm-applet) - - (exwm-input-set-key - (kbd "s-t") - (lambda () - (interactive) - (exwm-floating-toggle-floating))) - - (exwm-input-set-key - (kbd "s-f") - (lambda () - (interactive) - (exwm-layout-toggle-fullscreen))) - - (exwm-input-set-key - (kbd "s-w") - (lambda () - (interactive) - (kill-buffer (current-buffer)))) - - (exwm-input-set-key - (kbd "s-q") - (lambda () - (interactive) - (exwm-manage--kill-client)))) +(use-feature exwm-workspace + :demand + :after exwm + :custom + (exwm-workspace-number 4)) ;; use the org-plus-contrib package to get the whole deal (use-package org-plus-contrib) @@ -920,7 +868,6 @@ needed." (use-package ivy :defer 0.3 - :delight ;; " 🙒" :bind (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) @@ -961,7 +908,6 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package counsel :after ivy - :delight :bind (([remap execute-extended-command] . counsel-M-x) ([remap find-file] . counsel-find-file) ("C-c b b" . ivy-switch-buffer) @@ -1102,7 +1048,6 @@ This function is intended for use with `ivy-ignore-buffers'." (use-feature outline :disabled :hook (prog-mode . outline-minor-mode) - :delight (outline-minor-mode " outl") :bind (:map outline-minor-mode-map @@ -1203,7 +1148,6 @@ This function is intended for use with `ivy-ignore-buffers'." ;; display Lisp objects at point in the echo area (use-feature eldoc :when (version< "25" emacs-version) - :delight " eldoc" :config (global-eldoc-mode)) ;; highlight matching parens @@ -1216,7 +1160,6 @@ This function is intended for use with `ivy-ignore-buffers'." :config (electric-pair-mode)) (use-feature simple - :delight (auto-fill-function " fill") :config (column-number-mode) :custom ;; Save what I copy into clipboard from other applications into Emacs' @@ -1254,7 +1197,6 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package company :defer 0.6 - :delight " comp" :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) @@ -1283,8 +1225,7 @@ This function is intended for use with `ivy-ignore-buffers'." (setq flycheck-check-syntax-automatically '(mode-enabled save)) :custom (flycheck-mode-line-prefix "flyc")) -(use-feature flyspell - :delight " flysp") +(use-feature flyspell) ;; http://endlessparentheses.com/ispell-and-apostrophes.html (use-feature ispell @@ -1314,7 +1255,6 @@ This function is intended for use with `ivy-ignore-buffers'." #'endless/replace-quote)) (use-feature abbrev - :delight " abbr" :hook (text-mode . abbrev-mode)) @@ -1327,11 +1267,9 @@ This function is intended for use with `ivy-ignore-buffers'." (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) (use-feature reveal - :delight (reveal-mode " reveal") :hook (emacs-lisp-mode . reveal-mode)) -(use-feature elisp-mode - :delight (emacs-lisp-mode "Elisp" :major)) +(use-feature elisp-mode) (use-package alloy-mode :straight (:host github :repo "dwwmmn/alloy-mode") @@ -1543,7 +1481,8 @@ This function is intended for use with `ivy-ignore-buffers'." (load-theme 'tangomod t) (sml/apply-theme 'automatic) (font-lock-remove-keywords - 'org-mode b/org-mode-font-lock-keywords)) + 'org-mode b/org-mode-font-lock-keywords) + (exwm-systemtray--refresh)) (defun b/lights-off () "Go dark." @@ -1552,7 +1491,8 @@ This function is intended for use with `ivy-ignore-buffers'." (load-theme 'doom-tomorrow-night t) (sml/apply-theme 'automatic) (font-lock-add-keywords - 'org-mode b/org-mode-font-lock-keywords t)) + 'org-mode b/org-mode-font-lock-keywords t) + (exwm-systemtray--refresh)) (bind-keys ("C-c t d" . b/lights-off) @@ -1566,7 +1506,6 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package which-key :defer 0.4 - :delight :config (which-key-add-key-based-replacements ;; prefixes for global prefixes and minor modes @@ -1720,7 +1659,6 @@ This function is intended for use with `ivy-ignore-buffers'." ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹› (use-package typo :defer 0.5 - :delight " typo" :config (typo-global-mode 1) :hook (((text-mode erc-mode) . typo-mode) @@ -1807,7 +1745,6 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package page-break-lines :defer 0.5 - :delight " pgln" :custom (page-break-lines-max-width fill-column) :config @@ -1826,11 +1763,9 @@ This function is intended for use with `ivy-ignore-buffers'." ("p" . mc/mark-previous-like-this) ("a" . mc/mark-all-like-this)))) -(comment - ;; TODO - (use-package forge - :after magit - :demand)) +(use-package forge + :demand + :after magit) (use-package yasnippet :defer 0.6 @@ -1935,6 +1870,17 @@ This function is intended for use with `ivy-ignore-buffers'." (goto-char (cdr macro))) (reftex-this-word))))) +(use-package minions + :demand + :config (minions-mode)) + +(use-package dmenu + :disabled + :custom + (dmenu-history-size 0) + (dmenu-prompt-string "run: ") + (dmenu-save-file (b/var "dmenu-items"))) + ;;; Email (with Gnus) @@ -2158,10 +2104,6 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-interactive-exit nil gnus-gcc-mark-as-read t) :config - (require 'ebdb) - (require 'ebdb-mua) - (require 'ebdb-gnus) - (when (version< emacs-version "27") (add-to-list 'nnmail-split-abbrev-alist @@ -2350,8 +2292,7 @@ https://csclub.uwaterloo.ca/~abandali") :custom (message-elide-ellipsis "[...]\n")) -(use-feature mml - :delight " mml") +(use-feature mml) (use-feature mml-sec :custom @@ -2377,6 +2318,7 @@ https://csclub.uwaterloo.ca/~abandali") ("s" . footnote-set-style))) (use-package ebdb + :demand :after gnus :bind (:map gnus-group-mode-map ("e" . ebdb)) :config @@ -2397,14 +2339,15 @@ https://csclub.uwaterloo.ca/~abandali") (defun company-ebdb--post-complete (_) nil)) (use-feature ebdb-gnus + :demand :after ebdb :custom (ebdb-gnus-window-size 0.3)) (use-feature ebdb-mua + :demand :after ebdb - ;; :custom (ebdb-mua-pop-up nil) - ) + :custom (ebdb-mua-pop-up nil)) ;; (use-package ebdb-message ;; :after ebdb)