Add: orderless and Fix: broken tangle

2 files changed, 53 insertions, 15 deletions

diff --git a/shoshimacs.el b/shoshimacs.el
index 76741d3..fec63b2 100644
--- a/shoshimacs.el
+++ b/shoshimacs.el
@@ -92,8 +92,10 @@
   <f1> my-reload-config)
 
 ;;; Completion
-(setq completion-styles '(flex basic partial-completion emacs22)
-      completion-cycle-threshold 3
+(setq completion-styles '(orderless basic)
+      completion-category-overrides '((file (styles basic partial-completion))))
+
+(setq completion-cycle-threshold 3
       tab-always-indent 'complete)
 
 (package-install 'consult)
@@ -202,6 +204,8 @@
 
 (package-install 'sly)
 
+(package-install 'sly-quicklisp)
+
 (package-install 'json-mode)
 
 (add-hook 'ruby-mode-hook #'flymake-mode)
@@ -230,6 +234,7 @@
 (package-install 'magit)
 
 ;; Applications
+(package-install 'emms)
 (require 'emms-setup)
 (emms-all)
 (setq emms-player-list '(emms-player-mpv))
@@ -295,19 +300,20 @@
 
 (package-install 'autothemer)
 
+(package-install 'telephone-line)
 (setq telephone-line-lhs
       '((evil   . (telephone-line-evil-tag-segment))
-	(accent . (telephone-line-vc-segment
-		   telephone-line-erc-modified-channels-segment
-		   telephone-line-process-segment))
-	(nil    . (
-		   ;; telephone-line-minor-mode-segment
-		   telephone-line-buffer-segment))))
+        (accent . (telephone-line-vc-segment
+                   telephone-line-erc-modified-channels-segment
+                   telephone-line-process-segment))
+        (nil    . (
+                   ;; telephone-line-minor-mode-segment
+                   telephone-line-buffer-segment))))
 (setq telephone-line-rhs
       '((nil    . (telephone-line-misc-info-segment
-		   telephone-line-flymake-segment))
-	(accent . (telephone-line-major-mode-segment))
-	(evil   . (telephone-line-airline-position-segment))))
+                   telephone-line-flymake-segment))
+        (accent . (telephone-line-major-mode-segment))
+        (evil   . (telephone-line-airline-position-segment))))
 
 (telephone-line-mode t)
 (set-face-background 'telephone-line-evil-normal "deep pink")
diff --git a/shoshimacs.org b/shoshimacs.org
index 4402338..b030321 100644
--- a/shoshimacs.org
+++ b/shoshimacs.org
@@ -417,12 +417,32 @@ all the styles you'd like to use. It starts at the front, and if no matches
 are found, moves to the next style of completion. In this config, I just
 added =flex= to the front of the default completion styles.
 
+*** COMMENT Built-in
+
 #+begin_src emacs-lisp
-  (setq completion-styles '(flex basic partial-completion emacs22)
-	completion-cycle-threshold 3
-	tab-always-indent 'complete)
+    (setq completion-styles '(flex basic partial-completion emacs22))
 #+end_src
 
+*** Orderless
+
+[[info:orderless#Top][Orderless Manual]]
+
+#+begin_quote
+This package provides an ‘orderless’ _completion style_ that divides the
+pattern into space-separated components, and matches candidates that
+match all of the components in any order.  Each component can match in
+any one of several ways: literally, as a regexp, as an initialism, in
+the flex style, or as multiple word prefixes.  By default, regexp and
+literal matches are enabled.
+#+end_quote
+
+#+begin_src emacs-lisp
+  (setq completion-styles '(orderless basic)
+	completion-category-overrides '((file (styles basic partial-completion))))
+#+end_src
+
+*** Additional config
+
 ~completion-cycle-threshold~ defines when you want to just cycle through
 alternatives on each <TAB> (or whatever key you use) rather than presenting
 options. Setting it to 3 means if my options are "FOO, FOP, FOR" or less,
@@ -435,6 +455,11 @@ hitting complete will change FOO->FOP, FOP->FOR, FOR->FOO.
   was already indented, then try to complete the thing at point.
 #+end_quote
 
+#+begin_src emacs-lisp
+  (setq completion-cycle-threshold 3
+	tab-always-indent 'complete)
+#+end_src
+
 ** [[info:consult#Top][consult]] - Consulting [[info:elisp#Minibuffer Completion][completing-read]]
 
 consult offers enhanced completion similar to ivy and helm, but with the
@@ -785,6 +810,13 @@ I primarily use SBCL, so I set it as the ~inferior-lisp-program~
   (package-install 'sly)
 #+end_src
 
+**** Sly Contribs
+
+#+begin_src emacs-lisp
+  (package-install 'sly-quicklisp)
+#+end_src
+
+
 *** COMMENT 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.
@@ -1339,7 +1371,7 @@ Saves to a temp file and puts the filename in the kill ring."
 
 #+begin_src emacs-lisp
   (package-install 'windresize)
-#+en
+#+end_src
 
 * COMMENT scratch