diff --git a/system/home/default.nix b/system/home/default.nix
index 7f13d278..d2da256a 100644
--- a/system/home/default.nix
+++ b/system/home/default.nix
@@ -3,8 +3,8 @@
   imports = [
     inputs.nix-index-database.hmModules.nix-index
     ./shell/default.nix
-    ./services/password-store/default.nix
     ./scripts/default.nix
+    ./services/password-store/default.nix
   ];
   programs.home-manager.enable = true;
 }
diff --git a/system/home/desktop.nix b/system/home/desktop.nix
index 89270319..7c15d058 100644
--- a/system/home/desktop.nix
+++ b/system/home/desktop.nix
@@ -5,7 +5,6 @@
     ./emacs/default.nix
     ./terminal/default.nix
     ./browser/default.nix
-    ./zathura/default.nix
     ./services/email/default.nix
     ./services/calendar/default.nix
   ];
diff --git a/system/home/mimeapps/default.nix b/system/home/mimeapps/default.nix
index e62c09be..391c130f 100644
--- a/system/home/mimeapps/default.nix
+++ b/system/home/mimeapps/default.nix
@@ -3,22 +3,15 @@ let
   browser = [ "firefox.desktop" ];
 in
 {
-  "inode/directory" = [ "thunar.desktop" ];
-  "inode/symlink" = [ "thunar.desktop" ];
-
-  "image/jpeg" = [ "swayimg.desktop" ];
-  "image/png" = [ "swayimg.desktop" ];
-  "video/mp4" = [ "mpv.desktop" ];
-
   "text/plain" = emacs;
   "text/richtext" = emacs;
   "text/org" = emacs;
   "text/markdown" = emacs;
   "text/rust" = emacs;
   "text/csv" = emacs;
-  "text/html" = emacs;
   "text/css" = emacs;
   "text/tab-separated-values" = emacs;
+  "text/html" = browser;
 
   "text/x-emacs-lisp" = emacs;
   "text/x-fortran" = emacs;
@@ -45,8 +38,6 @@ in
   "application/x-docbook+xml" = emacs;
   "application/x-yaml" = emacs;
 
-  "application/pdf" = [ "org.pwmt.zathura.desktop" ];
-  "application/epub+zip" = [ "org.pwmt.zathura.desktop" ];
   "application/msword" = [ "writer.desktop" ];
 
   "application/x-extension-htm" = browser;
diff --git a/system/home/zathura/default.nix b/system/home/zathura/default.nix
deleted file mode 100644
index 502f0e3d..00000000
--- a/system/home/zathura/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ ... }:
-{
-  # TODO add emacs keybinds
-  programs.zathura = {
-    enable = true;
-    options = {
-      adjust-open = "best-fit";
-      database = "null";
-      dbus-service = true;
-      sandbox = "normal";
-      scroll-page-aware = true;
-      synctex = true;
-    };
-  };
-}
diff --git a/system/home/zathura/emacs-keys-for-zathura.txt b/system/home/zathura/emacs-keys-for-zathura.txt
deleted file mode 100644
index 276da37a..00000000
--- a/system/home/zathura/emacs-keys-for-zathura.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-# Being an Emacs user, it is natural for me to use emacs-like and info-like keybindings for zathura.
-#
-# Zathura configuration documentation is available at
-# https://git.pwmt.org/pwmt/zathura/-/blob/e5d2ca487147e79d0bb7acbf5174cd9dcc92a86c/doc/man/zathurarc.5.rst
-# A full list of available functions and default keybindings is available at
-# https://git.pwmt.org/pwmt/zathura/-/blob/e5d2ca487147e79d0bb7acbf5174cd9dcc92a86c/zathura/config.c#L301
-#
-# If you want to integrate Zathura with Emacs AUCTeX mode, see
-# [emacs wiki](https://www.emacswiki.org/emacs/AUCTeX).
-#
-# Put the following inside `$XDG_CONFIG_HOME/zathura/zathurarc
-
-## niceties
-# when selecting text with mouse,
-# copy to clipboard
-set selection-clipboard clipboard
-
-# keep several lines of text when
-# scrolling a screenful
-set scroll-full-overlap 0.2
-
-# see documentation for details
-set scroll-page-aware true
-set window-title-basename true
-set adjust-open width
-set statusbar-home-tilde true
-set vertical-center true
-set synctex true
-# large bold font easier on the eyes in index mode
-# status bar can be disabled with A-s
-set font "FreeSans bold 16"
-set zoom-step 3
-
-map [normal] <C-b> scroll left
-map [normal] <C-n> scroll down
-map [normal] <C-p> scroll up
-map [normal] <C-f> scroll right
-map [normal] <C-g> abort
-map [insert] <C-g> abort
-map [normal] <C-[> abort
-map [normal] <A-\<> goto top
-map [normal] <A-\>> goto bottom
-map [normal] a adjust_window best-fit
-map [normal] s adjust_window width
-map [normal] F display_link
-map [normal] <C-c> copy_link
-map [normal] f follow
-map [normal] m mark_add
-map [normal] \' mark_evaluate
-map [normal] \, navigate next
-map [normal] \. navigate previous
-map [normal] <A-Right> navigate next
-map [normal] <A-Left> navigate previous
-map [normal] <PageDown> scroll full-down
-map [normal] <PageUp> scroll full-up
-map [normal] <C-P> print
-map [normal] c recolor
-map [normal] R reload
-map [normal] v rotate rotate_cw
-map [normal] V rotate rotate_ccw
-map [normal] <Left> scroll left
-map [normal] <Up> scroll up
-map [normal] <Down> scroll down
-map [normal] <Right> scroll right
-map [normal] <A-a> scroll half-left
-map [normal] <C-V> scroll half-down
-map [normal] <A-V> scroll half-up
-map [normal] <A-e> scroll half-right
-map [normal] <C-a> scroll full-left
-map [normal] <C-v> scroll full-down
-map [normal] <Return> scroll full-down
-map [normal] <A-v> scroll full-up
-map [normal] <C-e> scroll full-right
-map [normal] <Space> scroll full-down
-map [normal] <C-h> scroll full-up
-map [normal] <BackSpace> scroll full-up
-map [normal] <S-Space> scroll full-up
-map [normal] l jumplist backward
-map [normal] r jumplist forward
-map [normal] <A-r> bisect forward
-map [normal] <A-l> bisect backward
-# still need to use '/' to trigger search
-map [normal] <C-s> search forward
-map [normal] <C-r> search backward
-map [normal] p snap_to_page
-map [normal] <C-i> toggle_index
-map [normal] i toggle_index
-map [normal] <Tab> toggle_index
-map [normal] <A-s> toggle_statusbar
-map [normal] <A-i> focus_inputbar
-map [normal] d toggle_page_mode
-map [normal] q quit
-map [normal] + zoom in
-map [normal] - zoom out
-map [normal] = zoom in
-map [normal] <A-P> toggle_presentation
-map [normal] <A-F> toggle_fullscreen
-map [normal] j toggle_fullscreen
-map [fullscreen] j toggle_fullscreen
-map [fullscreen] q toggle_fullscreen
-map [fullscreen] <C-b> scroll left
-map [fullscreen] <C-n> scroll down
-map [fullscreen] <C-p> scroll up
-map [fullscreen] <C-f> scroll right
-map [fullscreen] <C-g> abort
-map [fullscreen] <C-[> abort
-map [fullscreen] <A-\<> goto top
-map [fullscreen] <A-\>> goto bottom
-map [fullscreen] a adjust_window best-fit
-map [fullscreen] s adjust_window width
-map [fullscreen] F display_link
-map [fullscreen] <C-c> copy_link
-map [fullscreen] f follow
-map [fullscreen] m mark_add
-map [fullscreen] \' mark_evaluate
-map [fullscreen] \, navigate next
-map [fullscreen] \. navigate previous
-map [fullscreen] <A-Right> navigate next
-map [fullscreen] <A-Left> navigate previous
-map [fullscreen] <PageDown> scroll full-down
-map [fullscreen] <PageUp> scroll full-up
-map [fullscreen] <C-P> print
-map [fullscreen] c recolor
-map [fullscreen] R reload
-map [fullscreen] v rotate rotate_cw
-map [fullscreen] V rotate rotate_ccw
-map [fullscreen] <Left> scroll left
-map [fullscreen] <Up> scroll up
-map [fullscreen] <Down> scroll down
-map [fullscreen] <Right> scroll right
-map [fullscreen] <A-a> scroll half-left
-map [fullscreen] <C-V> scroll half-down
-map [fullscreen] <A-V> scroll half-up
-map [fullscreen] <A-e> scroll half-right
-map [fullscreen] <C-a> scroll full-left
-map [fullscreen] <C-v> scroll full-down
-map [fullscreen] <Return> scroll full-down
-map [fullscreen] <A-v> scroll full-up
-map [fullscreen] <C-e> scroll full-right
-map [fullscreen] <Space> scroll full-down
-map [fullscreen] <C-h> scroll full-up
-map [fullscreen] <BackSpace> scroll full-up
-map [fullscreen] <S-Space> scroll full-up
-map [fullscreen] l jumplist backward
-map [fullscreen] r jumplist forward
-map [fullscreen] <A-r> bisect forward
-map [fullscreen] <A-l> bisect backward
-map [fullscreen] <C-s> search forward
-map [fullscreen] <C-r> search backward
-map [fullscreen] p snap_to_page
-map [fullscreen] i toggle_index
-map [fullscreen] <C-i> toggle_index
-map [fullscreen] <Tab> toggle_index
-map [fullscreen] <A-s> toggle_statusbar
-map [fullscreen] <A-i> focus_inputbar
-map [fullscreen] d toggle_page_mode
-map [fullscreen] + zoom in
-map [fullscreen] - zoom out
-map [fullscreen] = zoom in
-# status bar will obscure last item in index mode
-map [index] <A-s> toggle_statusbar
-map [index] q toggle_index
-map [index] i toggle_index
-map [index] <C-p> navigate_index up
-map [index] <C-h> navigate_index up
-map [index] <BackSpace> navigate_index up
-map [index] <C-n> navigate_index down
-map [index] <A-v> navigate_index up
-map [index] <C-v> navigate_index down
-map [index] \< navigate_index top
-map [index] \> navigate_index bottom
-map [index] <A-\<> navigate_index top
-map [index] <A-\>> navigate_index bottom
-map [index] <C-b> navigate_index collapse
-map [index] <C-f> navigate_index expand
-map [index] <C-i> navigate_index expand-all
-map [index] <A-i> navigate_index collapse-all
-map [index] <Up> navigate_index up
-map [index] <Down> navigate_index down
-map [index] <Left> navigate_index collapse
-map [index] <Right> navigate_index expand
-map [index] <C-m> navigate_index select
-map [index] <Space> navigate_index select
-map [index] <Return> navigate_index select
-map [index] <C-j> navigate_index select
-map [index] <Esc> toggle_index
-map [index] <C-[> toggle_index
-map [index] <C-g> toggle_index
-map [index] <C-c> toggle_index
-map [presentation] i toggle_index
-map [presentation] r navigate next
-map [presentation] <Down> navigate next
-map [presentation] <Right> navigate next
-map [presentation] <PageDown> navigate next
-map [presentation] <Space> navigate next
-map [presentation] l navigate previous
-map [presentation] <Left> navigate previous
-map [presentation] <Up> navigate previous
-map [presentation] <PageUp> navigate previous
-map [presentation] <S-Space> navigate previous
-map [presentation] <BackSpace> navigate previous
-map [presentation] <F5> toggle_presentation
-map [presentation] q toggle_presentation
-map [presentation] <C-h> navigate previous
-map [presentation] <M-v> navigate previous
-map [presentation] <C-v> navigate next
-map [presentation] <A-\<> goto top
-map [presentation] <A-\>> goto bottom