From 24665dea142b613a6317c89bf215fef8823cac6b Mon Sep 17 00:00:00 2001
From: SqrtMinusOne <thexcloud@gmail.com>
Date: Sat, 9 Apr 2022 12:18:36 +0300
Subject: [PATCH] feat: finally remove zathura workaround

---
 .config/mimeapps.list |  4 ++--
 .mailcap              |  4 ++--
 Desktop.org           | 22 ++--------------------
 Mail.org              |  4 ++--
 bin/emacs.sh          | 14 --------------
 bin/tabliss.sh        |  3 ---
 6 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100755 bin/emacs.sh
 delete mode 100755 bin/tabliss.sh

diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index 65518fb..51aeac8 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -9,9 +9,9 @@ x-scheme-handler/tg=userapp-Telegram Desktop-7PVWF1.desktop
 image/png=feh.desktop
 image/jpg=feh.desktop
 image/jpeg=feh.desktop
-application/pdf=zathura-wrapper.desktop
+application/pdf=org.pwmt.zathura.desktop
 
 [Added Associations]
 x-scheme-handler/tg=userapp-Telegram Desktop-7PVWF1.desktop;
-application/pdf=zathura-wrapper.desktop
+application/pdf=org.pwmt.zathura.desktop
 # MIME:1 ends here
diff --git a/.mailcap b/.mailcap
index 6037f81..6d616ce 100644
--- a/.mailcap
+++ b/.mailcap
@@ -3,7 +3,7 @@ audio/*; mpc add %s
 image/*; feh %s
 
 application/msword; /usr/bin/xdg-open %s
-application/pdf; zathura-wrapper %s
-application/postscript ; zathura-wrapper %s
+application/pdf; zathura %s
+application/postscript ; zathura %s
 
 text/html; firefox %s
diff --git a/Desktop.org b/Desktop.org
index 43a58df..df0b610 100644
--- a/Desktop.org
+++ b/Desktop.org
@@ -274,11 +274,11 @@ x-scheme-handler/tg=userapp-Telegram Desktop-7PVWF1.desktop
 image/png=feh.desktop
 image/jpg=feh.desktop
 image/jpeg=feh.desktop
-application/pdf=zathura-wrapper.desktop
+application/pdf=org.pwmt.zathura.desktop
 
 [Added Associations]
 x-scheme-handler/tg=userapp-Telegram Desktop-7PVWF1.desktop;
-application/pdf=zathura-wrapper.desktop
+application/pdf=org.pwmt.zathura.desktop
 #+end_src
 ** Device-specific settings
 | Guix dependency | Description                                |
@@ -3310,24 +3310,6 @@ set notification-error-fg <<get-color(name="color-fg", quote=1)>>
 set notification-warning-bg <<get-color(name="yellow", quote=1)>>
 set notification-warning-fg <<get-color(name="color-fg", quote=1)>>
 #+end_src
-
-For some reason zathura doesn't pick up the plugin directory, so I make a wrapper that sets the directory up:
-#+begin_src bash :tangle ~/bin/zathura-wrapper
-zathura -p ~/.guix-extra-profiles/office/office/lib/zathura $@
-#+end_src
-
-#+begin_src conf-desktop
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Zathura
-Exec=/home/pavel/bin/zathura-wrapper %U
-#+end_src
-
-Add the following line to the =mimeapps.list=
-#+begin_example
-application/pdf=zathura-wrapper.desktop
-#+end_example
 * Various software
 This section generates manifests for various desktop software that I'm using.
 
diff --git a/Mail.org b/Mail.org
index 36dd93a..43302ff 100644
--- a/Mail.org
+++ b/Mail.org
@@ -533,8 +533,8 @@ audio/*; mpc add %s
 image/*; feh %s
 
 application/msword; /usr/bin/xdg-open %s
-application/pdf; zathura-wrapper %s
-application/postscript ; zathura-wrapper %s
+application/pdf; zathura %s
+application/postscript ; zathura %s
 
 text/html; firefox %s
 #+end_src
diff --git a/bin/emacs.sh b/bin/emacs.sh
deleted file mode 100755
index 0d1461b..0000000
--- a/bin/emacs.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -d "$HOME/.cargo" ] ; then
-    export PATH="$HOME/.cargo/bin:$PATH"
-fi
-if [ -d "$HOME/.rvm" ] ; then
-    export PATH="$PATH:$HOME/.rvm/bin"
-fi
-if [ -d "$HOME/go" ] ; then
-    export PATH="$HOME/go/bin:$PATH"
-fi
-
-export PATH="/usr/local/texlive/2020/bin/x86_64-linux:$PATH"
-
-[ -f "/home/pavel/.ghcup/env" ] && source "/home/pavel/.ghcup/env" # ghcup-env
-emacs
diff --git a/bin/tabliss.sh b/bin/tabliss.sh
deleted file mode 100755
index 2ac01fa..0000000
--- a/bin/tabliss.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#/bin/bash
-export PORT=8101
-(cd /home/pavel/Programs/tabliss; /home/pavel/Programs/miniconda3/bin/node server.js)