Merge remote-tracking branch 'origin/master'

4 files changed, 33 insertions, 7 deletions

diff --git a/X/.xinitrc b/X/.xinitrc
index a05c46a..909ad9a 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -5,6 +5,9 @@ usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
+export GTK_IM_MODULE=xim
+export QT_IM_MODULE=xim
+
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
diff --git a/doom/config.org b/doom/config.org
index 5841d19..935a0b7 100644
--- a/doom/config.org
+++ b/doom/config.org
@@ -39,6 +39,7 @@
 (electric-indent-mode -1)
 (menu-bar-mode -1)
 
+(add-hook 'text-mode-hook (lambda () (company-mode -1)))
 #+end_src
 
 * Key Binding Customisations
@@ -51,8 +52,7 @@
 (global-set-key (kbd "M-c")   #'capitalize-dwim)
 (global-set-key (kbd "C-c z") #'quick-calc)
 (global-set-key (kbd "<f5>")  #'revert-buffer)
-(global-set-key (kbd "C-.")   #'other-window)
-(global-set-key (kbd "C-,")   (lambda () (interactive) (other-window -1)))
+(global-set-key (kbd "M-,")   (lambda () (interactive) (other-window -1)))
 (global-set-key (kbd "C-c l") #'org-store-link)
 (global-set-key (kbd "C-c a") #'org-agenda)
 (global-set-key (kbd "C-c /") #'avy-goto-word-1)
@@ -662,7 +662,10 @@
         "M-r" #'sp-split-sexp)
   (require 'smartparens-config)
   (show-smartparens-global-mode +1)
-  (smartparens-global-mode 1))
+  (smartparens-global-mode 1)
+;;(sp-pair "'" nil :actions :rem)
+  (sp-local-pair 'coq-mode "'" nil :actions nil)
+  )
 
 (after! writeroom-mode (setq +zen-text-scale 1))
 
@@ -1021,13 +1024,29 @@ https://yannherklotz.com")
   (when (eq system-type 'darwin)
     (setq alectryon-executable "/nix/store/bvlk3hyrjdgl0sg93rrdr2z71hgza0m9-python3.9-alectryon-1.4.0/bin/alectryon"))
   (map! :map alectryon-mode-map
-        "C-c u t" #'alectryon-toggle))
+        "C-c u t" #'alectryon-toggle
+        "C-c u p" #'ymhg/alectryon-preview)
+  (defun ymhg/alectryon-preview ()
+    "Display an HTML preview of the current buffer."
+    (interactive)
+    (let* ((html-fname (make-temp-file "alectryon" nil ".html"))
+           (args `("-r" "5" "-" ,html-fname)))
+      (apply #'call-process-region nil nil "rst2html5" nil nil nil args)
+      (message "Compilation complete")
+      (browse-url html-fname))))
+
+(use-package! rst
+  :config
+  (add-hook 'rst-mode-hook (lambda () (setq fill-column 80))))
+
+(use-package! ox-context
+  :after org)
 
 (use-package! ox-tufte
   :after org
   :config)
 
-(add-to-list 'load-path "/usr/local/Cellar/agda/2.6.2.2/cabal/store/ghc-8.10.7/Agd-2.6.2.2-3bca6588/share/emacs-mode")
-
-(use-package! agda2-mode)
+;;(add-to-list 'load-path "/usr/local/Cellar/agda/2.6.2.2/cabal/store/ghc-8.10.7/Agd-2.6.2.2-3bca6588/share/emacs-mode")
+;;
+;;(use-package! agda2-mode)
 #+end_src
diff --git a/doom/packages.el b/doom/packages.el
index 6b5f23c..9089104 100644
--- a/doom/packages.el
+++ b/doom/packages.el
@@ -8,6 +8,8 @@
 (package! ox-gfm)
 (package! ox-tufte
   :recipe (:host nil :repo "https://git.sr.ht/~ymherklotz/ox-tufte"))
+(package! ox-context
+  :recipe (:host github :repo "Jason-S-Ross/ox-context"))
 (package! org-transclusion
   :recipe (:host github :repo "nobiot/org-transclusion"))
 (package! org-zettelkasten
diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 5bd3ed9..1cc8bef 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -13,6 +13,7 @@ export VISUAL='emacsclient -c'
 export TERM='xterm-256color'
 export CLICOLOR=1
 export LEDGER_FILE="$HOME/Dropbox/ledger/main.ledger"
+export VAGRANT_HOME=/mnt/orca/vagrant
 
 #export LFSCSIGS="$HOME/.opam/default/.opam-switch/sources/coq-smtcoq.dev+8.13/src/lfsc/tests/signatures"
 
@@ -42,6 +43,7 @@ prepend_path "/opt/context/tex/texmf-osx-64/bin"
 # prepend_path "/usr/local/opt/llvm/bin"
 
 prepend_path "/mnt/data/tools/panda/bambu-9.7-dev/bin"
+prepend_path "/opt/context/tex/texmf-linux-64/bin"
 
 append_path "/opt/Xilinx/Vivado/2019.1/bin"
 append_path "/opt/intelFPGA_lite/18.1/quartus/bin"