changes from $work

5 files changed, 94 insertions, 86 deletions

diff --git a/emacs/init.el b/emacs/init.el
index d380686..54918ac 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -8,11 +8,7 @@
       tls-program '("gnutls-cli --x509cafile %t -p %p %h")
       gnutls-verify-error '((".*" :hostname)) ;; t interferes with the Gemini protocol
       gnutls-log-level 0
-      gnutls-min-prime-bits 2048
-      ;; gnutls-trustfiles '("/etc/ssl/certs/ca-certificates.crt" "/etc/pki/tls/certs/ca-bundle.crt" "/etc/ssl/ca-bundle.pem" "/usr/ssl/certs/ca-bundle.crt")
-      ;;imap-ssl-program '("gnutls-cli --x509cafile %t -p %p %s")
-      ;; smtpmail-stream-type 'starttls
-      )
+      gnutls-min-prime-bits 2048)
 
 (require 'package)
 (setq package-enable-at-startup nil
@@ -29,18 +25,6 @@
   (require 'use-package))
 (use-package bind-key :ensure t :demand)
 
-(use-package pinentry
-  :ensure t
-  :demand
-  :config
-  (setq epa-pinentry-mode 'loopback)
-  (pinentry-start))
-
-(use-package keychain-environment
-  :ensure t
-  :config
-  (keychain-refresh-environment))
-
 (use-package init-loader
   :ensure t
   :demand
diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index 18ac7b3..fab9724 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -36,15 +36,10 @@
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 
 (when (eq 'x (window-system))
-	;;; Time-based theming
-  ;; (if (<= 20 (nth 2 (decode-time)))
-  ;;     (load-theme 'nord t)
-  ;;   (load-theme 'solo-jazz t))
-  ;; (load-theme 'solo-jazz t)
   (load-theme 'acme t)
   (set-face-attribute 'font-lock-comment-face nil :slant 'italic)
   ;; (set-face-attribute 'region nil :background "orange")
-  (set-face-attribute 'default nil :font "Iosevka-14")
+  (set-face-attribute 'default nil :font "Hermit-14")
   (set-face-attribute 'variable-pitch nil :font "Frank Ruehl CLM-18"))
 
 
@@ -74,15 +69,15 @@
 
 (setq fill-column 80)
 
-(setq standard-indent 2)
-(setq-default tab-width 8
-	      indent-tabs-mode t)
+(setq standard-indent 4)
+(setq-default tab-width 4
+              indent-tabs-mode nil)
 (add-hook 'before-save-hook #'whitespace-cleanup)
 
 (show-paren-mode t)
 
 (setq-default truncate-lines t
-	      truncate-partial-width-windows nil)
+           	  truncate-partial-width-windows nil)
 (setq scroll-step 1
       scroll-margin 5)
 
@@ -112,19 +107,6 @@
 (require 'saveplace)
 (save-place-mode)
 
-;; (use-package undo-tree
-;;   :ensure t
-;;   :config (setq undo-tree-visualizer-timestamps t)
-;;   (global-undo-tree-mode 1))
-
-(use-package keyfreq
-  :ensure t
-  :config
-  (setq keyfreq-file "~/.emacs.d/keyfreq"
-	keyfreq-file-lock "~/.emacs.d/keyfreq.lock")
-  (keyfreq-mode 1)
-  (keyfreq-autosave-mode 1))
-
 ;; -----------------------------------------------------------------------------
 ;; Scratch buffer
 
diff --git a/emacs/inits/11-completion.el b/emacs/inits/11-completion.el
index 421b8a0..9cf6e19 100644
--- a/emacs/inits/11-completion.el
+++ b/emacs/inits/11-completion.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2022-04-17 09h49 EDT (academic)>
+;; Time-stamp: <2022-08-09 08h10 CEST (anchor)>
 
 ;; -----------------------------------------------------------------------------
 ;; Vertico
@@ -65,8 +65,6 @@
 	 ;; M-g bindings (goto-map)
 	 ("M-g e" . consult-compile-error)
 	 ("M-g f" . consult-flymake)               ;; Alternative: consult-flycheck
-	 ("C-s" . consult-line)                    ;; orig. goto-line
-	 ("C-r" . isearch-forward-regexp)
 	 ("M-g M-g" . consult-goto-line)           ;; orig. goto-line
 	 ("M-g o" . consult-outline)               ;; Alternative: consult-org-heading
 	 ("M-g m" . consult-mark)
@@ -151,3 +149,8 @@
   :ensure t
   :bind (:map minibuffer-local-map ("M-A" . marginalia-cycle))
   :init (marginalia-mode))
+
+(use-package ctrlf
+  :ensure t
+  :config
+  (ctrlf-mode 1))
diff --git a/emacs/inits/15-project-mgmt.el b/emacs/inits/15-project-mgmt.el
index 5afb74f..421e1a3 100644
--- a/emacs/inits/15-project-mgmt.el
+++ b/emacs/inits/15-project-mgmt.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2022-05-04 21h30 CDT (hobbies)>
+;; Time-stamp: <2022-09-02 08h55 CEST (anchor)>
 
 (use-package projectile
   :ensure t
@@ -7,24 +7,18 @@
   :config
   (projectile-mode 1)
 
-  (defadvice projectile-project-root (around ignore-remote first activate)
-    (unless (file-remote-p default-directory) ad-do-it))
-
   (setq projectile-indexing-method 'alien
-	projectile-sort-order 'recently-active
-	projectile-enable-caching t
-	projectile-require-root t
-	projectile-completion-system 'default
-	projectile-mode-line-prefix ""
-	projectile-mode-line-function '(lambda ()
-	                                 (format " ¶[%s]" (projectile-project-name)))
-	;; projectile-mode-line-function '(lambda () " ¶")
-	))
+    projectile-sort-order 'recently-active
+    projectile-enable-caching t
+    projectile-require-root t
+    projectile-completion-system 'default
+    projectile-mode-line-prefix ""
+    projectile-mode-line-function '(lambda ()
+                                     (format " ¶[%s]" (projectile-project-name)))
+    ))
 
 (use-package magit
   :ensure t
   :bind (("C-x g" . magit-status))
   :config
   (setq magit-process-find-password-functions '(magit-process-password-auth-source)))
-
-(setenv "SSH_AUTH_SOCK" "/home/user/.SSH_AGENT_vault-keys")
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index b1b4c38..9bea91e 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -15,31 +15,28 @@
 ;;     (when (< ww (+ 5 fill-column))
 ;;       (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)))
-
-(use-package flycheck
-  :defer t
-  :ensure t)
-
 (defun programming-setup ()
   (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))
+  (hs-minor-mode)
+  (display-line-numbers-mode 1)
   (setq auto-hscroll-mode t)
   (yas-minor-mode-on))
 
 (add-hook 'prog-mode-hook #'programming-setup)
 
+(defun align-to-equals (begin end)
+  "Align region to equal signs"
+  (interactive "r")
+  (align-regexp begin end "\\(\\s-*\\)=" 1 1 ))
+
+(use-package centered-window
+  :ensure t)
+
+(use-package hideshow
+  :bind (("C-c C-f C-f" . hs-toggle-hiding)))
+
 ;; -----------------------------------------------------------------------------
 ;; Specific packages
 
@@ -189,6 +186,10 @@
   :ensure t
   :defer t)
 
+(use-package flycheck-rust
+  :ensure t
+  :defer t)
+
 (use-package rust-mode
   :ensure t
   :defer t
@@ -212,27 +213,41 @@
 		       (lsp)))
   :config
   (setq rust-indent-offset 4
-	rust-indent-method-chain t
-	rust-indent-where-clause t
-	rust-format-on-save t)
+        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))
+        lsp-rust-analyzer-call-info-full nil))
 
 ;; -----------------------------------------------------------------------------
 ;; Python
 
-(use-package yapfify
+
+(use-package python-black
   :ensure t
-  :defer t)
+  :after python
+  ;; :hook (python-mode . python-black-on-save-mode-enable-dwim)
+  )
+
+(use-package highlight-indent-guides
+  :ensure t
+  :defer t
+  :config
+  (setq highlight-indent-guides-auto-odd-face-perc 1.5 ;; 10
+        highlight-indent-guides-auto-even-face-perc 3 ;; 15
+))
 
 (use-package python
   :hook (python-mode . (lambda ()
-			 (lsp)
-			 (yapf-mode)))
-  :config
-  (setq lsp-pylsp-plugins-pycodestyle-enabled nil
-	lsp-pylsp-plugins-pydocstyle-enabled nil
-	python-shell-interpreter "python3"))
+                         (highlight-indent-guides-mode)
+                         (visual-line-mode)
+                         ;; (yapf-mode)
+                         ))
+  :bind (:map python-mode-map
+              ("C-c C-f" . nil))
+  ;; :config
+  ;; (setq python-shell-interpreter "python3")
+  )
 
 ;; -----------------------------------------------------------------------------
 ;; Zig
@@ -355,3 +370,33 @@
 (use-package clojure-mode
   :ensure t
   :defer t)
+
+;; -------------------------------------------------------------------
+;; JSON and related
+
+(use-package json-mode
+  :ensure t
+  :defer t
+  :mode (("\\.json\\.jinja\\'" . json-mode)
+         ("\\.jinja" . json-mode))
+  :hook (json-mode . (lambda ()
+                       (programming-setup)
+                       (setq standard-indent 2)
+                       (setq js-indent-level 2)
+                       (setq tab-width 2
+                             indent-tabs-mode nil)))
+  :bind (:map json-mode-map
+              ("C-c C-f" . nil)))
+
+(use-package jinja2-mode
+  :ensure t
+  :defer t
+  :mode ("\\.jinja\\'" . jinja2-mode)
+  :hook (jinja2-mode . (lambda ()
+                         (setq indent-line-function 'indent-relative)
+                         (highlight-indent-guides-mode)
+                         (programming-setup)
+                         (spell-fu-mode -1)
+                         (auto-fill-mode -1)))
+  :bind (:map jinja2-mode-map
+              ("C-c C-f" . nil)))