X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/64e7d61578f5aa3b2d0c411e6cd39bc355e2d4e6..c361e41e77aa99a606d407f03aac86e8530481a7:/.emacs.d/init.el?ds=inline

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e6c6a14..d9ec432 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -60,9 +60,8 @@
   ;;    (debbugs "0.29")
   ;;    (delight "1.7")
   ;;    (emms "7.7")
-  ;;    (rt-liberation "2.4")
-  ;;    (yasnippet "0.14.0")))
-(package-initialize))
+  ;;    (rt-liberation "2.4")))
+  (package-initialize))
 
 (setq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa")
 
@@ -147,10 +146,9 @@
 (defalias 'yes-or-no-p #'y-or-n-p)
 
 (when (display-graphic-p)
+  ;; (set-frame-font "Source Code Pro-10.5:weight=medium" nil t)
+  ;; (set-frame-font "FreeSans" nil t)
   (set-fontset-font t 'arabic "Vazir"))
-;; ;; (set-frame-font "Drafting Mono-14:weight=light" nil t)
-;; (set-frame-font "Drafting Mono:pixelsize=16" nil t)
-;; (set-face-attribute 'bold nil :weight 'semi-bold)
 
 ;;;; Elisp-level customizations
 
@@ -158,21 +156,7 @@
   (setq read-file-name-completion-ignore-case t))
 
 ;; `startup'
-;; don't need to see the startup echo area message
-(advice-add #'display-startup-echo-area-message :override #'ignore)
-(setq
- auto-save-list-file-prefix (b/var "auto-save/sessions/")
- ;; i want *scratch* as my startup buffer
- initial-buffer-choice t
- ;; i don't need the default hint
- initial-scratch-message nil
- ;; use customizable text-mode as major mode for *scratch*
- ;; (initial-major-mode 'text-mode)
- ;; inhibit buffer list when more than 2 files are loaded
- inhibit-startup-buffer-menu t
- ;; don't need to see the startup screen or echo area message
- inhibit-startup-screen t
- inhibit-startup-echo-area-message user-login-name)
+(setq auto-save-list-file-prefix (b/var "auto-save/sessions/"))
 
 (with-eval-after-load 'files
   (setq
@@ -209,7 +193,7 @@
 (with-eval-after-load 'time
   (setq
    display-time-default-load-average nil
-   display-time-format " %a %b %-e %-l:%M%P"
+   display-time-format " %a %Y-%m-%d %-l:%M%P"
    display-time-mail-icon '(image :type xpm
                                   :file "gnus/gnus-pointer.xpm"
                                   :ascent center)
@@ -223,7 +207,7 @@
 
 (run-with-idle-timer 0.1 nil #'require 'battery)
 (with-eval-after-load 'battery
-  (setq battery-mode-line-format " %p%% %t")
+  (setq battery-mode-line-format " [%p%% %t]")
   (display-battery-mode))
 
 ;; (with-eval-after-load 'fringe
@@ -232,7 +216,19 @@
 
 (run-with-idle-timer 0.5 nil #'require 'winner)
 (with-eval-after-load 'winner
-  (winner-mode 1))
+  (winner-mode 1)
+  (when (featurep 'exwm)
+    ;; prevent a bad interaction between EXWM and winner-mode, where
+    ;; sometimes closing a window (like closing a terminal after
+    ;; entering a GPG password via pinentry-gnome3's floating window)
+    ;; results in a dead frame somewhere and effectively freezes EXWM.
+    (advice-add
+     'winner-insert-if-new
+     :around
+     (lambda (orig-fun &rest args)
+       ;; only add the frame if it's live
+       (when (frame-live-p (car args))
+         (apply orig-fun args))))))
 
 (run-with-idle-timer 0.5 nil #'require 'windmove)
 (with-eval-after-load 'windmove
@@ -288,8 +284,7 @@
 
 (with-eval-after-load 'ediff
   (setq ediff-window-setup-function 'ediff-setup-windows-plain
-        ediff-split-window-function 'split-window-horizontally)
-  (add-hook 'ediff-after-quit-hook-internal #'winner-undo))
+        ediff-split-window-function 'split-window-horizontally))
 
 (with-eval-after-load 'face-remap
   (setq
@@ -331,7 +326,9 @@
 (when (display-graphic-p)
   (with-eval-after-load 'faces
     (let ((grey "#e7e7e7"))
-      (set-face-attribute 'fixed-pitch nil :family "Source Code Pro")
+      (set-face-attribute 'fixed-pitch nil
+                          :font "Source Code Pro"
+                          :weight 'medium)
       (set-face-attribute 'mode-line nil
                           :background grey
                           :inherit 'fixed-pitch))))
@@ -389,16 +386,16 @@ For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)
   (setq mouse-autoselect-window nil))
 
-(defun b/move-indentation-or-beginning-of-line (arg)
-  "Move to the indentation or to the beginning of line."
-  (interactive "^p")
-  ;; (if (bolp)
-  ;;     (back-to-indentation)
-  ;;   (move-beginning-of-line arg))
-  (if (= (point)
-         (progn (back-to-indentation)
-                (point)))
-      (move-beginning-of-line arg)))
+;; (defun b/move-indentation-or-beginning-of-line (arg)
+;;   "Move to the indentation or to the beginning of line."
+;;   (interactive "^p")
+;;   ;; (if (bolp)
+;;   ;;     (back-to-indentation)
+;;   ;;   (move-beginning-of-line arg))
+;;   (if (= (point)
+;;          (progn (back-to-indentation)
+;;                 (point)))
+;;       (move-beginning-of-line arg)))
 
 (defun b/join-line-top ()
   "Like `join-line', but join next line to the current line."
@@ -432,13 +429,19 @@ Make N (default: 1) copies of the current line or region."
         (dotimes (_ (abs n1))
           (insert text))))))
 
