switch to exwm on chaman

[~bandali/configs] / .emacs.d / init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 46dd998..6ead09b 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -122,7 +122,7 @@
 \f
 ;;; Initial setup
 
-(defvar b/exwm-p (string= (system-name) "jirud")
+(defvar b/exwm-p (string= (system-name) "chaman")
   "Whether or not we will be using `exwm'.")
 
 ;; keep ~/.emacs.d clean
@@ -226,6 +226,12 @@ For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)
   (setq mouse-autoselect-window nil))
 
+(defun b/kill-current-buffer ()
+  "Kill the current buffer."
+  ;; also see https://redd.it/64xb3q
+  (interactive)
+  (kill-buffer (current-buffer)))
+
 \f
 ;;; Defaults
 
@@ -497,7 +503,7 @@ For disabling the behaviour for certain buffers and/or modes."
  ("C-S-h C" . describe-char)
  ("C-S-h F" . describe-face)
 
- ("C-x k"   . kill-this-buffer)
+ ("C-x k"   . b/kill-current-buffer)
  ("C-x K"   . kill-buffer)
  ("C-x s"   . save-buffer)
  ("C-x S"   . save-some-buffers)
@@ -851,7 +857,7 @@ around if needed."
   ;;                         'magit-insert-untracked-files
   ;;                         'append)
   (setq magit-repository-directories '(("~/" . 0)
-                                       ("~/src/git/" . 1)))
+                                       ("~/src/git/" . 2)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
@@ -1030,8 +1036,12 @@ This function is intended for use with `ivy-ignore-buffers'."
                ("C-S-l" . b/eshell-clear)
                ("M-r"   . counsel-esh-history)
                ;; ([tab]   . company-complete)
-               :map eshell-hist-mode-map
-               ("M-r" . counsel-esh-history)))
+               )
+    (if (version< "27" emacs-version)
+        (bind-keys :map eshell-hist-mode-map
+                   ("M-r" . counsel-esh-history))
+      (bind-keys :map eshell-mode-map
+                 ("M-r" . counsel-esh-history))))
 
   :hook (eshell-mode . b/eshell-setup)
   :custom
@@ -2414,7 +2424,7 @@ Cheriton School of Computer Science
 University of Waterloo
 https://bandali.eu.org")
   (defvar b/csc-signature "Amin Bandali
-Systems Committee
+System Administrator, Systems Committee
 Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-message-replysign t
@@ -2486,7 +2496,8 @@ https://csclub.uwaterloo.ca/~abandali")
 
 (use-package mm-uu
   :config
-  (set-face-attribute 'mm-uu-extract nil :extend t)
+  (when (version< "27" emacs-version)
+    (set-face-attribute 'mm-uu-extract nil :extend t))
   :custom
   (mm-uu-diff-groups-regexp
    "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))
@@ -2720,22 +2731,21 @@ https://csclub.uwaterloo.ca/~abandali")
 (use-package erc-scrolltoplace
   :after erc)
 
-;; (use-package znc
-;;   :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el")
-;;   :bind (("C-c a e e" . znc-erc)
-;;          ("C-c a e a" . znc-all))
-;;   :config
-;;   (let ((pwd (let ((auth (auth-source-search :host "znca")))
-;;                (cond
-;;                 ((null auth) (error "Couldn't find znca's authinfo"))
-;;                 (t (funcall (plist-get (car auth) :secret)))))))
-;;     (setq znc-servers
-;;           `(("znc.shemshak.org" 1337 t
-;;              ((freenode "amin/freenode" ,pwd)))
-;;             ("znc.shemshak.org" 1337 t
-;;              ((moznet "amin/moznet" ,pwd)))
-;;             ("znc.shemshak.org" 1337 t
-;;              ((oftc "amin/oftc" ,pwd)))))))
+(use-package znc
+  :bind (("C-c a e e" . znc-erc)
+         ("C-c a e a" . znc-all))
+  :config
+  (let ((pwd (let ((auth (auth-source-search :host "znca")))
+               (cond
+                ((null auth) (error "Couldn't find znca's authinfo"))
+                (t (funcall (plist-get (car auth) :secret)))))))
+    (setq znc-servers
+          `(("znc.shemshak.org" 1337 t
+             ((freenode "amin/freenode" ,pwd)))
+            ("znc.shemshak.org" 1337 t
+             ((moznet "amin/moznet" ,pwd)))
+            ("znc.shemshak.org" 1337 t
+             ((oftc "amin/oftc" ,pwd)))))))
 
 \f
 ;;; Post initialization