Nyxt: Use web-buffer class.

master
Pierre Neidhardt 2020-09-08 10:44:10 +02:00
parent 7e980fbb77
commit 267ce23a05
1 changed files with 7 additions and 34 deletions

View File

@ -89,10 +89,6 @@
(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*))))
(defun format-c->lisp (s)
"Incomplete substitution of C format string to Lisp format string.
Recognized formats:
@ -116,46 +112,29 @@ Recognized formats:
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))
(define-configuration (buffer web-buffer)
((default-modes (append '(my-mode vi-normal-mode) %slot-default))))
(define-configuration buffer ; Multiple configurations work!
((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
(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
)
blocker-mode)
%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
@ -203,13 +182,7 @@ format."
(error (c)
(echo-warning "Failed to load bookmarks from ~s: ~a" (expand-path (bookmarks-path *browser*)) c))))
;; (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!
(define-configuration browser
((session-restore-prompt :always-restore)))
(setf nyxt/vcs:*vcs-projects-roots* '("~/projects"