Add initial zathura config and example emacs binds

Add zathura as default PDF program
Remove mupdf as emacs seems to handle PDFs just fine with gs and/or poppler_utils
2024-04-09 14:30:30 +01:00 · 2024-04-09 14:29:42 +01:00 · 2024-04-09 14:21:00 +01:00 · 2024-04-09 14:17:04 +01:00
8 changed files with 242 additions and 26 deletions
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@ -161,7 +161,6 @@
    sqlite
    pandoc
    ghostscript
-    mupdf
    poppler_utils

    # Customised LaTeX install
--- a/home/zathura/default.nix
+++ b/home/zathura/default.nix
@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  # TODO add colour scheme and emacs keybinds
+  programs.zathura = {enable = true;};
+}
--- a/home/zathura/emacs-keys-for-zathura.txt
+++ b/home/zathura/emacs-keys-for-zathura.txt
@ -0,0 +1,208 @@
+# 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
--- a/system/bookmarks/default.org
+++ b/system/bookmarks/default.org
@ -1,10 +1,9 @@
 #+title: Bookmarks
 #+author: Evie Litherland-Smith
 #+email: evie@xenia.me.uk
-#+language: en
 #+options: html-link-use-abs-url:nil html-postamble:auto
 #+options: html-preamble:t html-scripts:nil html-style:t
-#+options: html5-fancy:nil tex:t
+#+options: html5-fancy:nil tex:t toc:nil
 #+html_doctype: xhtml-strict
 #+html_container: div
 #+html_content_class: content
@ -20,25 +19,22 @@
 #+infojs_opt:
 #+creator: <a href="https://www.gnu.org/software/emacs/">Emacs</a> 29.3 (<a href="https://orgmode.org">Org</a> mode 9.6.23)
 #+latex_header:
-* Messaging :messaging:
+* Personal :personal:
+** Messaging :messaging:
 - [[https://web.whatsapp.com/][WhatsApp Web]]
 - [[https://discord.com/app][Discord]]
-----
-* Server :server:
+** Server :server:
 - [[https://xenia.me.uk][Home Page]]
 - [[https://git.xenia.me.uk][Forgejo]]
-----
-* Documentation :documentation:
+** Documentation :documentation:
 - [[https://nixos-and-flakes.thiscute.world/][NixOS and Flakes]]
 - [[https://nix-community.github.io/home-manager/options.xhtml][Home Manager Configuration Options]]
 - [[https://mipmip.github.io/home-manager-option-search/][Home Manager Option Search]]
 - [[https://mozilla.github.io/policy-templates/][Mozilla Policy Templates]]
 - [[https://chromeenterprise.google/policies/][Chrome Enterprise Policy List]]
-----
-* Awesome Repos :awesome:git:
+** Awesome Repos :awesome:git:
 - [[https://github.com/emacs-tw/awesome-emacs][Awesome Emacs]]
 - [[https://github.com/hyprland-community/awesome-hyprland][Awesome Hyprland]]
-----
 * Work :work:
 - [[https://nucleus.ukaea.uk/][Nucleus]]
 - [[https://marval.service.ukaea.uk/MSMSelfService/Index.aspx][Marval Helpdesk]]
@ -50,13 +46,13 @@
 - [[https://data.jet.uk/][JET Data Services]]
 - [[https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html][JSPO]]
 - [[https://dvcm.jetdata.eu/][DVCM]]
-*** Mimics :mimics:
- [[http://webmimic.jet.uk/mc/codas/countdown][Countdown]]
- [[http://webmimic.jet.uk/DG/codas/ks5.mim.html][KS5]]
- [[http://webmimic.jet.uk/DG/codas/kt3spec.mim.html][KT3]]
 ** MAST-U :mastu:
 - [[https://users.mastu.ukaea.uk/home][Users Page]]
 - [[https://intranet.ccfe.ac.uk/mastu-handbook][Diagnostic Handbook]]
+** Mimics :mimics:
+- [[http://webmimic.jet.uk/mc/codas/countdown][Countdown]]
+- [[http://webmimic.jet.uk/DG/codas/ks5.mim.html][KS5]]
+- [[http://webmimic.jet.uk/DG/codas/kt3spec.mim.html][KT3]]
 ** OpenWiki :wiki:jdc:
 - [[https://wiki.jetdata.eu/open/index.php?title=Main_Page][Main Page]]
 - [[https://wiki.jetdata.eu/open/index.php?title=Diagnostic_Coordinator_Wiki][Diagnostic Coordinator]]
--- a/system/bookmarks/stylesheet.css
+++ b/system/bookmarks/stylesheet.css
@ -1,10 +1,18 @@
+div.outline-2,
+div.outline-3,
+div.outline-4 {
+  width: 50%;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+}
+
+div.outline-2 {
+  width: unset;
+}
+
 div.outline-text-2,
 div.outline-text-3,
 div.outline-text-4 {
-  column-count: 1;
-}
-
-div.outline-3,
-div.outline-4 {
-  column-count: 1;
+  width: 100%;
 }
--- a/system/desktop.nix
+++ b/system/desktop.nix
@ -12,6 +12,7 @@
    hunspell
    hunspellDicts.en_GB-large
    libreoffice-fresh
+    zathura
    inkscape
    noson
    tagger
--- a/system/firefox.nix
+++ b/system/firefox.nix
@ -101,7 +101,7 @@
        "browser.newtabpage.pinned" = [
          {
            title = "NixOS Wiki";
-            url = "https://nixos.wiki";
+            url = "https://wiki.nixos.org";
          }
          {
            title = "Arch Wiki";
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@ -53,8 +53,8 @@
    emacs = ["emacsclient.desktop" "emacs.desktop"];
    browser = ["firefox.desktop"];
    applications = {
-      "inode/directory" = emacs;
-      "inode/symlink" = emacs;
+      "inode/directory" = ["thunar.desktop"];
+      "inode/symlink" = ["thunar.desktop"];

      "image/jpeg" = ["swayimg.desktop"];
      "image/png" = ["swayimg.desktop"];
@ -92,8 +92,8 @@
      "application/oxps" = emacs;
      "application/x-shellscript" = emacs;

-      "application/pdf" = ["mupdf.desktop"];
-      "application/epub+zip" = ["mupdf.desktop"];
+      "application/pdf" = ["org.pwmt.zathura.desktop"];
+      "application/epub+zip" = ["org.pwmt.zathura.desktop"];
      "application/msword" = ["writer.desktop"];
      "application/zip" = ["xarchiver.desktop"];
Author	SHA1	Message	Date
Evie Litherland-Smith	2d2a166dd0	Add initial zathura config and example emacs binds	2024-04-09 14:30:30 +01:00
Evie Litherland-Smith	898685db83	Add zathura as default PDF program Remove mupdf as emacs seems to handle PDFs just fine with gs and/or poppler_utils	2024-04-09 14:29:42 +01:00
Evie Litherland-Smith	2684a677dd	Update pinned url for new NixOS wiki	2024-04-09 14:21:00 +01:00
Evie Litherland-Smith	d278f36264	Fix bookmark page styling Put personal bookmarks under L1 heading personal, make headings into flex box to allow L2+ headings to bunch up and be more space efficient without disturbing the look of the lists	2024-04-09 14:17:04 +01:00