From ccff884113100bf42cb330d8feccbbd4a82d45e6 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Fri, 17 Dec 2021 18:31:24 -0600
Subject: Bunches o changes

I was gonna try to like, make these atomic, but oops
---
 lisp/+browse-url.el |  1 +
 lisp/+circe.el      |  7 +++++++
 lisp/+emacs.el      | 13 +++++++------
 lisp/+modeline.el   | 11 +++++++++--
 lisp/+org.el        |  6 ++++++
 lisp/+scratch.el    |  2 +-
 6 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'lisp')

diff --git a/lisp/+browse-url.el b/lisp/+browse-url.el
index fad0826..d073d50 100644
--- a/lisp/+browse-url.el
+++ b/lisp/+browse-url.el
@@ -2,6 +2,7 @@
 
 ;;; Code:
 
+(require 'browse-url)
 (require 'cl-lib)
 
 (defgroup +browse-url nil
diff --git a/lisp/+circe.el b/lisp/+circe.el
index fc8d0be..7b11ce2 100644
--- a/lisp/+circe.el
+++ b/lisp/+circe.el
@@ -86,6 +86,13 @@ message the current topic.")
     (with-current-buffer buf
       (+circe-quit@kill-buffer))))
 
+(defun +circe-quit-all@kill-emacs ()
+  "Quit all circe buffers when killing Emacs."
+  (ignore-errors
+    (advice-remove 'circe-command-GQUIT
+                   'circe-gquit@kill-buffer)
+    (circe-command-GQUIT "Quitting Emacs, bye!")))
+
 ;;; Patches
 
 (require 'el-patch)
diff --git a/lisp/+emacs.el b/lisp/+emacs.el
index a858cf6..15e23da 100644
--- a/lisp/+emacs.el
+++ b/lisp/+emacs.el
@@ -101,6 +101,7 @@ Do this only if the buffer is not visiting a file."
  show-paren-style 'mixed
  show-paren-when-point-in-periphery t
  show-paren-when-point-inside-paren t
+ tab-bar-show 1
  tramp-backup-directory-alist backup-directory-alist
  use-dialog-box nil
  use-file-dialog nil
@@ -231,12 +232,12 @@ Do this only if the buffer is not visiting a file."
 		save-place-forget-unreadable-files (eq system-type 'gnu/linux))
   (save-place-mode +1))
 
-(when (require 'tramp)
-  ;; thanks Irreal! https://irreal.org/blog/?p=895
-  (add-to-list 'tramp-default-proxies-alist
-               '(nil "\\`root\\'" "/ssh:%h:"))
-  (add-to-list 'tramp-default-proxies-alist
-               '((regexp-quote (system-name)) nil nil)))
+;; (when (require 'tramp)
+;;   ;; thanks Irreal! https://irreal.org/blog/?p=895
+;;   (add-to-list 'tramp-default-proxies-alist
+;;                '(nil "\\`root\\'" "/ssh:%h:"))
+;;   (add-to-list 'tramp-default-proxies-alist
+;;                '((regexp-quote (system-name)) nil nil)))
 
 (provide '+emacs)
 ;;; +emacs.el ends here
diff --git a/lisp/+modeline.el b/lisp/+modeline.el
index 7c74f76..7615ea7 100644
--- a/lisp/+modeline.el
+++ b/lisp/+modeline.el
@@ -20,7 +20,7 @@
 (defun +modeline-buffer-name ()         ; gonsie
   "Display the buffer name."
   (propertize
-   (+string-align (buffer-name) 20 :before " " :ellipsis "… ")
+   (+string-align (buffer-name) 20 :before " " :ellipsis "~ ")
    'face 'bold
    'help-echo (or (buffer-file-name)
                   (buffer-name))
@@ -49,7 +49,7 @@
   "Display the current `major-mode'."
   (concat " "
           (propertize (+string-truncate (format-mode-line mode-name)
-                                        12 "…")
+                                        12 "~")
                       'face 'bold
                       'keymap mode-line-major-mode-keymap
                       'mouse-face 'mode-line-highlight)))
@@ -108,6 +108,7 @@ The order of elements matters: whichever one matches first is applied."
                                            "mouse-2: widen buffer.")
                         'local-map (purecopy (simple-modeline-make-mouse-map
                                               'mouse-2 'mode-line-widen))
+                        'face 'font-lock-doc-face
                         'mouse-face 'mode-line-highlight))))
 
 (define-minor-mode file-percentage-mode
@@ -161,5 +162,11 @@ The order of elements matters: whichever one matches first is applied."
     (format (if (> text-scale-mode-amount 0) " (%+d)" " (%-d)")
             text-scale-mode-amount)))
 
+(defun +modeline-ace-window-display ()
+  "Display `ace-window-display-mode' information in the modeline."
+  '(+ace-window-display-mode
+    (ace-window-mode
+     (" " (:eval (window-parameter (selected-window) 'ace-window-path))))))
+
 (provide '+modeline)
 ;;; +modeline.el ends here
diff --git a/lisp/+org.el b/lisp/+org.el
index 9a91ef1..5631fed 100644
--- a/lisp/+org.el
+++ b/lisp/+org.el
@@ -392,5 +392,11 @@ the deletion might narrow the column."
                              'face '+org-script-markers)))
       t)))
 
+;; Extra link types
+
+(defun +org-tel-open (number _)
+  "Notify the user of what phone NUMBER to call."
+  (message "Call: %s" number))
+
 (provide '+org)
 ;;; +org.el ends here
diff --git a/lisp/+scratch.el b/lisp/+scratch.el
index 976b08c..2a89a95 100644
--- a/lisp/+scratch.el
+++ b/lisp/+scratch.el
@@ -2,7 +2,7 @@
 
 ;;; Code:
 
-(require 'scratch)
+;;(require 'scratch)
 
 (defun +scratch-immortal ()
   "Bury, don't kill \"*scratc*\" buffer.
-- 
cgit 1.4.1-21-gabe81