Merge remote-tracking branch 'origin/master'

5 files changed, 46 insertions, 23 deletions

diff --git a/X/.xinitrc b/X/.xinitrc
index 5112b47..fd645c1 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -42,6 +42,7 @@ redshift &
 dunst &
 wal -R
 # xrandr --output DP-1 --auto --output DP-2 --left-of DP-1 --auto --output DVI-1-0 --rotate left --right-of DP-1 --auto
+xrandr --output DP-1 --rotate normal --auto --output DVI-1-0 --rotate left --right-of DP-1 --auto
 feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
 xsetroot -cursor_name left_ptr
 
diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index b6a2ca7..090494a 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 bspc monitor DP-1 -d term web code music
-bspc monitor DP-2 -d 5 6 7 8
-bspc monitor DVI-1-0 -d 9 0
+bspc monitor DVI-1-0 -d 5 6 7 8
 
 bspc config border_width 0
 bspc config window_gap   5
diff --git a/doom/config.el b/doom/config.el
index a75e1e2..1594f78 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -16,9 +16,9 @@
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
 (setq doom-font (font-spec :family "Iosevka" :size 16)
-      doom-variable-pitch-font (font-spec :family "Alegreya" :size 12)
-      doom-serif-font (font-spec :family "Alegreya" :size 12))
-
+;;      doom-variable-pitch-font (font-spec :family "Alegreya" :size 12)
+;;      doom-serif-font (font-spec :family "Alegreya" :size 12))
+)
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
@@ -32,6 +32,11 @@
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type nil)
 
+;; Disable stuff
+(global-prettify-symbols-mode -1)
+(electric-indent-mode -1)
+(menu-bar-mode -1)
+
 ;; Add some keybinding customisations.
 
 ;; Stop emacs from freezing when trying to minimize it on a tiling WM.
