From c3826f0c16e16965478a5dfc132158190775de70 Mon Sep 17 00:00:00 2001
From: Grant Shoshin Shangreaux <shoshin@cicadas.surf>
Date: Tue, 7 Feb 2023 19:59:00 -0600
Subject: Fix: slime contrib setup

---
 shoshimacs.el  |  8 +++-----
 shoshimacs.org | 28 ++++++++++++----------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/shoshimacs.el b/shoshimacs.el
index c9fa107..2246d07 100644
--- a/shoshimacs.el
+++ b/shoshimacs.el
@@ -195,7 +195,7 @@
     (shell-command "make clean" "*slime-make-info*")
     (shell-command "make slime.info" "*slime-make-info*")))
 
-(defvar slime-contribs
+(setq slime-contribs
   '(
     slime-fancy ;; default value, includes many fundamental contribs
     slime-mrepl
@@ -207,12 +207,10 @@
     slime-xref-browser
     slime-highlight-edits
     slime-quicklisp
-    )
-  "Additional SLIME packages to load on start.")
+    ))
 
 (require 'slime-autoloads)
-(require 'slime-asdf)
-(require 'slime-quicklisp)
+(slime-setup)
 
 (package-install 'json-mode)
 
diff --git a/shoshimacs.org b/shoshimacs.org
index 1726525..fa70167 100644
--- a/shoshimacs.org
+++ b/shoshimacs.org
@@ -691,8 +691,7 @@ from them in various Emacs menus. [[*\[\[info:consult#Top\]\[consult\]\] - Consu
 :PROPERTIES:
 :header-args:emacs-lisp: :noweb-ref programming :noweb-sep "\n\n" :results silent
 :END:
-** Languages
-*** Common Lisp
+** Common Lisp
 
 I primarily use SBCL, so I set it as the ~inferior-lisp-program~
 
@@ -700,7 +699,7 @@ I primarily use SBCL, so I set it as the ~inferior-lisp-program~
  (setq inferior-lisp-program "sbcl")
 #+end_src
 
-**** Slime
+*** Slime
 The ~slime~ package v2.26.1 in the nongnu repo seems to have an issue with
 emacs 28.1 (?) so I'm installing it from source.
 
@@ -731,7 +730,7 @@ _SLIME CONTRIBS_
 
 #+name: slime-contribs
 #+begin_src emacs-lisp
-  (defvar slime-contribs
+  (setq slime-contribs
     '(
       slime-fancy ;; default value, includes many fundamental contribs
       slime-mrepl
@@ -743,22 +742,20 @@ _SLIME CONTRIBS_
       slime-xref-browser
       slime-highlight-edits
       slime-quicklisp
-      )
-    "Additional SLIME packages to load on start.")
+      ))
 
   (require 'slime-autoloads)
-  (require 'slime-asdf)
-  (require 'slime-quicklisp)
+  (slime-setup)
 #+end_src
 
-*** Javascript
+** Javascript
 
 #+begin_src emacs-lisp
   (package-install 'json-mode)
 #+end_src
 
-*** Ruby
-**** Linting
+** Ruby
+*** Linting
 
 The Emacs ~ruby-mode~ defines a backend for flymake, which use rubocop by default
 if it is available. If it isn't, it will try ~ruby -wc~ which will check syntax
@@ -773,7 +770,7 @@ a bit. A few config variables are available, primarily for rubocop.
   (add-hook 'ruby-mode-hook #'flymake-mode)
 #+end_src
 
-**** inf-ruby
+*** inf-ruby
 
 inf-ruby provides an interface to the various REPLs available in the Ruby-verse
 its currently provided by non-gnu ELPA:
@@ -789,13 +786,13 @@ I prefer pry when its available, and it generally is on my system:
     (setq inf-ruby-default-implementation "pry"))
 #+end_src
 
-**** ruby-end
+*** ruby-end
 
 #+begin_src
   (package-install 'ruby-end)
 #+end_src
 
-**** TODO minitest-emacs
+*** TODO minitest-emacs
 
 this is a package i happen to maintain, and i would like to get it into non-gnu
 elpa. however, at the moment i must install from source:
@@ -812,7 +809,7 @@ elpa. however, at the moment i must install from source:
   (require 'minitest)
 #+end_src
 
-**** haml mode
+*** haml mode
 
 #+begin_src emacs-lisp
   (package-install 'haml-mode)
@@ -1159,7 +1156,6 @@ for theme development.
 (telephone-line-mode t)
 #+end_src
 
-
 ** SVG Screenshot
 
 #+begin_src emacs-lisp
-- 
cgit v1.2.3