format, move to use-package declarations

1 files changed, 50 insertions, 52 deletions

diff --git a/bard-emacs-modules/bard-emacs-web.el b/bard-emacs-modules/bard-emacs-web.el
index f5cff6b..62a471e 100644
--- a/bard-emacs-modules/bard-emacs-web.el
+++ b/bard-emacs-modules/bard-emacs-web.el
@@ -1,27 +1,27 @@
 ;;; IRC
 (use-package circe
-  :ensure t)
-
-(setq auth-sources '("~/.authinfo.gpg"))
-
-(defun my-fetch-password (&rest params)
-  (require 'auth-source)
-  (let ((match (car (apply 'auth-source-search params))))
-    (if match
-        (let ((secret (plist-get match :secret)))
-          (if (functionp secret)
-              (funcall secret)
-            secret))
-      (error "Password not found for %S" params))))
-
-(defun my-nickserv-password (server)
-  (my-fetch-password :user "bardman" :machine "irc.libera.chat"))
-
-(setq circe-network-options
-      '(("Libera Chat"
-         :nick "bardman"
-         :channels ("#emacs" "##anime" "#gentoo")
-         :nickserv-password my-nickserv-password)))
+  :ensure t
+  :config
+  (setq auth-sources '("~/.authinfo.gpg"))
+
+  (defun my-fetch-password (&rest params)
+    (require 'auth-source)
+    (let ((match (car (apply 'auth-source-search params))))
+      (if match
+          (let ((secret (plist-get match :secret)))
+            (if (functionp secret)
+                (funcall secret)
+              secret))
+        (error "Password not found for %S" params))))
+
+  (defun my-nickserv-password (server)
+    (my-fetch-password :user "bardman" :machine "irc.libera.chat"))
+
+  (setq circe-network-options
+        '(("Libera Chat"
+           :nick "bardman"
+           :channels ("#emacs" "##anime" "#gentoo")
+           :nickserv-password my-nickserv-password))))
 
 ;;; RSS Feeds
 (use-package elfeed
@@ -47,34 +47,35 @@
 
 ;;; Web Browsing (EWW and Firefox/Librewolf)
 
-(setq browse-url-browser-function 'eww-browse-url)
-(setq browse-url-secondary-browser-function 'browse-url-default-browser)
-
-(setq
- browse-url-handlers
- '(("wikipedia\\.org" . eww-browse-url)
-   ;; ("github" . browse-url-chromium)
-   ("github" . browse-url-default-browser)
-   ("youtube.com" . browse-url-default-browser)
-   ("reddit.com" . browse-url-default-browser)))
-
-;; shr optimizations
-(setq shr-use-colors nil)
-(setq shr-use-fonts nil)
-(setq shr-max-image-proportion 0.6)
-(setq shr-image-animate nil)
-(setq shr-width fill-column)
-(setq shr-max-width fill-column)
-(setq shr-discard-aria-hidden t)
-(setq shr-cookie-policy nil)
-
-;; eww
-(setq eww-search-prefix "https://duckduckgo.com/html/?q=")
-(setq eww-history-limit 150)
-(setq eww-use-external-browser-for-content-type
+(use-package eww
+  :config
+  (setq browse-url-browser-function 'eww-browse-url)
+  (setq browse-url-secondary-browser-function 'browse-url-default-browser)
+
+  (setq browse-url-handlers
+        '(("wikipedia\\.org" . eww-browse-url)
+          ;; ("github" . browse-url-chromium)
+          ("github" . browse-url-default-browser)
+          ("youtube.com" . browse-url-default-browser)
+          ("reddit.com" . browse-url-default-browser)))
+
+  ;; shr optimizations
+  (setq shr-use-colors nil)
+  (setq shr-use-fonts nil)
+  (setq shr-max-image-proportion 0.6)
+  (setq shr-image-animate nil)
+  (setq shr-width fill-column)
+  (setq shr-max-width fill-column)
+  (setq shr-discard-aria-hidden t)
+  (setq shr-cookie-policy nil)
+
+  ;; eww
+  (setq eww-search-prefix "https://duckduckgo.com/html/?q=")
+  (setq eww-history-limit 150)
+  (setq eww-use-external-browser-for-content-type
         "\\`\\(video/\\|audio\\)")
-
-(global-set-key (kbd "C-c w") 'eww)
+  :bind
+  ("C-c w" . eww))
 
 ;; librewolf open browser
 
@@ -102,8 +103,5 @@ instead of `browse-url-new-window-flag'."
            "librewolf"
             (list url))))
 
-;; remote connections with emacs
-(use-package tramp)
-
 (provide 'bard-emacs-web)
 ;;; bard-emacs-web.el ends here