commit bd12eb57261fb8405e60bc950455c4b1884a2122
Author: Simon Watson <spw01@protonmail.com>
Date:   Thu Mar 2 09:00:38 2023 -0500

    Fixing a few emacs things

diff --git a/bashrc/bashrc-all b/bashrc/bashrc-all
index 6ed18e4..b6a7265 100644
--- a/bashrc/bashrc-all
+++ b/bashrc/bashrc-all
@@ -69,7 +69,7 @@ vim()
 	if [[ "$(ps aux | grep -v grep | grep emacs)" ]];
 	then
 		# using anemic term/color/etc as it's faster in emacs
-		TERM=tmux emacsclient $1 &
+		TERM=xterm-color emacsclient $1 &
 		export EDITOR="emacsclient -c"
 	else
 		VIM_PATH=$(which vim)
diff --git a/emacs/.emacs-all b/emacs/.emacs-all
index 73f9428..5421ee8 100644
--- a/emacs/.emacs-all
+++ b/emacs/.emacs-all
@@ -51,18 +51,18 @@
 (setq epa-pinentry-mode 'loopback)
 
 ;; newlisp mode
-(straight-use-package
- '(newlisp-mode
-   :type git :host github
-   :repo "may/newlisp-mode"))
-;; Straight weirdly doesn't resolve this correctly
-(load-file "~/.emacs.d/straight/repos/newlisp-mode/newlisp.el")
+;; (straight-use-package
+;;  '(newlisp-mode
+;;    :type git :host github
+;;    :repo "may/newlisp-mode"))
+;; ;; Straight weirdly doesn't resolve this correctly
+;; (load-file "~/.emacs.d/straight/repos/newlisp-mode/newlisp.el")
 
 ;; Mastodon
-(straight-use-package
- '(mastodon
-   :type git :host nil
-   :repo "https://codeberg.org/martianh/mastodon.el"))
+;; (straight-use-package
+;;  '(mastodon
+;;    :type git :host nil
+;;    :repo "https://codeberg.org/martianh/mastodon.el"))
 
 ;; Gopher browser
 (straight-use-package 'elpher)
@@ -93,9 +93,9 @@
 (global-set-key (kbd "C-c C-a") 'vterm-send-C-a) ; Screen prefix
 
 ;;; Syntax highlights for uxn-tal
-(straight-use-package
- '(tal-mode :type git :host github
-   :repo "rafapaezbas/uxntal-mode"))
+;; (straight-use-package
+;;  '(tal-mode :type git :host github
+;;    :repo "rafapaezbas/uxntal-mode"))
 
 ;; Haskell Mode
 (straight-use-package 'haskell-mode)
@@ -439,22 +439,3 @@
 				      (shell-command-on-region (point) (mark) "xclip -selection clipboard")))
     (load (expand-file-name "~/quicklisp/slime-helper.el"))
     (setq inferior-lisp-program (locate-file "sbcl" exec-path exec-suffixes 1))))
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-   '("ab058aa22bdaf17b5d8a9e21632a62c8966728ae10ef8fd07e95637e9cdf7a7b" "f0eb51d80f73b247eb03ab216f94e9f86177863fb7e48b44aacaddbfe3357cf1" "4c56af497ddf0e30f65a7232a8ee21b3d62a8c332c6b268c81e9ea99b11da0d3" "fee7287586b17efbfda432f05539b58e86e059e78006ce9237b8732fde991b4c" "2809bcb77ad21312897b541134981282dc455ccd7c14d74cc333b6e549b824f3" "c433c87bd4b64b8ba9890e8ed64597ea0f8eb0396f4c9a9e01bd20a04d15d358" "0fffa9669425ff140ff2ae8568c7719705ef33b7a927a0ba7c5e2ffcfac09b75" "01106ca9b4446341ecb86a76b9db48f1100e2eb13980aa0ec6f6adf8e69fd9a7" default))
- '(display-time-mode t)
- '(frame-background-mode 'dark))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(default ((t (:family "Envy Code R" :foundry "UNKN" :slant normal :weight normal :height 100 :width normal))))
- '(org-level-1 ((t (:inherit variable-pitch :foreground "#cb4b16" :height 1.0))))
- '(org-level-2 ((t (:inherit variable-pitch :foreground "#859900" :height 1.0))))
- '(org-level-3 ((t (:inherit variable-pitch :foreground "#268bd2" :height 1.0))))
- '(org-level-4 ((t (:inherit variable-pitch :foreground "#b58900" :height 1.0)))))
diff --git a/emacs/linux-load/customs.el b/emacs/linux-load/customs.el
index 2978419..5a465aa 100644
--- a/emacs/linux-load/customs.el
+++ b/emacs/linux-load/customs.el
@@ -4,7 +4,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("4c56af497ddf0e30f65a7232a8ee21b3d62a8c332c6b268c81e9ea99b11da0d3" "fee7287586b17efbfda432f05539b58e86e059e78006ce9237b8732fde991b4c" "2809bcb77ad21312897b541134981282dc455ccd7c14d74cc333b6e549b824f3" "c433c87bd4b64b8ba9890e8ed64597ea0f8eb0396f4c9a9e01bd20a04d15d358" "0fffa9669425ff140ff2ae8568c7719705ef33b7a927a0ba7c5e2ffcfac09b75" "01106ca9b4446341ecb86a76b9db48f1100e2eb13980aa0ec6f6adf8e69fd9a7" default))
+   '("ab058aa22bdaf17b5d8a9e21632a62c8966728ae10ef8fd07e95637e9cdf7a7b" "f0eb51d80f73b247eb03ab216f94e9f86177863fb7e48b44aacaddbfe3357cf1" "4c56af497ddf0e30f65a7232a8ee21b3d62a8c332c6b268c81e9ea99b11da0d3" "fee7287586b17efbfda432f05539b58e86e059e78006ce9237b8732fde991b4c" "2809bcb77ad21312897b541134981282dc455ccd7c14d74cc333b6e549b824f3" "c433c87bd4b64b8ba9890e8ed64597ea0f8eb0396f4c9a9e01bd20a04d15d358" "0fffa9669425ff140ff2ae8568c7719705ef33b7a927a0ba7c5e2ffcfac09b75" "01106ca9b4446341ecb86a76b9db48f1100e2eb13980aa0ec6f6adf8e69fd9a7" default))
  '(display-time-mode t)
  '(frame-background-mode 'dark))
 (custom-set-faces