Changes frome chromebook

1 files changed, 25 insertions, 23 deletions

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)