Changes frome chromebook

10 files changed, 47 insertions, 43 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 8395564..da07954 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-04-15 16:22:30 (tslil@basingstoke)>
+;; Time-stamp: <2019-10-03 11:57:43 (tslil@basingstoke)>
 
 ;; Faster startup
 (setq gc-cons-threshold 100000000
@@ -18,6 +18,8 @@
       ;;imap-ssl-program '("gnutls-cli --x509cafile %t -p %p %s")
       smtpmail-stream-type 'starttls)
 
+;; Workaround for 26.2. Remove later
+(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
 
 (require 'package)
 (setq package-enable-at-startup nil
diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index 5c66367..43ea233 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-09-11 10:19:29 (tslil@basingstoke)>
+;; Time-stamp: <2019-10-20 22:15:45 (tslil@basingstoke)>
 
 ;; -----------------------------------------------------------------------------
 ;; Interface
@@ -40,7 +40,7 @@
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 (when (eq 'x (window-system))
   (load-theme 'zenburn t)
-  (set-face-attribute 'default nil :font "Fira Code-14"))
+  (set-face-attribute 'default nil :font "Sudo-15"))
 
 (set-fringe-style 0)
 ;; (set-fringe-mode 128)
diff --git a/emacs/inits/03-miscload.el b/emacs/inits/03-miscload.el
index 2ac2f54..3047465 100644
--- a/emacs/inits/03-miscload.el
+++ b/emacs/inits/03-miscload.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-01-26 12:49:48 (tslil@winslow)>
+;; Time-stamp: <2019-09-11 11:28:17 (tslil@basingstoke)>
 
 ;;(add-to-list 'load-path (expand-file-name "~/.emacs.d/scripts/"))
 
@@ -12,6 +12,3 @@
 (use-package imaxima
   :defer t
   :config (setq imaxima-use-maxima-mode-flag t))
-
-(use-package notmuch
-  :defer t)
diff --git a/emacs/inits/06-dashboard.el b/emacs/inits/06-dashboard.el
index 7aae2a0..4c6d2a7 100644
--- a/emacs/inits/06-dashboard.el
+++ b/emacs/inits/06-dashboard.el
@@ -1,11 +1,11 @@
-;; Time-stamp: <2019-09-11 10:42:40 (tslil@basingstoke)>
+;; Time-stamp: <2019-11-12 10:56:10 (tslil@basingstoke)>
 
 (use-package fortune
   :config
   (setq fortune-dir "/usr/share/games/fortunes/"
         fortune-program "fortune"
         fortune-file "/usr/share/games/fortunes/cookie"
-        fortune-program-options '("-s"))
+        fortune-program-options '("-s" "tao" "wisdom"))
   (defun dashboard-fortune (n)
     (insert
      (with-temp-buffer
@@ -21,7 +21,7 @@
   (setq dashboard-center-content t
         dashboard-set-init-info t
         dashboard-set-footer nil
-        dashboard-startup-banner 1
+        dashboard-startup-banner 3
         dashboard-items '((recents . 5)
                           (projects . 5)
                           (fortune . 0))
diff --git a/emacs/inits/13-ibuffer.el b/emacs/inits/13-ibuffer.el
index c46babe..f88657a 100644
--- a/emacs/inits/13-ibuffer.el
+++ b/emacs/inits/13-ibuffer.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-05-26 18:21:05 (tslil@basingstoke)>
+;; Time-stamp: <2019-12-01 09:47:08 (tslil@basingstoke)>
 
 (use-package ibuffer
   :bind (("C-x C-b" . ibuffer))
@@ -30,6 +30,7 @@
                         (mode . doc-view-mode)))
            ("org" (mode . org-mode))
            ("REPL" (name . "^\\*.*REPL.*\\*$"))
+           ("rust" (mode . rust-mode))
            ("slime" (name . "^\\*slime-[^*]*\\*$"))
            ("tex" (mode . latex-mode))
            ("web" (or (mode . js2-mode)
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 5bf5cb5..e4a6227 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,13 +1,15 @@
-;; Time-stamp: <2019-12-08 23:27:56 (tslil@bison)>
+;; Time-stamp: <2019-12-08 13:25:35 (tslil@basingstoke)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
 
+;; Always split horizontally when compiling
 (defadvice compile (around split-horizontally activate)
   (let ((split-width-threshold 0)
         (split-height-threshold nil))
     ad-do-it))
 
+;; Resize to fill column (and a little bit)
 (defadvice compile (after resize-window-properly activate)
   (let ((ww (window-width)))
     (when (< ww (+ 5 fill-column))
@@ -15,7 +17,7 @@
 
 (defun programming-setup ()
   (subword-mode 1)
-  (electric-pair-local-mode)
+  (electric-pair-mode 1)
   ;; Emacs25 compat
   (if (fboundp 'display-line-numbers-mode)
       (display-line-numbers-mode)
@@ -48,9 +50,14 @@
   :defer t
   :config
   (setq electric-pair-delete-adjacent-pairs t
-        electric-pair-skip-self t
+        electric-pair-skip-self 'electric-pair-default-skip-self
         electric-pair-preserve-balance t
-        electric-pair-skip-whitespace t))
+        electric-pair-skip-whitespace t
+        electric-pair-pairs '((?\" . ?\")
+                              (?' . ?')
+                              (?\( . ?\))
+                              (?< . ?>)
+                              (?\[ . ?\]))))
 
 (use-package js-comint
   :ensure t
@@ -79,20 +86,7 @@
   :config
   (setq nodemcu-default-keybindings t
         nodemcu-port "/dev/ttyUSB0"
-        nodemcu-backend "nodemcu-uploader")
-
-  (defun nodemcu-better-upload-current-file (&optional noreset)
-    (interactive "P")
-    (let ((proc (get-process "nodemcu-terminal")))
-      (when proc
-        (delete-process proc))
-      (shell-command
-       (nodemcu--get-command "upload" (file-name-nondirectory (buffer-file-name))))
-      (unless noreset
-        (shell-command
-         (nodemcu--get-command "node restart"))
-      (when proc
-        (nodemcu-terminal)))))
+        nodemcu-backend "nodemcu-uploader"))
 
 (use-package lua-mode
   :after nodemcu-mode
@@ -102,14 +96,12 @@
               ("C-x C-e" . lua-send-current-line)
               ("C-c C-d" . lua-send-defun)
               ("C-c C-e" . lua-send-region)
-              ("C-c C-u" . nodemcu-better-upload-current-file)
-              ("C-c C-t" . nodemcu-terminal)
               ("M-n" . lua-forward-sexp)
               ("M-p" . lua-backwards-to-block-begin-or-end))
   :hook (lua-mode . (lambda ()
                       (require 'nodemcu-mode)
                       (use-package company-lua :ensure t :demand)
-                      (nodemcu-mode 1)
+                      (nodemcu-mode)
                       (add-to-list 'company-backends 'company-lua))))
 
 ;; What are these?
@@ -154,7 +146,17 @@
   :ensure t
   :defer t
   :bind (:map rust-mode-map
-              ("C-c C-c" . rust-compile))
+              ("C-c C-c" . rust-compile)
+              ("C-c C-r" . rust-run))
   :hook (rust-mode . (lambda ()
                        (flycheck-mode)
-                       (flycheck-rust-setup))))
+                       (flycheck-rust-setup)))
+  :config
+  (setq rust-indent-offset 4
+        rust-indent-method-chain t
+        rust-indent-where-clause t
+        rust-format-on-save t))
+
+(use-package verilog-mode
+  :ensure t
+  :defer t)
diff --git a/emacs/inits/21-functional.el b/emacs/inits/21-functional.el
index 90d0fba..bdafc4b 100644
--- a/emacs/inits/21-functional.el
+++ b/emacs/inits/21-functional.el
@@ -1,19 +1,18 @@
-;; Time-stamp: <2019-06-03 17:36:44 (tslil@basingstoke)>
+;; Time-stamp: <2019-09-18 23:23:51 (tslil@basingstoke)>
 
 ;; -----------------------------------------------------------------------------
 ;; Haskell
 
 (use-package haskell-mode
-  :ensure t
+  :ensure nil
   :defer t)
 
 (use-package intero
-  :ensure t
+  :ensure nil
   :defer t
   :hook (haskell-mode . (lambda ()
                           (intero-mode)
-                          (flycheck-mode -1)))
-  )
+                          (flycheck-mode -1))))
 
 ;; (use-package ghc :ensure t :defer t)
 
diff --git a/emacs/inits/22-lisp.el b/emacs/inits/22-lisp.el
index 872fe9a..8365293 100644
--- a/emacs/inits/22-lisp.el
+++ b/emacs/inits/22-lisp.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-03-20 17:11:15 (tslil@basingstoke)>
+;; Time-stamp: <2019-10-02 22:40:52 (tslil@basingstoke)>
 
 ;; ----------------------------------------------------------------------------
 ;; Lisp helpers
@@ -103,6 +103,9 @@
 
 (use-package slime
   :ensure t
+  :bind (:map slime-mode-map
+              ("M-n" . nil)
+              ("M-p" . nil))
   :after caps-lock-mode
   :hook ((lisp-mode . (lambda ()
                         (aggressive-indent-mode)
diff --git a/emacs/inits/24-latex.el b/emacs/inits/24-latex.el
index 98eb70c..a07425b 100644
--- a/emacs/inits/24-latex.el
+++ b/emacs/inits/24-latex.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-05-27 11:22:10 (tslil@basingstoke)>
+;; Time-stamp: <2019-09-23 11:24:20 (tslil@basingstoke)>
 
 (defvar latex-template-dir (expand-file-name "~/academic/typeset/latex-templates"))
 (defun prompt-latex-file-template ()
diff --git a/emacs/inits/25-theorems.el b/emacs/inits/25-theorems.el
index ed3619d..614a4b2 100644
--- a/emacs/inits/25-theorems.el
+++ b/emacs/inits/25-theorems.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2019-09-11 13:59:30 (tslil@basingstoke)>
+;; Time-stamp: <2019-09-18 11:36:11 (tslil@basingstoke)>
 
 ;; -----------------------------------------------------------------------------
 ;; Coq
@@ -39,7 +39,7 @@
                             "-indices-matter"
                             "-type-in-type" "-w" "-notation-overridden"
                             "-Q" "/home/tslil/theorems/coq/UniMath/UniMath" "UniMath"
-                            "-Q" "/home/tslil/academic/proof_relevant_cats/formalisation" "wCats"))
+                            "-Q" "/home/tslil/academic/proof_relevant_cats/formalisation" "PRCats"))
                     ("HoTT"
                      :topdir "~/theorems/coq/HoTT/"
                      :binary "hoqtop"