diff --git a/emacs/.config/doom/+magit.el b/emacs/.config/doom/+magit.el
index 0988479..94f2bb7 100644
--- a/emacs/.config/doom/+magit.el
+++ b/emacs/.config/doom/+magit.el
@@ -8,9 +8,11 @@
   (magit-wip-after-apply-mode t)
 
   (setq magit-save-repository-buffers 'dontask
+        magit-circleci-token "097bf0dd808ad9103d489844e37cecffdf967837"
         magit-repository-directories '(("~/src/" . 3)
                                        ("~/dotfiles/" . 0))
         magit-popup-display-buffer-action nil ;; Not sure why this is here, wonder what it does
         magit-display-file-buffer-function #'switch-to-buffer-other-window
         magithub-clone-default-directory "~/src" ;; I want my stuff to clone to ~/projects
         magithub-preferred-remote-method 'ssh_url)) ;; HTTPS cloning is awful, i authenticate with ssh keys.
+
diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el
index eaa7032..c9d7f71 100644
--- a/emacs/.config/doom/config.el
+++ b/emacs/.config/doom/config.el
@@ -76,8 +76,8 @@
       (:prefix "s"
         :desc "Search project TODOs"    "t" #'+ivy/tasks
         :desc "Search the web"          "w" #'web-search
-        :desc "Goto URL in w3m"         "u" #'w3m-goto-url
-        :desc "Search in w3m"           "3" #'w3m-search
+        :desc "Goto URL in eww"         "u" #'eww-browse-url
+        :desc "Search in eww"           "3" #'eww-search-words
         :desc "Search all the things"   "g" #'deadgrep))
 
 ;; app/search
@@ -152,4 +152,3 @@
                                 ("Europe/London" "London")
                                 ("Europe/Warsaw" "Warsaw")
                                 ("Europe/Kiev" "Lviv")))
-
diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el
index 7f51057..97f7328 100644
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
@@ -185,12 +185,13 @@
    ["#2b2a27" "#ff5d38" "#98be65" "#bcd42a" "#51afef" "#c678dd" "#46D9FF" "#ede0ce"])
  '(custom-safe-themes
    (quote
-    ("528d0ed2f87187406f4db88879555f03f1c9478018a49e2e35c84b666c97d44a" "a70b47c87e9b0940f6fece46656200acbfbc55e129f03178de8f50934ac89f58" "1f36ca86913068b7d8377a327394eecfff71be34119619f779cb229875ceec0c" "0eb3c0868ff890b0c4ee138069ce2a8936a8a69ba150efa6bfb9fb7c05af5ec3" "001c2ff8afde9c3e707a2eb3e810a0a36fb2b466e96377ac95968e7f8930a7c5" "2a3ffb7775b2fe3643b179f2046493891b0d1153e57ec74bbe69580b951699ca" "0fe9f7a04e7a00ad99ecacc875c8ccb4153204e29d3e57e9669691e6ed8340ce" "f951343d4bbe5a90dba0f058de8317ca58a6822faa65d8463b0e751a07ec887c" "423435c7b0e6c0942f16519fa9e17793da940184a50201a4d932eafe4c94c92d" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "70cc30fd9d27a8d0d3ae82974ac2c409fd2cd5746470e2246778c6bec2d4857c" "5e96177f8bd6762e3f167fb7f5b6199fbff81704f654c66c772cd326d4fb78e3" "2878517f049b28342d7a360fd3f4b227086c4be8f8409f32e0f234d129cee925" "f30aded97e67a487d30f38a1ac48eddb49fdb06ac01ebeaff39439997cbdd869" default)))
+    ("2d1fe7c9007a5b76cea4395b0fc664d0c1cfd34bb4f1860300347cdad67fb2f9" "bd6ced8badda12f95e16e641d76d861de096c691720ede6388a226914e97cf23" "528d0ed2f87187406f4db88879555f03f1c9478018a49e2e35c84b666c97d44a" "a70b47c87e9b0940f6fece46656200acbfbc55e129f03178de8f50934ac89f58" "1f36ca86913068b7d8377a327394eecfff71be34119619f779cb229875ceec0c" "0eb3c0868ff890b0c4ee138069ce2a8936a8a69ba150efa6bfb9fb7c05af5ec3" "001c2ff8afde9c3e707a2eb3e810a0a36fb2b466e96377ac95968e7f8930a7c5" "2a3ffb7775b2fe3643b179f2046493891b0d1153e57ec74bbe69580b951699ca" "0fe9f7a04e7a00ad99ecacc875c8ccb4153204e29d3e57e9669691e6ed8340ce" "f951343d4bbe5a90dba0f058de8317ca58a6822faa65d8463b0e751a07ec887c" "423435c7b0e6c0942f16519fa9e17793da940184a50201a4d932eafe4c94c92d" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "70cc30fd9d27a8d0d3ae82974ac2c409fd2cd5746470e2246778c6bec2d4857c" "5e96177f8bd6762e3f167fb7f5b6199fbff81704f654c66c772cd326d4fb78e3" "2878517f049b28342d7a360fd3f4b227086c4be8f8409f32e0f234d129cee925" "f30aded97e67a487d30f38a1ac48eddb49fdb06ac01ebeaff39439997cbdd869" default)))
  '(fci-rule-color "#5B6268")
  '(jdee-db-active-breakpoint-face-colors (cons "#2b2a27" "#ff5d38"))
  '(jdee-db-requested-breakpoint-face-colors (cons "#2b2a27" "#98be65"))
  '(jdee-db-spec-breakpoint-face-colors (cons "#2b2a27" "#3f444a"))
  '(objed-cursor-color "#ff5d38")
+ '(safe-local-variable-values (quote ((url-max-redirections . 0))))
  '(vc-annotate-background "#2b2a27")
  '(vc-annotate-color-map
    (list
diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el
index 80e7a00..edfbfcc 100644
--- a/emacs/.config/doom/packages.el
+++ b/emacs/.config/doom/packages.el
@@ -58,6 +58,7 @@
 (package! elfeed-web)
 (package! emojify)
 (package! deadgrep)
+(package! mastodon)
 (package! kaolin-themes)
 (package! magit-circleci)
 (package! nyan-mode)
diff --git a/netrc/.authinfo.gpg b/netrc/.authinfo.gpg
new file mode 100644
index 0000000..38a9d13
Binary files /dev/null and b/netrc/.authinfo.gpg differ
diff --git a/netrc/.netrc.gpg b/netrc/.netrc.gpg
index 02d6989..55d9ae4 100644
Binary files a/netrc/.netrc.gpg and b/netrc/.netrc.gpg differ