Fix sh-mode package name (it's sh-script)

[~bandali/configs] / init.el

diff --git a/init.el b/init.el
index 57861bb..23158a1 100644 (file)
--- a/init.el
+++ b/init.el
@@ -651,16 +651,21 @@ For disabling the behaviour for certain buffers and/or modes."
 (require 'bandali-message)
 (require 'bandali-ebdb)
 
+;; IRC (with ERC and ZNC)
+(require 'bandali-erc)
+
 \f
 ;;; Editing
-(comment
+
 ;; highlight uncommitted changes in the left fringe
 (use-package diff-hl
   :defer 0.6
   :config
   (setq diff-hl-draw-borders nil)
   (global-diff-hl-mode)
-  :hook (magit-post-refresh . diff-hl-magit-post-refresh))
+  :hook
+  ((magit-pre-refresh . diff-hl-magit-pre-refresh)
+   (magit-post-refresh . diff-hl-magit-post-refresh)))
 
 ;; display Lisp objects at point in the echo area
 (use-package eldoc
@@ -711,8 +716,8 @@ For disabling the behaviour for certain buffers and/or modes."
 (use-package conf-mode
   :mode "\\.*rc$")
 
-(use-package sh-mode
-  :mode "\\.bashrc$")
+(use-package sh-script
+  :mode ("\\.bashrc$" . sh-mode))
 
 (use-package company
   :disabled
@@ -732,6 +737,7 @@ For disabling the behaviour for certain buffers and/or modes."
   ;; (global-company-mode t)
   )
 
+(comment
 (use-package flycheck
   :defer 0.6
   :hook (prog-mode . flycheck-mode)
@@ -1367,82 +1373,6 @@ For disabling the behaviour for certain buffers and/or modes."
                            (getenv "XDG_DOWNLOAD_DIR"))))
 
 \f
-;;; IRC (with ERC and ZNC)
-
-(use-package erc
-  :bind (("C-c b b" . erc-switch-to-buffer)
-         :map erc-mode-map
-         ("M-a" . erc-track-switch-buffer))
-  :custom
-  (erc-join-buffer 'bury)
-  (erc-lurker-hide-list '("JOIN" "PART" "QUIT"))
-  (erc-nick "bandali")
-  (erc-prompt "erc>")
-  (erc-rename-buffers t)
-  (erc-server-reconnect-attempts 5)
-  (erc-server-reconnect-timeout 3)
-  :config
-  (defun erc-cmd-OPME ()
-    "Request chanserv to op me."
-    (erc-message "PRIVMSG"
-                 (format "chanserv op %s %s"
-                         (erc-default-target)
-                         (erc-current-nick)) nil))
-  (defun erc-cmd-DEOPME ()
-    "Deop myself from current channel."
-    (erc-cmd-DEOP (format "%s" (erc-current-nick))))
-  (add-to-list 'erc-modules 'keep-place)
-  (add-to-list 'erc-modules 'notifications)
-  (add-to-list 'erc-modules 'smiley)
-  (add-to-list 'erc-modules 'spelling)
-  (add-to-list 'erc-modules 'scrolltoplace)
-  (erc-update-modules))
-
-(use-package erc-fill
-  :after erc
-  :custom
-  (erc-fill-column 77)
-  (erc-fill-function 'erc-fill-static)
-  (erc-fill-static-center 18))
-
-(use-package erc-pcomplete
-  :after erc
-  :custom
-  (erc-pcomplete-nick-postfix ", "))
-
-(use-package erc-track
-  :after erc
-  :bind (("C-c a e t d" . erc-track-disable)
-         ("C-c a e t e" . erc-track-enable))
-  :custom
-  (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))
-
-(use-package erc-hl-nicks
-  :after erc)
-
-(use-package erc-scrolltoplace
-  :after erc)
-
-(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
-             ((oftc "amin/oftc" ,pwd)))))))
-
-\f
 ;;; Post initialization
 
 )