Remove cruft & fixes

master
Peter Ley 3 weeks ago
parent d7e79abcea
commit d3d7f8294a

@ -25,7 +25,7 @@
(column-number-mode)
(setq inhibit-splash-screen t
split-height-threshold 80
split-width-threshold 120
split-width-threshold 160
display-time-default-load-average nil
display-time-24hr-format t
fill-column 90)
@ -172,6 +172,7 @@ Why is this necessary for me to define? The world may never know."
("M-X" . execute-extended-command)
("C-h a" . helm-apropos)
("C-x C-f" . helm-find-files))
:custom (helm-split-window-preferred-function split-window-preferred-function)
:config (helm-mode 1))
(use-package org
@ -292,43 +293,3 @@ Why is this necessary for me to define? The world may never know."
(use-package lua-mode)
(use-package projectile)
(use-package jabber
:straight (jabber :type git
:host codeberg
:repo "emacs-jabber/emacs-jabber"
:fork (:repo "sghettipete/emacs-jabber")
:branch "pete"
:files ("elisp/*.el"
"jabber-ourversion.el"))
:custom
(jabber-account-list '(("pete@nessus.city")))
(jabber-chat-buffer-format "xmpp:%n")
(jabber-groupchat-buffer-format "xmpp-muc:%n")
(jabber-muc-private-buffer-format "xmpp-muc:%n")
(jabber-roster-buffer "xmpp:roster")
(jabber-process-buffer "xmpp:process")
(jabber-console-name-format "xmpp-console:%s")
(jabber-browse-buffer-format "xmpp-browse:%n")
(jabber-muc-print-names-format "%35n %10a %j\n")
(jabber-muc-header-line-format '((:eval (jabber-get-room-name)) " || " jabber-muc-topic))
(jabber-muc-colorize-foreign t)
(jabber-last-read-marker "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
:config
(when (fboundp 'jabber-chat-update-focus)
(add-hook 'window-configuration-change-hook #'jabber-chat-update-focus))
(add-hook 'jabber-post-connect-hooks 'jabber-enable-carbons 100)
(add-hook 'jabber-chat-mode-hook #'(lambda() (setq word-wrap t)))
(defun jabber-erase-all-activity ()
"Clear the activity list without looking at it"
(interactive)
(let ((jabber-activity-show-p (lambda(_) nil)))
(jabber-activity-clean)))
(defun jabber-get-room-name ()
"Return the user-friendly name of the room we're in"
(elt (caar (jabber-disco-get-info-immediately jabber-group nil)) 0))
:bind (("C-x C-j C-e" . jabber-erase-all-activity)))
(when-user-file-exists "local-init.el" (load it))

@ -173,7 +173,7 @@ Other bits and pieces:
(column-number-mode)
(setq inhibit-splash-screen t
split-height-threshold 80
split-width-threshold 120
split-width-threshold 160
display-time-default-load-average nil
display-time-24hr-format t
fill-column 90)
@ -331,6 +331,7 @@ Use helm for some basic tasks:
("M-X" . execute-extended-command)
("C-h a" . helm-apropos)
("C-x C-f" . helm-find-files))
:custom (helm-split-window-preferred-function split-window-preferred-function)
:config (helm-mode 1))
#+END_SRC
* org-mode
@ -496,47 +497,3 @@ prompting for a timestamp rather than arcane config options.
#+begin_src elisp
(use-package projectile)
#+end_src
* XMPP
#+begin_src elisp
(use-package jabber
:straight (jabber :type git
:host codeberg
:repo "emacs-jabber/emacs-jabber"
:fork (:repo "sghettipete/emacs-jabber")
:branch "pete"
:files ("elisp/*.el"
"jabber-ourversion.el"))
:custom
(jabber-account-list '(("pete@nessus.city")))
(jabber-chat-buffer-format "xmpp:%n")
(jabber-groupchat-buffer-format "xmpp-muc:%n")
(jabber-muc-private-buffer-format "xmpp-muc:%n")
(jabber-roster-buffer "xmpp:roster")
(jabber-process-buffer "xmpp:process")
(jabber-console-name-format "xmpp-console:%s")
(jabber-browse-buffer-format "xmpp-browse:%n")
(jabber-muc-print-names-format "%35n %10a %j\n")
(jabber-muc-header-line-format '((:eval (jabber-get-room-name)) " || " jabber-muc-topic))
(jabber-muc-colorize-foreign t)
(jabber-last-read-marker "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
:config
(when (fboundp 'jabber-chat-update-focus)
(add-hook 'window-configuration-change-hook #'jabber-chat-update-focus))
(add-hook 'jabber-post-connect-hooks 'jabber-enable-carbons 100)
(add-hook 'jabber-chat-mode-hook #'(lambda() (setq word-wrap t)))
(defun jabber-erase-all-activity ()
"Clear the activity list without looking at it"
(interactive)
(let ((jabber-activity-show-p (lambda(_) nil)))
(jabber-activity-clean)))
(defun jabber-get-room-name ()
"Return the user-friendly name of the room we're in"
(elt (caar (jabber-disco-get-info-immediately jabber-group nil)) 0))
:bind (("C-x C-j C-e" . jabber-erase-all-activity)))
#+end_src
* Machine specific init
#+begin_src elisp
(when-user-file-exists "local-init.el" (load it))
#+end_src

Loading…
Cancel
Save