diff --git a/.config/doom/config.el b/.config/doom/config.el
index 60b3ea5..0e84d7d 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -240,7 +240,23 @@ List of keybindings (SPC h b b)")
       erc-fill-static-center 20)
 
 (map! :leader
-      (:prefix ("e". "evaluate/EWW")
+      (:prefix ("e". "evaluate/ERC/EWW")
+       :desc "Launch ERC with TLS connection" "E" #'erc-tls))
+
+(setq erc-server "irc.libera.chat"
+      erc-nick "distrotube"
+      erc-user-full-name "Derek Taylor"
+      erc-track-shorten-start 24
+      erc-autojoin-channels-alist '(("irc.libera.chat" "#unixtube" "#distrotube"))
+      erc-kill-buffer-on-part t
+      erc-fill-column 100
+      erc-fill-function 'erc-fill-static
+      erc-fill-static-center 20
+      ;; erc-auto-query 'bury
+      )
+
+(map! :leader
+      (:prefix ("e". "evaluate/ERC/EWW")
        :desc "Evaluate elisp in buffer" "b" #'eval-buffer
        :desc "Evaluate defun" "d" #'eval-defun
        :desc "Evaluate elisp expression" "e" #'eval-expression
@@ -251,7 +267,7 @@ List of keybindings (SPC h b b)")
 (map! :leader
       :desc "Search web for text between BEG/END"
       "s w" #'eww-search-words
-      (:prefix ("e" . "evaluate/EWW")
+      (:prefix ("e" . "evaluate/ERC/EWW")
        :desc "Eww web browser" "w" #'eww
        :desc "Eww reload page" "R" #'eww-reload))
 
diff --git a/.config/doom/config.org b/.config/doom/config.org
index a6c1473..942cfb9 100644
--- a/.config/doom/config.org
+++ b/.config/doom/config.org
@@ -472,6 +472,7 @@ Emojify is an Emacs extension to display emojis. It can display github style emo
   :hook (after-init . global-emojify-mode))
 #+end_src
 
+<<<<<<< HEAD
 
 * ERC
 
@@ -493,6 +494,33 @@ Emojify is an Emacs extension to display emojis. It can display github style emo
 #+RESULTS:
 : 20
 
+=======
+* ERC
+ERC is a built-in Emacs IRC client.
+
+| COMMAND | DESCRIPTION                                 | KEYBINDING |
+|---------+---------------------------------------------+------------|
+| erc-tls | /Launch ERC using more secure TLS connection/ | SPC e E    |
+
+#+begin_src emacs-lisp
+(map! :leader
+      (:prefix ("e". "evaluate/ERC/EWW")
+       :desc "Launch ERC with TLS connection" "E" #'erc-tls))
+
+(setq erc-server "irc.libera.chat"
+      erc-nick "distrotube"
+      erc-user-full-name "Derek Taylor"
+      erc-track-shorten-start 24
+      erc-autojoin-channels-alist '(("irc.libera.chat" "#unixtube" "#distrotube"))
+      erc-kill-buffer-on-part t
+      erc-fill-column 100
+      erc-fill-function 'erc-fill-static
+      erc-fill-static-center 20
+      ;; erc-auto-query 'bury
+      )
+
+#+end_src
+>>>>>>> 53366eb61baa128bdedd2bfc2951c589719065d1
 * EVALUATE ELISP EXPRESSIONS
 Changing some keybindings from their defaults to better fit with Doom Emacs, and to avoid conflicts with my window managers which sometimes use the control key in their keybindings.  By default, Doom Emacs does not use 'SPC e' for anything, so I choose to use the format 'SPC e' plus 'key' for these (I also use 'SPC e' for 'eww' keybindings).
 
@@ -506,7 +534,7 @@ Changing some keybindings from their defaults to better fit with Doom Emacs, and
 
 #+Begin_src emacs-lisp
 (map! :leader
-      (:prefix ("e". "evaluate/EWW")
+      (:prefix ("e". "evaluate/ERC/EWW")
        :desc "Evaluate elisp in buffer" "b" #'eval-buffer
        :desc "Evaluate defun" "d" #'eval-defun
        :desc "Evaluate elisp expression" "e" #'eval-expression
@@ -522,7 +550,7 @@ EWW is the Emacs Web Wowser, the builtin browser in Emacs.  Below I set urls to
 (map! :leader
       :desc "Search web for text between BEG/END"
       "s w" #'eww-search-words
-      (:prefix ("e" . "evaluate/EWW")
+      (:prefix ("e" . "evaluate/ERC/EWW")
        :desc "Eww web browser" "w" #'eww
        :desc "Eww reload page" "R" #'eww-reload))
 #+END_SRC
diff --git a/.config/doom/init.el b/.config/doom/init.el
index e61f50c..84d6d21 100644
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -161,7 +161,7 @@
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh               ; she sells {ba,z,fi}sh shells on the C xor