Add more configurations

7 files changed, 112 insertions, 26 deletions

diff --git a/X/.xinitrc b/X/.xinitrc
index 22cbeb1..b9ea301 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -33,12 +33,10 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 xset r rate 200 30
-setxkbmap us -variant colemak -option altwin:swap_alt_win
 
 # Startup programs
 eval $(ssh-agent)
 sxhkd &
-compton &
 redshift &
 dunst &
 xrandr --output DP-1 --rotate normal --auto --output DVI-1-0 --rotate right --right-of DP-1 --auto --output DP-2 --left-of DP-1 --auto
diff --git a/doom/config.el b/doom/config.el
index d38f9e6..47b4b97 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -83,7 +83,7 @@
 (define-key y-map (kbd "p")   #'password-store-copy)
 (define-key y-map (kbd "i")   #'password-store-insert)
 (define-key y-map (kbd "g")   #'password-store-generate)
-(define-key y-map (kbd "r")   #'toggle-rot13-mode)
+;(define-key y-map (kbd "r")   #'toggle-rot13-mode)
 (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)
@@ -229,6 +229,7 @@
         org-hide-emphasis-markers t
         org-adapt-indentation nil
         org-cycle-separator-lines 2
+        org-goto-interface 'outline-path-completion
         org-structure-template-alist '(("a" . "export ascii")
                                        ("c" . "center")
                                        ("C" . "comment")
@@ -501,6 +502,16 @@
 (set-register ?p (cons 'file "~/Dropbox/org/projects.org"))
 (set-register ?c (cons 'file (format-time-string "~/Dropbox/org/%Y-%m.org")))
 
+(after! pdf-tools
+  (pdf-tools-install))
+
+(after! latex
+  (setq TeX-view-program-selection '((output-pdf "PDF Tools"))
+        TeX-source-correlate-start-server t)
+  (setq-default TeX-command-extra-options "-shell-escape")
+  (add-hook 'TeX-after-compilation-finished-functions
+            #'TeX-revert-document-buffer))
+
 ;; Bibtex stuff
 (use-package! ebib
   :bind (("C-c y b" . ebib))
@@ -526,9 +537,7 @@
 ;; Set up dictionaries
 (setq ispell-dictionary "en_GB")
 
-(use-package! flyspell
-  :hook (text-mode . flyspell-mode)
-  :config
+(after! flyspell
   (define-key flyspell-mode-map (kbd "C-.") nil)
   (define-key flyspell-mode-map (kbd "C-,") nil))
 
@@ -630,17 +639,20 @@
 ;;(use-package! alectryon
 ;;  :load-path "/Users/yannherklotz/Projects/alectryon/etc/elisp")
 
+(use-package! alectryon)
+
 (use-package! org-zettelkasten
   :config
   (add-hook 'org-mode-hook #'org-zettelkasten-mode)
 
   (defun org-zettelkasten-search-current-id ()
-  "Use `consult-ripgrep' to search for the current ID in all files."
-  (interactive)
-  (let ((current-id (org-entry-get nil "CUSTOM_ID")))
-    (consult-ripgrep org-zettelkasten-directory (concat "[\\[:]." current-id "\\]#"))))
+    "Use `consult-ripgrep' to search for the current ID in all files."
+    (interactive)
+    (let ((current-id (org-entry-get nil "CUSTOM_ID")))
+      (consult-ripgrep org-zettelkasten-directory (concat "[\\[:]." current-id "\\]#"))))
 
-  (define-key org-zettelkasten-mode-map (kbd "s") #'org-zettelkasten-search-current-id))
+  (define-key org-zettelkasten-mode-map (kbd "r") #'org-zettelkasten-search-current-id)
+  (setq org-zettelkasten-directory "~/Dropbox/zk"))
 
 (use-package! ox-hugo
   :after ox)
@@ -948,3 +960,35 @@ https://yannherklotz.com")
 
   ;; Enable recursive minibuffers
   (setq enable-recursive-minibuffers t))
+
+(use-package! boogie-friends)
+
+(use-package! isar-mode
+  :mode "\\.thy\\'")
+
+(use-package isar-goal-mode)
+
+(use-package lsp-isar
+  :after lsp-mode
+  :commands lsp-isar-define-client-and-start
+  :init
+  (add-hook 'isar-mode-hook #'lsp-isar-define-client-and-start)
+  (add-hook 'lsp-isar-init-hook 'lsp-isar-open-output-and-progress-right-spacemacs)
+  :config
+  (setq lsp-isar-path-to-isabelle "~/projects/isabelle-emacs")
+  (setq lsp-isabelle-options (list "-d" "\$AFP")))
+
+(use-package session-async)
+
+(defun ymhg/reset-coq-windows ()
+  "Resets the Goald and Response windows."
+  (interactive)
+  (other-frame 1)
+  (delete-other-windows)
+  (split-window-below)
+  (switch-to-buffer "*goals*")
+  (other-window 1)
+  (switch-to-buffer "*response*")
+  (other-frame 2))
+
+(define-key y-map (kbd "o")   #'ymhg/reset-coq-windows)
diff --git a/doom/packages.el b/doom/packages.el
index 8a3016f..6fbaa71 100644
--- a/doom/packages.el
+++ b/doom/packages.el
@@ -10,6 +10,12 @@
 (package! ox-tufte)
 (package! org-transclusion
   :recipe (:host github :repo "nobiot/org-transclusion"))
+(package! org-zettelkasten
+  :recipe (:host github :repo "ymherklotz/emacs-zettelkasten"))
+(package! elfeed-org)
+
+;; Latex stuff
+(package! pdf-tools)
 
 ;; Bibtex stuff
 (package! ebib)
@@ -17,7 +23,7 @@
 ;; Haskell stuff
 (package! ormolu)
 
-;; completion
+;; Completion
 (package! orderless)
 (package! vertico)
 (package! marginalia)
@@ -26,33 +32,57 @@
 (package! embark-consult)
 (package! ripgrep)
 
-(package! direnv)
+;; Extra language mobdes
 (package! yaml-mode)
+(package! slime)
 
-(package! erc-hl-nicks)
-(package! alert)
-(package! znc)
-
-(package! elfeed)
-(package! elfeed-org)
+;; Nix
+(package! direnv)
 
 ;; Misc dependencies
 (package! hungry-delete)
-(package! vagrant-tramp)
+(package! elfeed)
 
+;; Chatting
 (package! plz
   :recipe (:host github :repo "alphapapa/plz.el"))
 (package! ement
   :recipe (:host github :repo "alphapapa/ement.el"))
-(package! org-zettelkasten
-  :recipe (:host github :repo "ymherklotz/emacs-zettelkasten"))
+(package! erc-hl-nicks)
+(package! alert)
+(package! znc)
+
+;; Coq
+(package! alectryon) ;; Coq documentation tool
+
+;; Teaching
+(package! boogie-friends)
 
+(package! isar-mode
+  :recipe (:host github :repo "m-fleury/isar-mode"))
+(package! isar-goal-mode
+  :recipe (:host github :repo "m-fleury/simp-isar-mode"))
+(package! lsp-isar
+  :recipe (:host github :repo "m-fleury/isabelle-emacs"
+           :branch "Isabelle2021-more-vscode"
+           :files ("src/Tools/emacs-lsp/lsp-isar/*.el")))
+(package! session-async)
+
+;; Privacy
 (package! pinentry)
 
+;; Emacs lisp
 (package! package-lint)
 
 ;; Themes
 (package! color-theme-sanityinc-tomorrow)
 (package! modus-themes)
-;;(package! modus-operandi-theme)
-;;(package! modus-vivendi-theme)
+
+;; Temp fixes
+;; https://github.com/hlissner/doom-emacs/issues/5667#issuecomment-948229579
+(package! gitconfig-mode
+  :recipe (:host github :repo "magit/git-modes"
+           :files ("gitconfig-mode.el")))
+(package! gitignore-mode
+  :recipe (:host github :repo "magit/git-modes"
+           :files ("gitignore-mode.el")))
diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc
index c85c1f4..221a067 100644
--- a/isync/.mbsyncrc
+++ b/isync/.mbsyncrc
@@ -2,7 +2,7 @@ IMAPAccount imperial
 Host outlook.office365.com
 Port 993
 User ymh15@ic.ac.uk
-PassCmd "pass show imperial/ymh15"
+PassCmd "pass show imperial/emacs-app"
 SSLType IMAPS
 
 IMAPAccount mailbox
diff --git a/msmtp/config b/msmtp/config
index a837836..ff5ca51 100644
--- a/msmtp/config
+++ b/msmtp/config
@@ -15,6 +15,6 @@ host           smtp.office365.com
 port           587
 from           yann.herklotz15@imperial.ac.uk
 user           ymh15@ic.ac.uk
-passwordeval   "pass show imperial/ymh15"
+passwordeval   "pass show imperial/emacs-app"
 
 account default : mailbox
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 78e64e9..8516115 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -142,6 +142,12 @@ super + alt + shift + ctrl + {p,f,g}
 super + alt + shift + ctrl + z
     emacsclient -c -a emacs
 
+super + alt + s
+    flameshot gui -p ~/Downloads
+
+super + alt + f
+    flameshot screen -p ~/Downloads
+
 #
 # Power
 #
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 157da7d..d3555fc 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -42,3 +42,11 @@ bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey -M emacs '^P' history-substring-search-up
 bindkey -M emacs ^N history-substring-search-down
+
+if [[ -z $TMUX ]]; then
+    function start_tmux {
+        tmux new -d -s vericert -c ~/projects/vericert
+        tmux new -d -s main -c ~
+    }
+    tmux attach || { start_tmux && tmux attach }
+fi