Next: Rename to Nyxt.

master
Pierre Neidhardt 2020-06-12 16:05:42 +02:00
parent 259f51328e
commit 1f48be86be
2 changed files with 14 additions and 14 deletions

View File

@ -83,7 +83,7 @@ Videos are downloaded with `+youtube-dl-command+'."
(domain (and uri (quri:uri-domain uri)))) (domain (and uri (quri:uri-domain uri))))
;; TODO: Turn on/off proxy, not mode. ;; TODO: Turn on/off proxy, not mode.
(when domain (when domain
(next/proxy-mode:proxy-mode (nyxt/proxy-mode:proxy-mode
:activate :activate
(not (member-string domain *my-unproxied-domains*))))) (not (member-string domain *my-unproxied-domains*)))))
request-data) request-data)
@ -91,17 +91,17 @@ Videos are downloaded with `+youtube-dl-command+'."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar *my-blocked-hosts* (defvar *my-blocked-hosts*
(next/blocker-mode:make-hostlist (nyxt/blocker-mode:make-hostlist
:hosts '("platform.twitter.com" :hosts '("platform.twitter.com"
"syndication.twitter.com" "syndication.twitter.com"
"m.media-amazon.com"))) "m.media-amazon.com")))
(define-configuration next/blocker-mode:blocker-mode (define-configuration nyxt/blocker-mode:blocker-mode
((next/blocker-mode:hostlists (append (list *my-blocked-hosts*) %slot-default)))) ((nyxt/blocker-mode:hostlists (append (list *my-blocked-hosts*) %slot-default))))
;; (define-mode my-blocker-mode (next/blocker-mode:blocker-mode) ;; (define-mode my-blocker-mode (nyxt/blocker-mode:blocker-mode)
;; "Blocker mode with custom hosts from `*my-blocked-hosts*'." ;; "Blocker mode with custom hosts from `*my-blocked-hosts*'."
;; ((next/blocker-mode:hostlists :initform (list *my-blocked-hosts* next/blocker-mode:*default-hostlist*)))) ;; ((nyxt/blocker-mode:hostlists :initform (list *my-blocked-hosts* nyxt/blocker-mode:*default-hostlist*))))
(define-configuration buffer (define-configuration buffer
((default-modes (append ((default-modes (append
@ -156,7 +156,7 @@ format."
(when (getf entry :mark) (when (getf entry :mark)
(setf (getf entry :shortcut) (getf entry :mark)) (setf (getf entry :shortcut) (getf entry :mark))
(remf entry :mark)) (remf entry :mark))
(apply #'make-instance 'next:bookmark-entry (apply #'make-instance 'nyxt:bookmark-entry
entry)) entry))
entries))) entries)))
(error (c) (error (c)
@ -176,7 +176,7 @@ format."
(echo "Loading ~a bookmarks from ~s." (echo "Loading ~a bookmarks from ~s."
(length data) (length data)
(expand-path (bookmarks-path *browser*))) (expand-path (bookmarks-path *browser*)))
(setf (slot-value *browser* 'next::bookmarks-data) data))) (setf (slot-value *browser* 'nyxt::bookmarks-data) data)))
(error (c) (error (c)
(echo-warning "Failed to load bookmarks from ~s: ~a" (expand-path (bookmarks-path *browser*)) c)))) (echo-warning "Failed to load bookmarks from ~s: ~a" (expand-path (bookmarks-path *browser*)) c))))
@ -184,7 +184,7 @@ format."
(defvar my-search-engines (defvar my-search-engines
(loop for file in '("~/.emacs.d/lisp/init-engine.el" (loop for file in '("~/.emacs.d/lisp/init-engine.el"
"~/personal/bookmarks/engines.el") "~/personal/bookmarks/engines.el")
append (next::with-maybe-gpg-file (s file) append (nyxt::with-maybe-gpg-file (s file)
(read-emacs-engines s)))) (read-emacs-engines s))))
(define-configuration browser (define-configuration browser
@ -195,7 +195,7 @@ format."
;; (bookmarks-restore-function #'restore-eww-bookmarks) ;; (bookmarks-restore-function #'restore-eww-bookmarks)
)) ))
(setf next/vcs:*vcs-projects-roots* '("~/projects" (setf nyxt/vcs:*vcs-projects-roots* '("~/projects"
"~/common-lisp" "~/common-lisp"
"~/.local/share/emacs/site-lisp")) "~/.local/share/emacs/site-lisp"))
@ -225,14 +225,14 @@ format."
(load-system :slynk) (load-system :slynk)
(when (find-package :slynk) (when (find-package :slynk)
(next::load-lisp "/home/ambrevar/dotfiles/.config/next/slynk.lisp")) (nyxt::load-lisp "/home/ambrevar/dotfiles/.config/nyxt/slynk.lisp"))
(defvar +dev-data-profile+ (make-instance 'data-profile :name "dev") (defvar +dev-data-profile+ (make-instance 'data-profile :name "dev")
"Development profile.") "Development profile.")
(defmethod next:expand-data-path ((profile (eql +dev-data-profile+)) (path data-path)) (defmethod nyxt:expand-data-path ((profile (eql +dev-data-profile+)) (path data-path))
"Persist data to /tmp/next/." "Persist data to /tmp/nyxt/."
(expand-default-path (make-instance (class-name (class-of path)) (expand-default-path (make-instance (class-name (class-of path))
:basename (basename path) :basename (basename path)
:dirname "/tmp/next/"))) :dirname "/tmp/nyxt/")))