@@ -91,8 +96,12 @@
 (define-key y-map (kbd "c")   #'calendar)
 (define-key y-map (kbd "C-r") #'ymhg/reload-keywords)
 (define-key y-map (kbd "d")   #'y/insert-date)
-
-(electric-indent-mode -1)
+(define-key y-map (kbd "s")   (lambda () (interactive)
+                                (let ((org-agenda-files '("~/Dropbox/zk/hls.org"
+                                                          "~/Dropbox/zk/computing.org"
+                                                          "~/Dropbox/zk/verification.org"
+                                                          "~/Dropbox/zk/mathematics.org"
+                                                          "~/Dropbox/zk/hardware.org"))) (org-search-view))))
 
 ;; Mac configuration
 (when (eq system-type 'darwin)
@@ -266,10 +275,6 @@
                              ("~/Dropbox/org/someday.org" :level . 1)
                              ("~/Dropbox/org/projects.org" :maxlevel . 2)
                              (,(format-time-string "~/Dropbox/org/%Y-%m.org") :level . 1)))
-  (setq org-agenda-text-search-extra-files '("~/Dropbox/zk/hls.org"
-                                             "~/Dropbox/zk/computing.org"
-                                             "~/Dropbox/zk/verification.org"
-                                             "~/Dropbox/zk/mathematics.org"))
         ;; Set custom agenda commands which can be activated in the agenda viewer.
   (setq org-agenda-custom-commands
         '(("w" "At work" tags-todo "@work"
@@ -317,6 +322,7 @@
            "DELG(d)"  ; A task that is in progress
            "WAIT(w)"  ; Something external is holding up this task
            "HOLD(h)"  ; This task is paused/on hold because of me
+           "DELG(l)"  ; This task is delegated
            "SMDY(m)" ; todo some day
            "|"
            "DONE(d!)"  ; Task successfully completed
@@ -326,7 +332,17 @@
            "[-](S)"   ; Task is in progress
            "[?](W)"   ; Task is being held up or paused
            "|"
-           "[X](D)"))); Task was completed
+           "[X](D)"))
+        org-todo-keyword-faces '(("[-]" . +org-todo-active)
+                                ("STRT" . +org-todo-active)
+                                ("[?]" . +org-todo-onhold)
+                                ("WAIT" . +org-todo-onhold)
+                                ("HOLD" . +org-todo-onhold)
+                                ("DELG" . +org-todo-onhold)
+                                ("SMDY" . +org-todo-onhold)
+                                ("PROJ" . +org-todo-project)
+                                ("NO" . +org-todo-cancel)
+                                ("KILL" . +org-todo-cancel))); Task was completed
 ;;  (setq org-html-head-extra
 ;;        "<script src=\"https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.11.1/tocbot.min.js\"></script>
 ;;<link rel=\"stylesheet\" href=\"https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.11.1/tocbot.css\">
@@ -496,7 +512,9 @@
         ebib-notes-storage 'multiple-notes-per-file)
   :config
   (add-to-list 'ebib-file-search-dirs "~/Dropbox/bibliography/papers")
-  (add-to-list 'ebib-file-associations '("pdf" . "open"))
+  (if (eq system-type 'darwin)
+      (add-to-list 'ebib-file-associations '("pdf" . "open"))
+    (add-to-list 'ebib-file-associations '("pdf" . nil)))
   (add-to-list 'ebib-citation-commands '(org-mode (("ref" "cite:%(%K%,)"))))
 
   (advice-add 'bibtex-generate-autokey :around
@@ -537,7 +555,6 @@
 
 (setq coq-may-use-prettify nil
       company-coq-prettify-symbols nil)
-(global-prettify-symbols-mode -1)
 
 (use-package! smartparens
   :config
@@ -603,8 +620,8 @@
   :config
   (direnv-mode))
 
-(use-package! alectryon
-  :load-path "/Users/yannherklotz/Projects/alectryon/etc/elisp")
+;;(use-package! alectryon
+;;  :load-path "/Users/yannherklotz/Projects/alectryon/etc/elisp")
 
 (defun ymhg/incr-id (ident)
   (let* ((ident-list (append nil ident nil))
@@ -811,12 +828,16 @@ https://yannherklotz.com")
    "d" #'ymhg/notmuch-search-delete-mail)
 
   (setq notmuch-saved-searches
-        '((:name "inbox"    :query "tag:inbox not tag:deleted"    :key "n")
-          (:name "flagged"  :query "tag:flagged"                  :key "f")
-          (:name "sent"     :query "tag:sent"                     :key "s")
-          (:name "drafts"   :query "tag:draft"                    :key "d")
-          (:name "mailbox"  :query "tag:mailbox not tag:deleted"  :key "m")
-          (:name "imperial" :query "tag:imperial not tag:deleted" :key "i"))))
+        '((:name "inbox" :query "tag:inbox not tag:deleted" :key "n")
+          (:name "flagged" :query "tag:flagged" :key "f")
+          (:name "sent" :query "tag:sent" :key "s")
+          (:name "drafts" :query "tag:draft" :key "d")
+          (:name "mailbox" :query "tag:mailbox not tag:deleted not tag:sent" :key "m")
+          (:name "imperial" :query "tag:imperial not tag:deleted not tag:sent" :key "i")))
+
+  (setq notmuch-fcc-dirs
+      '(("yann@yannherklotz.com"          . "mailbox/Sent -inbox +sent -unread +mailbox -new")
+        ("yann.herklotz15@imperial.ac.uk" . "\"imperial/Sent Items\" -inbox +sent -unread +imperial -new"))))
 
 ;;(use-package! ox-ssh
 ;;  :after org
diff --git a/notmuch/.notmuch-config b/notmuch/.notmuch-config
index 80b28eb..f3cf61f 100644
--- a/notmuch/.notmuch-config
+++ b/notmuch/.notmuch-config
@@ -11,7 +11,7 @@
 # configured here named ".notmuch".
 #
 [database]
-path=/Users/yannherklotz/.mail
+path=/home/ymherklotz/.mail
 
 # User configuration
 #
diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index efd4cc1..3a277c1 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -80,3 +80,5 @@ export CDS_LIC_FILE=5280@ee-llic01.ee.ic.ac.uk
 export SNPS_LICENSE_FILE=7182@ee-llic01.ee.ic.ac.uk
 export MGLS_LICENSE_FILE=1717@ee-llic01.ee.ic.ac.uk
 export LM_LICENSE_FILE=2100@ee-llic01.ee.ic.ac.uk:7193@ee-llic01.ee.ic.ac.uk:5280@ee-llic01.ee.ic.ac.uk:7182@ee-llic01.ee.ic.ac.uk:1717@ee-llic01.ee.ic.ac.uk
+
+export QMK_HOME=$HOME/projects/qmk_firmware