-(defun b/invert-default-face ()
-  "Invert the `default' face (swap its background and foreground).
-Effectively a very simple light/dark theme toggle switch."
-  (interactive)
-  (invert-face 'default)
-  (when (display-graphic-p)
-    (invert-face 'mode-line)))
+(defun b/invert-default-face (arg)
+  "Invert the `default' and `mode-line' faces for the current frame.
+Swap the background and foreground for the two `default' and
+`mode-line' faces, effectively acting like a simple light/dark
+theme toggle.  If prefix argument ARG is given, invert the faces
+for all frames."
+  (interactive "P")
+  (let ((frame (unless arg
+                 (selected-frame))))
+    (invert-face 'default frame)
+    (invert-face 'mode-line frame))
+  (when (fboundp #'exwm-systemtray--refresh-background-color)
+    (exwm-systemtray--refresh-background-color 'remap)))
 
 (defun b/export-frame ()
   (interactive)
@@ -453,12 +456,12 @@ Effectively a very simple light/dark theme toggle switch."
 
 ;;; General key bindings
 
-(global-set-key (kbd "C-a") #'b/move-indentation-or-beginning-of-line)
-(global-set-key (kbd "C-c a i") #'ielm)
+;; (global-set-key (kbd "C-a") #'b/move-indentation-or-beginning-of-line)
+(global-set-key (kbd "C-c i") #'ielm)
 (global-set-key (kbd "C-c d") #'b/duplicate-line-or-region)
 (global-set-key (kbd "C-c j") #'b/join-line-top)
 (global-set-key (kbd "C-S-j") #'b/join-line-top)
-(global-set-key (kbd "C-c s") #'b/*scratch*)
+(global-set-key (kbd "C-c s c") #'b/*scratch*)
 (global-set-key (kbd "C-c x") #'execute-extended-command)
 (global-set-key (kbd "C-c v") #'b/invert-default-face)
 
@@ -499,7 +502,14 @@ Effectively a very simple light/dark theme toggle switch."
  (expand-file-name
   (convert-standard-filename "lisp") user-emacs-directory))
 
-;; (require 'bandali-exwm)
+(when
+    (and
+     (display-graphic-p)
+     ;; we're not running in another WM/DE
+     (not (getenv "XDG_CURRENT_DESKTOP"))
+     (member (system-name) '("chaman" "langa")))
+  (require 'bandali-exwm)
+  (global-set-key (kbd "C-x b") #'exwm-workspace-switch-to-buffer))
 
 (require 'bandali-org)
 
@@ -601,8 +611,8 @@ Effectively a very simple light/dark theme toggle switch."
         scpaste-scp-destination "p:~"))
 (autoload 'scpaste "scpaste" nil t)
 (autoload 'scpaste-region "scpaste" nil t)
-(global-set-key (kbd "C-c a p p") #'scpaste)
-(global-set-key (kbd "C-c a p r") #'scpaste-region)
+(global-set-key (kbd "C-c p p") #'scpaste)
+(global-set-key (kbd "C-c p r") #'scpaste-region)
 
 
 ;;; Editing
@@ -761,7 +771,6 @@ Effectively a very simple light/dark theme toggle switch."
 ;; ,----
 ;; | make pretty boxed quotes like this
 ;; `----
-(add-to-list 'load-path (b/lisp "boxquote"))
 (run-with-idle-timer 0.6 nil #'require 'boxquote)
 (with-eval-after-load 'boxquote
   (defvar b/boxquote-prefix-map)
@@ -788,37 +797,6 @@ Effectively a very simple light/dark theme toggle switch."
   (define-key b/boxquote-prefix-map (kbd "M-q") #'boxquote-fill-paragraph)
   (define-key b/boxquote-prefix-map (kbd "M-w") #'boxquote-kill-ring-save))
 
-(add-to-list 'load-path (b/lisp "hl-todo"))
-(run-with-idle-timer 0.5 nil #'require 'hl-todo)
-(with-eval-after-load 'hl-todo
-  ;; Highlight TODO in buffers.
-  (global-hl-todo-mode))
-
-(run-with-idle-timer 0.6 nil #'require 'yasnippet)
-(with-eval-after-load 'yasnippet
-  (declare-function yas-reload-all
-                    "yasnippet" (&optional no-jit interactive))
-  (declare-function yas-maybe-expand-abbrev-key-filter
-                    "yasnippet" (cmd))
-
-  (defconst yas-verbosity-cur yas-verbosity)
-  (setq yas-verbosity 2
-        yas-snippet-dirs `(,(b/etc "yasnippet/snippets")))
-  ;; (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
-  (yas-reload-all)
-  (setq yas-verbosity yas-verbosity-cur)
-
-  (defun b/yas-maybe-expand-abbrev-key-filter (cmd)
-    (when (and (yas-maybe-expand-abbrev-key-filter cmd)
-               (not (bound-and-true-p git-commit-mode)))
-      cmd))
-  (defconst b/yas-maybe-expand
-    '(menu-item "" yas-expand
-                :filter b/yas-maybe-expand-abbrev-key-filter))
-  (define-key yas-minor-mode-map (kbd "SPC") b/yas-maybe-expand)
-
-  (yas-global-mode))
-
 ;; `debbugs'
 (global-set-key (kbd "C-c D d") #'debbugs-gnu)
 (global-set-key (kbd "C-c D b") #'debbugs-gnu-bugs)
@@ -845,7 +823,7 @@ Effectively a very simple light/dark theme toggle switch."
   (setq
    eww-download-directory
    (file-name-as-directory (getenv "XDG_DOWNLOAD_DIR"))))
-(global-set-key (kbd "C-c a e w") #'eww)
+(global-set-key (kbd "C-c e w") #'eww)
 
 ;; (with-eval-after-load 'org-ref
 ;;   (setq
@@ -896,8 +874,7 @@ Effectively a very simple light/dark theme toggle switch."
 (with-eval-after-load 'delight
   (delight 'auto-fill-function " f" "simple")
   (delight 'abbrev-mode "" "abbrev")
-  (delight 'mml-mode " mml" "mml")
-  (delight 'yas-minor-mode "" "yasnippet"))
+  (delight 'mml-mode " mml" "mml"))
 
 (require 'bandali-po)