[emacs] add more to bqn mode; always use acme theme

2 files changed, 30 insertions, 20 deletions

diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index 67c53c5..6ef1d47 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-01-25 20h01 CET (anker)>
+;; Time-stamp: <2024-02-06 19h56 CET (1b415aec)>
 
 ;; -----------------------------------------------------------------------------
 ;; Interface
@@ -35,15 +35,7 @@
 
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 
-(use-package circadian
-  :ensure t
-  :config
-  (setq calendar-latitude 52.34
-        calendar-longitude 4.87
-        circadian-themes '((:sunrise . acme)
-                           ("15:00" . modus-operandi)
-                           (:sunset . doom-challenger-deep)))
-  (circadian-setup))
+(load-theme 'acme t)
 
 (defun my-disable-bold-fonts ()
   (interactive)
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index ba69e8d..7d9c42f 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-01-28 20h33 CET (anker)>
+;; Time-stamp: <2024-02-03 18h41 CET (81828d54)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -340,25 +340,34 @@
   :ensure t
   :defer
   :bind (:map bqn-mode-map
+              ("M-TAB" . expand-abbrev)
               ("C-c r r" . bqn-comint-eval-dwim)
               ("C-c r b" . bqn-comint-eval-buffer))
-  :hook (bqn-mode . (lambda () (eglot-ensure) (abbrev-mode)))
+  :hook (bqn-mode . (lambda () (eglot-ensure) (abbrev-mode) (bqn-comint-buffer)))
   :config
+  (require 'bqn-keymap-mode)
+  (require 'bqn-glyph-mode)
+  (setq save-abbrevs 'silently)
+  ;; (set-face-font 'bqn-default "Berkeley Mono")
+  (set-face-attribute 'bqn-default nil :height 320)
   (define-abbrev-table 'bqn-mode-abbrev-table
     '( ;; funtions
       ("abs" "│")
-      ("and" "∧")
       ("assert" "!")
       ("ceiling" "⌈")
       ("classify" "⊐")
+      ("conj" "∧")
       ("couple" "≍")
       ("deduplicate" "⍷")
       ("depth" "≡")
       ("deshape" "⥊")
       ("dgrade" "⍒")
+      ("disj" "∨")
       ("divide" "÷")
+      ("drop" "↓")
       ("dsort" "∧")
       ("enlist" "⋈")
+      ("find" "⍷")
       ("floor" "⌊")
       ("group" "⊔")
       ("gt" ">")
@@ -374,17 +383,17 @@
       ("maximum" "⌈")
       ("member" "∊")
       ("minimum" "⌊")
+      ("minus" "¯")
       ("modulus" "│")
       ("multiply" "×")
+      ("neg" "¬")
       ("neq" "≠")
       ("nmatch" "≢")
-      ("not" "¬")
       ("occurrence" "⊒")
-      ("or" "∨")
       ("pair" "⋈")
       ("pick" "⊑")
       ("power" "⋆")
-      ("prefixes" "↑")
+      ("prefix" "↑")
       ("range" "↕")
       ("recip" "÷")
       ("replicate" "/")
@@ -399,8 +408,8 @@
       ("solo" "≍")
       ("span" "¬")
       ("sqrt" "√")
-      ("subtract" "─")
-      ("suffixes" "↓")
+      ("suffix" "↓")
+      ("take" "↑")
       ("transpose" "⍉")
       ("ugrade" "⍋")
       ("usort" "∨")
@@ -415,9 +424,9 @@
       ("self" "˜")
       ("swap" "˜")
       ("under" "⌾")
-      ("valences" "⊘")
+      ("valence" "⊘")
       ;; 1-modifiers
-      ("cells" "˘")
+      ("cell" "˘")
       ("each" "¨")
       ("fold" "´")
       ("insert" "˝")
@@ -428,4 +437,13 @@
       ("depth" "⚇")
       ("rank" "⎉")
       ("repeat" "⍟")
+      ;; syntax
+      ("define" "←")
+      ("export" "⇐")
+      ("change" "↩")
+      ("nothing" "·")
+      ("sep" "⋄")
+      ;; constants
+      ("pi" "π")
+      ("infty" "∞")
       )))