Fixed tabs!

1 files changed, 262 insertions, 238 deletions

diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index d7e81e2..634eb15 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2021-06-30 21h34 EDT (hobbies)>
+;; Time-stamp: <2021-09-27 08h48 EDT (hobbies)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -16,26 +16,27 @@
 ;;       (enlarge-window-horizontally (- (+ 5 fill-column) ww)))))
 
 (use-package smart-tabs-mode
-	:ensure t
-	:config
-	(smart-tabs-insinuate 'c 'c++ 'java 'javascript 'cperl 'ruby 'nxml)
-	(setq whitespace-style '(face trailing tabs spaces lines
-																newline empty space-before-tab space-mark tab-mark
-																newline-mark)))
+  :ensure t
+  :config
+  (smart-tabs-insinuate 'c 'c++ 'java 'javascript 'cperl 'ruby 'nxml)
+  (setq whitespace-style '(face trailing tabs spaces lines
+				newline empty space-before-tab space-mark tab-mark
+				newline-mark)))
 
 (use-package flycheck
-	:defer t
-	:ensure t)
+  :defer t
+  :ensure t)
 
 (defun programming-setup ()
-	(subword-mode 1)
-	(electric-pair-local-mode)
-	;; Emacs25 compat
-	(if (fboundp 'display-line-numbers-mode)
-			(display-line-numbers-mode)
-		(linum-mode))
-	(setq auto-hscroll-mode t)
-	(yas-minor-mode-on))
+  (subword-mode 1)
+  (electric-pair-local-mode)
+  (set-fill-column 80)
+  ;; Emacs25 compat
+  (if (fboundp 'display-line-numbers-mode)
+      (display-line-numbers-mode)
+    (linum-mode))
+  (setq auto-hscroll-mode t)
+  (yas-minor-mode-on))
 
 (add-hook 'prog-mode-hook #'programming-setup)
 
@@ -43,37 +44,39 @@
 ;; Specific packages
 
 (use-package shift-number
-	:ensure t
-	:bind (("C-c s p" . shift-number-up)
-				 ("C-c s n" . shift-number-down)))
+  :ensure t
+  :bind (("C-c s p" . shift-number-up)
+	 ("C-c s n" . shift-number-down)))
 
 (use-package comment-dwim-2
-	:ensure t
-	:bind (("M-;" . comment-dwim-2))
-	:config (setq comment-multi-line t
-								comment-style 'extra-line))
+  :ensure t
+  :bind (("M-;" . comment-dwim-2))
+  :config (setq comment-multi-line t
+		comment-style 'extra-line))
 
 (use-package aggressive-indent
-	:ensure t
-	:defer t)
+  :ensure t
+  :defer t)
 
 (use-package yasnippet
-	:ensure t
-	:defer t
-	:commands yas-minor-mode-on)
+  :ensure t
+  :defer t
+  :commands yas-minor-mode-on)
 
 (use-package elec-pair
-	:defer t
-	:config
-	(setq electric-pair-delete-adjacent-pairs t
-				electric-pair-skip-self 'electric-pair-default-skip-self
-				electric-pair-preserve-balance t
-				electric-pair-skip-whitespace t
-				electric-pair-inhibit-predicate 'electric-pair-default-inhibit))
+  :defer t
+  :config
+  (setq electric-pair-delete-adjacent-pairs t
+	electric-pair-skip-self 'electric-pair-default-skip-self
+	electric-pair-preserve-balance t
+	electric-pair-skip-whitespace t
+	electric-pair-inhibit-predicate 'electric-pair-default-inhibit))
 
 (use-package lsp-mode
-	:ensure t
-	:defer t)
+  :ensure t
+  :defer t
+  :init
+  (setq lsp-keymap-prefix "M-l"))
 
 ;; -----------------------------------------------------------------------------
 ;; C
@@ -84,135 +87,135 @@
 ;;       gdb-show-main nil)
 
 (use-package cc-mode
-	:defer t
-	:bind (:map c-mode-map
-							("M-/" . lh-matching-delim))
-	:hook (c-mode . (lambda ()
-										(auto-fill-mode)
-										(set-fill-column 70)
-										(abbrev-mode 0)
-										(flycheck-mode 1)
-										(lsp) ;; clangd seems pretty good!
-										(c-toggle-hungry-state 1)
-										(c-toggle-electric-state 1)
-										(c-toggle-syntactic-indentation 1)))
-	:config
-	(c-add-style "gnu-mod"
-							 '("gnu"
-								 (c-basic-offset . 2)     ; Guessed value
-								 (c-offsets-alist
-									(block-close . 0)       ; Guessed value
-									(case-label . +)        ; Guessed value
-									(defun-block-intro . +) ; Guessed value
-									(defun-close . 0)       ; Guessed value
-									(defun-open . 0)        ; Guessed value
-									(else-clause . 0)       ; Guessed value
-									(statement . 0)         ; Guessed value
-									(statement-block-intro . +) ; Guessed value
-									(statement-case-intro . +) ; Guessed value
-									(statement-cont . +)    ; Guessed value
-									(substatement . +)      ; Guessed value
-									(topmost-intro . 0)     ; Guessed value
-									(topmost-intro-cont . 0) ; Guessed value
-									(access-label . -)
-									(annotation-top-cont . 0)
-									(annotation-var-cont . +)
-									(arglist-close . c-lineup-close-paren)
-									(arglist-cont c-lineup-gcc-asm-reg 0)
-									(arglist-cont-nonempty . c-lineup-arglist)
-									(arglist-intro . c-lineup-arglist-intro-after-paren)
-									(block-open . 0)
-									(brace-entry-open . 0)
-									(brace-list-close . 0)
-									(brace-list-entry . 0)
-									(brace-list-intro first c-lineup-2nd-brace-entry-in-arglist c-lineup-class-decl-init-+ +)
-									(brace-list-open . +)
-									(c . c-lineup-C-comments)
-									(catch-clause . 0)
-									(class-close . 0)
-									(class-open . 0)
-									(comment-intro . c-lineup-comment)
-									(composition-close . 0)
-									(composition-open . 0)
-									(cpp-define-intro c-lineup-cpp-define +)
-									(cpp-macro . -1000)
-									(cpp-macro-cont . +)
-									(do-while-closure . 0)
-									(extern-lang-close . 0)
-									(extern-lang-open . 0)
-									(friend . 0)
-									(func-decl-cont . +)
-									(inclass . +)
-									(incomposition . +)
-									(inexpr-class . +)
-									(inexpr-statement . +)
-									(inextern-lang . +)
-									(inher-cont . c-lineup-multi-inher)
-									(inher-intro . +)
-									(inlambda . 0)
-									(inline-close . 0)
-									(inline-open . 0)
-									(inmodule . +)
-									(innamespace . +)
-									(knr-argdecl . 0)
-									(knr-argdecl-intro . 5)
-									(label . 0)
-									(lambda-intro-cont . +)
-									(member-init-cont . c-lineup-multi-inher)
-									(member-init-intro . +)
-									(module-close . 0)
-									(module-open . 0)
-									(namespace-close . 0)
-									(namespace-open . 0)
-									(objc-method-args-cont . c-lineup-ObjC-method-args)
-									(objc-method-call-cont c-lineup-ObjC-method-call-colons c-lineup-ObjC-method-call +)
-									(objc-method-intro . [0])
-									(statement-case-open . +)
-									(stream-op . c-lineup-streamop)
-									(string . -1000)
-									(substatement-label . 0)
-									(substatement-open . +)
-									(template-args-cont c-lineup-template-args +))))
-	(setq c-default-style '((java-mode . "java")
-													(awk-mode . "awk")
-													(other . "gnu-mod"))))
+  :defer t
+  :bind (:map c-mode-map
+	      ("M-/" . lh-matching-delim))
+  :hook (c-mode . (lambda ()
+		    (auto-fill-mode)
+		    (set-fill-column 80)
+		    (abbrev-mode 0)
+		    (flycheck-mode 1)
+		    (lsp) ;; clangd seems pretty good!
+		    (c-toggle-hungry-state 1)
+		    (c-toggle-electric-state 1)
+		    (c-toggle-syntactic-indentation 1)))
+  :config
+  (c-add-style "gnu-mod"
+	       '("gnu"
+		 (c-basic-offset . 2)     ; Guessed value
+		 (c-offsets-alist
+		  (block-close . 0)       ; Guessed value
+		  (case-label . +)        ; Guessed value
+		  (defun-block-intro . +) ; Guessed value
+		  (defun-close . 0)       ; Guessed value
+		  (defun-open . 0)        ; Guessed value
+		  (else-clause . 0)       ; Guessed value
+		  (statement . 0)         ; Guessed value
+		  (statement-block-intro . +) ; Guessed value
+		  (statement-case-intro . +) ; Guessed value
+		  (statement-cont . +)    ; Guessed value
+		  (substatement . +)      ; Guessed value
+		  (topmost-intro . 0)     ; Guessed value
+		  (topmost-intro-cont . 0) ; Guessed value
+		  (access-label . -)
+		  (annotation-top-cont . 0)
+		  (annotation-var-cont . +)
+		  (arglist-close . c-lineup-close-paren)
+		  (arglist-cont c-lineup-gcc-asm-reg 0)
+		  (arglist-cont-nonempty . c-lineup-arglist)
+		  (arglist-intro . c-lineup-arglist-intro-after-paren)
+		  (block-open . 0)
+		  (brace-entry-open . 0)
+		  (brace-list-close . 0)
+		  (brace-list-entry . 0)
+		  (brace-list-intro first c-lineup-2nd-brace-entry-in-arglist c-lineup-class-decl-init-+ +)
+		  (brace-list-open . +)
+		  (c . c-lineup-C-comments)
+		  (catch-clause . 0)
+		  (class-close . 0)
+		  (class-open . 0)
+		  (comment-intro . c-lineup-comment)
+		  (composition-close . 0)
+		  (composition-open . 0)
+		  (cpp-define-intro c-lineup-cpp-define +)
+		  (cpp-macro . -1000)
+		  (cpp-macro-cont . +)
+		  (do-while-closure . 0)
+		  (extern-lang-close . 0)
+		  (extern-lang-open . 0)
+		  (friend . 0)
+		  (func-decl-cont . +)
+		  (inclass . +)
+		  (incomposition . +)
+		  (inexpr-class . +)
+		  (inexpr-statement . +)
+		  (inextern-lang . +)
+		  (inher-cont . c-lineup-multi-inher)
+		  (inher-intro . +)
+		  (inlambda . 0)
+		  (inline-close . 0)
+		  (inline-open . 0)
+		  (inmodule . +)
+		  (innamespace . +)
+		  (knr-argdecl . 0)
+		  (knr-argdecl-intro . 5)
+		  (label . 0)
+		  (lambda-intro-cont . +)
+		  (member-init-cont . c-lineup-multi-inher)
+		  (member-init-intro . +)
+		  (module-close . 0)
+		  (module-open . 0)
+		  (namespace-close . 0)
+		  (namespace-open . 0)
+		  (objc-method-args-cont . c-lineup-ObjC-method-args)
+		  (objc-method-call-cont c-lineup-ObjC-method-call-colons c-lineup-ObjC-method-call +)
+		  (objc-method-intro . [0])
+		  (statement-case-open . +)
+		  (stream-op . c-lineup-streamop)
+		  (string . -1000)
+		  (substatement-label . 0)
+		  (substatement-open . +)
+		  (template-args-cont c-lineup-template-args +))))
+  (setq c-default-style '((java-mode . "java")
+			  (awk-mode . "awk")
+			  (other . "gnu-mod"))))
 
 
 ;; -----------------------------------------------------------------------------
 ;; Rust
 
 (use-package cargo
-	:ensure t
-	:defer t)
+  :ensure t
+  :defer t)
 
 (use-package rust-mode
-	:ensure t
-	:defer t
-	:bind (:map rust-mode-map
-							("M-," . lh-backward-delim)
-							("M-." . lh-forward-delim)
-							("M-/" . lh-matching-delim)
-							("M-p" . beginning-of-defun)
-							("M-n" . end-of-defun)
-							("C-c C-c" . rust-compile)
-							("C-c C-r" . rust-run))
-	:hook (rust-mode . (lambda ()
-											 (cargo-minor-mode)
-											 ;; For some reason this is not automatic
-											 (setq-local electric-pair-pairs
-																	 (cons '(?' . ?') electric-pair-pairs))
-											 ;; Pair {} in rust format strings ... ?
-											 (setq-local electric-pair-text-pairs
-																	 (cons '(?{ . ?}) electric-pair-pairs))
-											 (flycheck-rust-setup)
-											 (lsp)))
-	:config
-	(setq rust-indent-offset 4
-				rust-indent-method-chain t
-				rust-indent-where-clause t
-				rust-format-on-save t)
-	(setq lsp-rust-server 'rust-analyzer
-				lsp-rust-analyzer-call-info-full nil))
+  :ensure t
+  :defer t
+  :bind (:map rust-mode-map
+	      ("M-," . lh-backward-delim)
+	      ("M-." . lh-forward-delim)
+	      ("M-/" . lh-matching-delim)
+	      ("M-p" . beginning-of-defun)
+	      ("M-n" . end-of-defun)
+	      ("C-c C-c" . rust-compile)
+	      ("C-c C-r" . rust-run))
+  :hook (rust-mode . (lambda ()
+		       (cargo-minor-mode)
+		       ;; For some reason this is not automatic
+		       (setq-local electric-pair-pairs
+				   (cons '(?' . ?') electric-pair-pairs))
+		       ;; Pair {} in rust format strings ... ?
+		       (setq-local electric-pair-text-pairs
+				   (cons '(?{ . ?}) electric-pair-pairs))
+		       (flycheck-rust-setup)
+		       (lsp)))
+  :config
+  (setq rust-indent-offset 4
+	rust-indent-method-chain t
+	rust-indent-where-clause t
+	rust-format-on-save t)
+  (setq lsp-rust-server 'rust-analyzer
+	lsp-rust-analyzer-call-info-full nil))
 
 ;; -----------------------------------------------------------------------------
 ;; Python
@@ -234,99 +237,120 @@
 ;; Zig
 
 (use-package zig-mode
-	:ensure t
-	:defer t
-	:hook (zig-mode . (lambda () (lsp)))
-	:bind (:map zig-mode-map
-							("M-," . lh-backward-delim)
-							("M-." . lh-forward-delim)
-							("M-/" . lh-matching-delim)
-							("M-p" . beginning-of-defun)
-							("M-n" . end-of-defun)
-							("C-c C-c" . zig-compile)
-							("C-c C-r" . zig-run))
-	:config
-	(require 'lsp)
-	(setq lsp-zig-zls-executable "~/prog/zig/zls/zig-out/bin/zls"))
+  :ensure t
+  :defer t
+  :hook (zig-mode . (lambda () (lsp)))
+  :init
+  (defun my-zig-run ()
+    (interactive)
+    (zig--run-cmd "build run"))
+  :bind (:map zig-mode-map
+	      ("M-," . lh-backward-delim)
+	      ("M-." . lh-forward-delim)
+	      ("M-/" . lh-matching-delim)
+	      ("M-p" . beginning-of-defun)
+	      ("M-n" . end-of-defun)
+	      ("C-c C-c" . zig-compile)
+	      ("C-c r" . zig-run)
+	      ("C-c C-r" . my-zig-run))
+  :config
+  (require 'lsp)
+  (setq zig-format-on-save nil
+	lsp-zig-zls-executable "~/prog/zig/zls/zig-out/bin/zls"))
+
+;; -------------------------------------------------------------------
+;; OCaml
+
+(use-package utop
+  :ensure t
+  :defer t
+  :config
+  (setq utop-command "opam config exec -- utop -emacs"))
+
+(use-package tuareg
+  :ensure t
+  :defer t
+  :hook (tuareg-mode . (lambda ()
+			 (utop-minor-mode))))
 
 ;; -------------------------------------------------------------------
 ;; Misc languages
 
 (use-package js-comint
-	:ensure t
-	:defer t
-	:config
-	(setq js-comint-program-command "node"
-				js-comint-program-arguments nil))
+  :ensure t
+  :defer t
+  :config
+  (setq js-comint-program-command "node"
+	js-comint-program-arguments nil))
 
 (use-package js2-mode
-	:ensure t
-	:defer t
-	:after js-comint
-	:mode "\\.js$"
-	:bind (:map js2-mode-map
-							("TAB" . js2-indent-line)
-							("C-x C-e" . js-send-last-sexp)
-							("C-c C-b" . js-send-buffer)
-							("C-c C-l" . js-load-file))
-	:hook (js2-mode . (lambda ()
-											(auto-revert-mode -1)
-											(yas-minor-mode-on))))
+  :ensure t
+  :defer t
+  :after js-comint
+  :mode "\\.js$"
+  :bind (:map js2-mode-map
+	      ("TAB" . js2-indent-line)
+	      ("C-x C-e" . js-send-last-sexp)
+	      ("C-c C-b" . js-send-buffer)
+	      ("C-c C-l" . js-load-file))
+  :hook (js2-mode . (lambda ()
+		      (auto-revert-mode -1)
+		      (yas-minor-mode-on))))
 
 (use-package nodemcu-mode
-	:ensure t
-	:defer t
-	: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))))))
+  :ensure t
+  :defer t
+  :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))))))
 
 (use-package lua-mode
-	:after nodemcu-mode
-	:ensure t
-	:defer t
-	:bind (:map lua-mode-map
-							("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)
-											(nodemcu-mode 1))))
+  :after nodemcu-mode
+  :ensure t
+  :defer t
+  :bind (:map lua-mode-map
+	      ("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)
+		      (nodemcu-mode 1))))
 
 (use-package verilog-mode
-	:ensure t
-	:defer t
-	:mode "\\.vl$"
-	:hook (verilog-mode . (lambda ()
-													(setq verilog-tool 'verilog-compiler)
-													(verilog-set-compile-command)))
-	:config
-	(setq verilog-compiler "iverilog"
-				verilog-tool 'verilog-compiler))
+  :ensure t
+  :defer t
+  :mode "\\.vl$"
+  :hook (verilog-mode . (lambda ()
+			  (setq verilog-tool 'verilog-compiler)
+			  (verilog-set-compile-command)))
+  :config
+  (setq verilog-compiler "iverilog"
+	verilog-tool 'verilog-compiler))
 
 (use-package gforth
-	:commands forth-mode
-	:mode (("\\.fs$" . forth-mode)
-				 ("\\.fb$" . forth-block-mode)
-				 ("\\.4th$" . forth-mode)))
+  :commands forth-mode
+  :mode (("\\.fs$" . forth-mode)
+	 ("\\.fb$" . forth-block-mode)
+	 ("\\.4th$" . forth-mode)))
 
 (use-package clojure-mode
-	:ensure t
-	:defer t)
+  :ensure t
+  :defer t)