Move settings from defaults to packages

bundle/bundle--defaults.el

@@ -45,7 +45,7 @@
 (setq-default indent-tabs-mode nil)
 (setq-default line-spacing nil)
 (setq-default make-backup-files nil)
-(setq-default browse-url-browser-function (quote eww-browse-url))
+
 (setq tab-width 4)
 (setq sentence-end-double-space nil)
 (setq next-line-add-newlines t)
@@ -56,7 +56,6 @@
 (setq default-major-mode 'text-mode)
 (setq-default  inhibit-startup-buffer-menu t
                inhibit-startup-screen t)
-(setq-default shr-cookie-policy nil)
 (setq-default tramp-default-method "ssh")
 (put 'narrow-to-region 'disabled nil)
 (put 'narrow-to-page 'disabled nil)

bundle/bundle--package.el

@@ -50,9 +50,30 @@
 (use-package olivetti
   :custom (olivetti-body-width 82))
 
+(use-package shrface
+  :config
+  (shrface-basic)
+  (shrface-trial)
+  (shrface-default-keybindings)
+  (setq shrface-href-versatile t
+        shrface-toggle-bullets t
+        shr-width nil))
+
+(use-package eww
+  :init
+  (add-hook 'eww-after-render-hook #'shrface-mode)
+  :config
+  (require 'shrface)
+  (setq shr-use-colors nil
+        shr-use-fonts nil
+        shr-cookie-policy nil
+        browse-url-browser-function (quote eww-browse-url)))
+
 (use-package nov
-  :config (setq nov-text-width nil nov-variable-pitch nil)
-  :hook (nov-mode . olivetti-mode))
+  :hook (nov-mode . olivetti-mode)
+  :config
+  (setq nov-text-width nil
+        nov-variable-pitch nil))
 
 (use-package projectile
   :init