X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/7f8a10114684cd7b324b9af8b7af2c1d6a815a98..c21be729603a719d7b1bf50f551c5214748cba78:/.emacs.d/init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4219bdf..6ead09b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -122,7 +122,7 @@
 
 ;;; 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
@@ -1036,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
@@ -2492,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\\)"))
@@ -2726,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)))))))
 
 
 ;;; Post initialization