2 files changed, 5 insertions, 21 deletions
diff --git a/init.org b/init.org
index 754ca30..4e5d8c2 100644
--- a/init.org
+++ b/init.org
@@ -278,7 +278,7 @@
       (add-to-list 'after-make-frame-functions 'jao--set-kb-system)
     #+end_src
 *** Battery
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
       (use-package battery
         :init (setq battery-load-low 15
                     battery-load-critical 8
@@ -291,7 +291,7 @@
             (delq 'battery-mode-line-string global-mode-string))
       (with-eval-after-load "jao-minibuffer"
         (jao-minibuffer-add-variable 'battery-mode-line-string 80))
-    #+END_SRC
+    #+end_src
 * Crypto
 *** PGP, EPG, passwords
     #+begin_src emacs-lisp
@@ -313,8 +313,6 @@
             (let ((user (plist-get item :user))
                   (pwd (plist-get item :secret)))
               (list user (when pwd (funcall pwd)))))))
-
-      (use-package password-generator :ensure t)
     #+end_src
 *** Pinentry
     #+begin_src emacs-lisp
@@ -466,7 +464,7 @@
     (setq bookmark-default-file "~/.emacs.d/emacs.bmk")
     #+END_SRC
 *** Helpful
-    #+begin_src emacs-lisp
+    #+begin_src emacs-lisp :load no
       (use-package helpful
         :ensure t
         :custom ((helpful-max-buffers 20))
@@ -500,7 +498,6 @@
       (defun jao-exwm-enable ()
         (jao-load-org "exwm.org")
         (setq jao-exwm-enabled-p t)
-        (display-battery-mode -1)
         (display-time-mode -1)
         (jao-ednc-setup 90)
         (exwm-enable)
@@ -542,7 +539,6 @@
         (setq jao-minibuffer-right-margin 1)
         (jao-toggle-inactive-mode-line t)
         (jao-trisect)
-        (display-battery-mode -1)
         (jao-set-transparency 92)
         (jao-themes-setup)
         (message "Welcome to sway"))
@@ -2826,7 +2822,7 @@
 *** Elisp
     Reporting bugs
     #+begin_src emacs-lisp
-      (use-package debbugs :ensure t)
+      (use-package debbugs :ensure t :disabled t)
     #+end_src
     Some helper packages
     #+BEGIN_SRC emacs-lisp
@@ -3152,6 +3148,7 @@
     #+begin_src emacs-lisp
       (jao-load-path "pie")
       (use-package pie
+        :demand t
         :commands (pie-mode))
     #+end_src
 *** Lisp
diff --git a/org.org b/org.org
index cddd898..a6c078d 100644
--- a/org.org
+++ b/org.org
@@ -195,19 +195,6 @@
                    t))
   #+END_SRC
 
-* Org download
-
-  #+begin_src emacs-lisp
-    (use-package org-download
-      :ensure t
-      :after org
-      :init (setq org-download-screenshot-method "import %s")
-      :bind
-      (:map org-mode-map
-            (("C-c S" . org-download-screenshot)
-             ("C-c I" . org-download-yank))))
-  #+end_src
-
 * Notes
   #+begin_src emacs-lisp
     (use-package jao-org-notes