X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/b0b341898d6649882e3d9f9dbdc5af1937168af8..8bbb67ce1950243d6c0a9fb0f685bfc795d687be:/.emacs.d/init.el?ds=sidebyside diff --git a/.emacs.d/init.el b/.emacs.d/init.el index d6c94f8..93dd563 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -582,7 +582,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature exwm-input :demand - :after exwm + :after exwm-workspace :config (defun b/exwm-ws-prev-index () "Return the index for the previous EXWM workspace, wrapping @@ -618,6 +618,18 @@ around if needed." (interactive) (start-process-shell-command "rofi-pass" nil "rofi-pass"))) + ([?\s-h] . windmove-left) + ([?\s-j] . windmove-down) + ([?\s-k] . windmove-up) + ([?\s-l] . windmove-right) + ([?\s-H] . windmove-swap-states-left) + ([?\s-J] . windmove-swap-states-down) + ([?\s-K] . windmove-swap-states-up) + ([?\s-L] . windmove-swap-states-right) + ([?\M-\s-h] . shrink-window-horizontally) + ([?\M-\s-l] . enlarge-window-horizontally) + ([?\M-\s-k] . shrink-window) + ([?\M-\s-j] . enlarge-window) ([?\s-\[] . (lambda () (interactive) (exwm-workspace-switch-create @@ -711,6 +723,28 @@ around if needed." ;; escape ([?\C-g] . [escape])))) +(use-feature exwm-manage + :demand + :after exwm + :hook + (exwm-manage-finish . (lambda () + (when exwm-class-name + (cond + ((string= exwm-class-name "Abrowser") + (exwm-input-set-local-simulation-keys + `(,@exwm-input-simulation-keys + ([?\C-\S-d] . [?\C-d]) + ([?\C-q] . [?\C-w]) + ([?\s-q] . [?\C-q])))) + ((string= exwm-class-name "URxvt") + (exwm-input-set-local-simulation-keys + '(([?\C-c ?\C-c] . [?\C-c]) + ([?\C-c ?\C-u] . [?\C-u])))) + ((string= exwm-class-name "Zathura") + (exwm-input-set-local-simulation-keys + '(([?\C-p] . [C-up]) + ([?\C-n] . [C-down]))))))))) + (use-feature exwm-randr :demand :after exwm @@ -729,6 +763,10 @@ around if needed." :custom (exwm-workspace-number 4)) +(use-package exwm-edit + :demand + :after exwm) + ;; use the org-plus-contrib package to get the whole deal (use-package org-plus-contrib) @@ -1453,6 +1491,7 @@ This function is intended for use with `ivy-ignore-buffers'." (load-theme 'tangomod t) (use-package smart-mode-line + :disabled :commands (sml/apply-theme) :demand :config @@ -1466,9 +1505,30 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (doom-modeline-buffer-file-name-style 'relative-to-project)) -(use-package doom-themes) +(use-package doom-themes + :disabled) + +(use-package solarized-theme + :demand + :config + (load-theme 'solarized-light t) + (let ((line (face-attribute 'mode-line :underline))) + (set-face-attribute 'mode-line nil :overline line) + (set-face-attribute 'mode-line-inactive nil :overline line) + (set-face-attribute 'mode-line-inactive nil :underline line) + (set-face-attribute 'mode-line nil :box nil) + (set-face-attribute 'mode-line-inactive nil :box nil) + (set-face-attribute 'mode-line-inactive nil :background "#f9f2d9"))) + +(use-package moody + :demand + :config + (setq x-underline-at-descent-line t) + (moody-replace-mode-line-buffer-identification) + (moody-replace-vc-mode)) (defvar b/org-mode-font-lock-keywords + "For use with the `doom-tomorrow-night' theme." '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)" (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind @@ -1478,21 +1538,21 @@ This function is intended for use with `ivy-ignore-buffers'." "Enable my favourite light theme." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'tangomod t) - (sml/apply-theme 'automatic) - (font-lock-remove-keywords - 'org-mode b/org-mode-font-lock-keywords) - (exwm-systemtray--refresh)) + (load-theme 'solarized-light t) + ;; (sml/apply-theme 'automatic) + ;; (font-lock-remove-keywords + ;; 'org-mode b/org-mode-font-lock-keywords) + (run-with-timer 0.01 nil 'exwm-systemtray--refresh)) (defun b/lights-off () "Go dark." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'doom-tomorrow-night t) - (sml/apply-theme 'automatic) - (font-lock-add-keywords - 'org-mode b/org-mode-font-lock-keywords t) - (exwm-systemtray--refresh)) + (load-theme 'solarized-dark t) + ;; (sml/apply-theme 'automatic) + ;; (font-lock-add-keywords + ;; 'org-mode b/org-mode-font-lock-keywords t) + (run-with-timer 0.01 nil 'exwm-systemtray--refresh)) (bind-keys ("C-c t d" . b/lights-off) @@ -1881,6 +1941,16 @@ This function is intended for use with `ivy-ignore-buffers'." (dmenu-prompt-string "run: ") (dmenu-save-file (b/var "dmenu-items"))) +(use-package eosd + ;; TODO: fix build by properly building the eosd-pixbuf.c module + ;; e.g. see https://github.com/raxod502/straight.el/issues/386 + :disabled + :straight (:host github :repo "clarete/eosd") + :demand + :after exwm + :config + (eosd-start)) + ;;; Email (with Gnus) @@ -2417,80 +2487,7 @@ https://csclub.uwaterloo.ca/~abandali") (add-to-list 'erc-modules 'notifications) (add-to-list 'erc-modules 'spelling) (add-to-list 'erc-modules 'scrolltoplace) - (erc-update-modules) - - (when (and (version<= "24.4" emacs-version) - (version< emacs-version "27")) - ;; fix erc-lurker bug - ;; patch submitted: https://bugs.gnu.org/36843#10 - ;; TODO: remove when patch is merged and emacs 27 is released - (defvar erc-message-parsed) - (defun erc-display-message (parsed type buffer msg &rest args) - "Display MSG in BUFFER. - -ARGS, PARSED, and TYPE are used to format MSG sensibly. - -See also `erc-format-message' and `erc-display-line'." - (let ((string (if (symbolp msg) - (apply #'erc-format-message msg args) - msg)) - (erc-message-parsed parsed)) - (setq string - (cond - ((null type) - string) - ((listp type) - (mapc (lambda (type) - (setq string - (erc-display-message-highlight type string))) - type) - string) - ((symbolp type) - (erc-display-message-highlight type string)))) - - (if (not (erc-response-p parsed)) - (erc-display-line string buffer) - (unless (erc-hide-current-message-p parsed) - (erc-put-text-property 0 (length string) 'erc-parsed parsed string) - (erc-put-text-property 0 (length string) 'rear-sticky t string) - (when (erc-response.tags parsed) - (erc-put-text-property 0 (length string) 'tags (erc-response.tags parsed) - string)) - (erc-display-line string buffer))))) - - (defun erc-lurker-update-status (_message) - "Update `erc-lurker-state' if necessary. - -This function is called from `erc-insert-pre-hook'. If the -current message is a PRIVMSG, update `erc-lurker-state' to -reflect the fact that its sender has issued a PRIVMSG at the -current time. Otherwise, take no action. - -This function depends on the fact that `erc-display-message' -lexically binds `erc-message-parsed', which is used to check if -the current message is a PRIVMSG and to determine its sender. -See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'. - -In order to limit memory consumption, this function also calls -`erc-lurker-cleanup' once every `erc-lurker-cleanup-interval' -updates of `erc-lurker-state'." - (when (and (boundp 'erc-message-parsed) - (erc-response-p erc-message-parsed)) - (let* ((command (erc-response.command erc-message-parsed)) - (sender - (erc-lurker-maybe-trim - (car (erc-parse-user (erc-response.sender erc-message-parsed))))) - (server - (erc-canonicalize-server-name erc-server-announced-name))) - (when (equal command "PRIVMSG") - (when (>= (cl-incf erc-lurker-cleanup-count) - erc-lurker-cleanup-interval) - (setq erc-lurker-cleanup-count 0) - (erc-lurker-cleanup)) - (unless (gethash server erc-lurker-state) - (puthash server (make-hash-table :test 'equal) erc-lurker-state)) - (puthash sender (current-time) - (gethash server erc-lurker-state)))))))) + (erc-update-modules)) (use-feature erc-fill :after erc @@ -2512,6 +2509,7 @@ updates of `erc-lurker-state'." (erc-track-enable-keybindings nil) (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT" "324" "329" "332" "333" "353" "477")) + (erc-track-position-in-mode-line t) (erc-track-priority-faces-only 'all) (erc-track-shorten-function nil))