From 7e980fbb772f628f3a8b7989a09f8ddf429b8e36 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Tue, 8 Sep 2020 09:09:07 +0200
Subject: [PATCH] Nyxt: Update post 2-pre-release-1.

---
 .config/nyxt/init.lisp | 98 ++++++++++++++++++++++++++----------------
 1 file changed, 60 insertions(+), 38 deletions(-)

diff --git a/.config/nyxt/init.lisp b/.config/nyxt/init.lisp
index fac9dca7..50b98419 100644
--- a/.config/nyxt/init.lisp
+++ b/.config/nyxt/init.lisp
@@ -89,26 +89,9 @@
 (define-configuration nyxt/blocker-mode:blocker-mode
   ((nyxt/blocker-mode:hostlists (append (list *my-blocked-hosts*) %slot-default))))
 
-(define-mode my-blocker-mode (nyxt/blocker-mode:blocker-mode)
-  "Blocker mode with custom hosts from `*my-blocked-hosts*'."
-  ((nyxt/blocker-mode:hostlists :initform (list *my-blocked-hosts* nyxt/blocker-mode:*default-hostlist*))))
-
-(define-configuration buffer
-  ((default-modes (append
-                   '(my-mode
-                     auto-mode
-                     noimage-mode
-                     noscript-mode
-                     force-https-mode
-                     proxy-mode
-                     my-blocker-mode
-                     vi-normal-mode)
-                   %slot-default))
-   (request-resource-hook
-    (reduce #'hooks:add-hook
-            (list magnet-handler
-                  old-reddit-handler)
-            :initial-value %slot-default))))
+;; (define-mode my-blocker-mode (nyxt/blocker-mode:blocker-mode)
+;;   "Blocker mode with custom hosts from `*my-blocked-hosts*'."
+;;   ((nyxt/blocker-mode:hostlists :initform (list *my-blocked-hosts* nyxt/blocker-mode:*default-hostlist*))))
 
 (defun format-c->lisp (s)
   "Incomplete substitution of C format string to Lisp format string.
@@ -127,6 +110,53 @@ Recognized formats:
                                  :shortcut (getf (nthcdr 3 object) :keybinding)
                                  :search-url (format-c->lisp (nth 2 object)))))
 
+(defvar my-search-engines
+  (loop for file in '("~/.emacs.d/lisp/init-engine.el"
+                      "~/personal/bookmarks/engines.el")
+        append (nyxt::with-maybe-gpg-file (s file)
+                 (read-emacs-engines s))))
+
+(define-configuration buffer
+  ((default-modes (append '(my-mode vi-normal-mode) %slot-default))
+   (search-engines (append my-search-engines %slot-default))
+   (bookmarks-path (make-instance 'bookmarks-data-path
+                                  :basename "~/personal/bookmarks/bookmarks.lisp.gpg"))
+   (auto-mode-rules-path
+    (make-instance 'auto-mode-rules-data-path :basename "~/personal/bookmarks/auto-mode-rules.lisp.gpg"))))
+
+(define-configuration buffer
+  ((default-modes (append
+                   '(auto-mode
+                     noimage-mode
+                     noscript-mode
+                     force-https-mode
+                     proxy-mode
+                     blocker-mode
+                     ;; vi-normal-mode    ; TODO: Remove and set in internal-buffer
+                     )
+                   %slot-default))
+   (request-resource-hook
+    (reduce #'hooks:add-hook
+            (list magnet-handler
+                  old-reddit-handler)
+            :initial-value %slot-default))))
+;; (define-configuration web-buffer
+;;   ((default-modes (append
+;;                    '(auto-mode
+;;                      noimage-mode
+;;                      noscript-mode
+;;                      force-https-mode
+;;                      proxy-mode
+;;                      blocker-mode
+;;                      ;; vi-normal-mode    ; TODO: Remove and set in internal-buffer
+;;                      )
+;;                    %slot-default))
+;;    (request-resource-hook
+;;     (reduce #'hooks:add-hook
+;;             (list magnet-handler
+;;                   old-reddit-handler)
+;;             :initial-value %slot-default))))
+
 (defmethod deserialize-eww-bookmarks (stream)
   "This version of deserialize-bookmarks is compatibly with Ambrevar's EWW
 format."
@@ -173,22 +203,14 @@ format."
     (error (c)
       (echo-warning "Failed to load bookmarks from ~s: ~a" (expand-path (bookmarks-path *browser*)) c))))
 
-(defvar my-search-engines
-  (loop for file in '("~/.emacs.d/lisp/init-engine.el"
-                      "~/personal/bookmarks/engines.el")
-        append (nyxt::with-maybe-gpg-file (s file)
-                 (read-emacs-engines s))))
-
-(define-configuration browser
-  ((search-engines (append my-search-engines %slot-default))
-   (session-restore-prompt :always-restore)
-   (bookmarks-path (make-instance 'bookmarks-data-path
-                                  :basename "~/personal/bookmarks/bookmarks.lisp.gpg"))
-   (auto-mode-rules-data-path
-    (make-instance 'auto-mode-rules-data-path :basename "~/personal/bookmarks/auto-mode-rules.lisp.gpg"))
-   ;; (startup-function (make-startup-function :buffer-fn (lambda () (make-buffer :url "https://en.wikipedia.org"))))
-   ;; (bookmarks-restore-function #'restore-eww-bookmarks)
-   ))
+;; (define-configuration browser
+;;   (
+;;    ;; (session-restore-prompt :always-restore)
+;;    ;; (startup-function (make-startup-function :buffer-fn (lambda () (make-buffer :url "https://en.wikipedia.org"))))
+;;    ;; (bookmarks-restore-function #'restore-eww-bookmarks)
+;;    ))
+(define-configuration browser           ; Multiple define-configuration's work!
+  ((session-restore-prompt :always-restore)))
 
 (setf nyxt/vcs:*vcs-projects-roots* '("~/projects"
                                       "~/common-lisp"
@@ -218,8 +240,8 @@ format."
             (object-display (url buffer))
             (title buffer)))))
 
-(define-configuration window
-  ((status-formatter #'my-format-status)))
+;; (define-configuration window
+;;   ((status-formatter #'my-format-status)))
 
 (load-system :slynk)
 (when (find-package :slynk)