From 9b907264c29530267b23c6f8ce9f233966539903 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 21 May 2025 21:03:24 +0200 Subject: [PATCH 1/3] Disable subscript after `_` --- hmModules/emacs/init.el | 55 ++++++++++++++++++++-------------------- secrets/arbi-config.age | Bin 0 -> 439 bytes 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 secrets/arbi-config.age diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 1686c97..a451093 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -786,35 +786,36 @@ (use-package org :hook ((org-mode . variable-pitch-mode) - (org-mode . visual-line-mode) - (org-mode . visual-fill-column-mode)) + (org-mode . visual-line-mode) + (org-mode . visual-fill-column-mode)) :custom ((org-log-done nil) - (org-return-follows-link t) - (org-hide-emphasis-markers t) - (visual-fill-column-center-text t) - (visual-fill-column-width 100) - (fill-column 100) - (org-capture-templates '( - ("j" "Work Log Entry" - entry (file+datetree "~/org/work-log.org") - "* %?" - :empty-lines 0) - ("n" "Note" - entry (file+headline "~/org/notes.org" "Random Notes") - "** %?" - :empty-lines 0) - )) - (org-auto-align-tags nil) - (org-tags-column 0) - (org-catch-invisible-edits 'show-and-error) - (org-special-ctrl-a/e t) - (org-insert-heading-respect-content t) - (org-pretty-entities t) - (org-ellipsis "…") - ) + (org-return-follows-link t) + (org-hide-emphasis-markers t) + (visual-fill-column-center-text t) + (visual-fill-column-width 100) + (fill-column 100) + (org-capture-templates '( + ("j" "Work Log Entry" + entry (file+datetree "~/org/work-log.org") + "* %?" + :empty-lines 0) + ("n" "Note" + entry (file+headline "~/org/notes.org" "Random Notes") + "** %?" + :empty-lines 0) + )) + (org-auto-align-tags nil) + (org-tags-column 0) + (org-catch-invisible-edits 'show-and-error) + (org-special-ctrl-a/e t) + (org-insert-heading-respect-content t) + (org-pretty-entities t) + (org-ellipsis "…") + (org-use-sub-superscripts nil) + ) :bind (("C-c o l" . org-store-link) - ("C-c o c" . org-capture) - ("C-c b o" . org-switchb)) + ("C-c o c" . org-capture) + ("C-c b o" . org-switchb)) :config (defun ccr/org-capture (key) "Capture a note using the template KEY and close the frame when done. diff --git a/secrets/arbi-config.age b/secrets/arbi-config.age new file mode 100644 index 0000000000000000000000000000000000000000..0e31ccf9da955e61bcfcaf0238a6550509765f84 GIT binary patch literal 439 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCTS$}soNEmz2QvMfs} z$;)#swoI`INcAfYHg*ijEC|f-DJ=Cb%q(_x%h%5|%``E|OXkWi@=0?EEb`6p3UW?N z%QB6~NDL}YtqjXeF0e>6_Y5_&)YdL?P4oy0v_Q8_yDTLr&r!iLE7`QFLf_Cc$-JPf z+}kzVw9vgU!!_5-*~{IuyfP_UKhY%HG$SX_FrUjK-K(UyEIYTzG}t1fq_o`C$;>Cq zt0E%P#KOhRtfIJ7-_$rHC9tZ*G?YtMS63l2B3V1fu{0{x$2=>_H=|JBKQcHkCB?|s z)zH;2xg;d5AkW{_)U@2EG@Yxa{gA}hT8Wr{pCe)w)r5O@J9m^8eVKpbS(?#P2JYBr z`7%!wA5SmP4arcOYw%OXJ7t}D>20ai=PmZjM=Ia5nm_f%x;dri4_t45F2~#&abtg> z*^`1S6IGWV;>G@-7A)>qw$)Qz<0F&yrG~#g=RJd~ANFrKXCvt$BAed)&@$=d9;J=z XT<7oe(~%W9zI#m!&rNaFiV1T8`Ddkt literal 0 HcmV?d00001 From 7e92d092991e3ba82cddb09c1f2f10fdb65dbc26 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 21 May 2025 21:03:54 +0200 Subject: [PATCH 2/3] Format --- hmModules/emacs/init.el | 218 ++++++++++++++++++++-------------------- 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index a451093..1151520 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -163,8 +163,8 @@ :after marginalia :config (nerd-icons-completion-mode +1) :hook ( - (marginalia-mode . nerd-icons-completion-marginalia-setup) - (ibuffer-mode . nerd-icons-completion-marginalia-setup))) + (marginalia-mode . nerd-icons-completion-marginalia-setup) + (ibuffer-mode . nerd-icons-completion-marginalia-setup))) (use-package nerd-icons-ibuffer :hook (ibuffer-mode . nerd-icons-ibuffer-mode)) @@ -208,7 +208,7 @@ (treemacs-display-current-project-exclusively t) (treemacs-git-mode 'deferred) :bind (("C-c w t" . treemacs-select-window) - ("C-c o T" . treemacs)) + ("C-c o T" . treemacs)) ) (use-package meow @@ -219,8 +219,8 @@ (require 'meow-tree-sitter) (meow-tree-sitter-register-defaults) (add-hook 'after-make-frame-functions (defun ccr/meow--prepare-face (_) - (meow--prepare-face) - (remove-hook 'after-make-frame-functions 'ccr/meow--prepare-face))) + (meow--prepare-face) + (remove-hook 'after-make-frame-functions 'ccr/meow--prepare-face))) (add-to-list 'meow-mode-state-list '(eshell-mode . insert)) (add-to-list 'meow-mode-state-list '(eat-mode . insert)) (add-to-list 'meow-mode-state-list '(notmuch-hello-mode . insert)) @@ -331,44 +331,44 @@ "Interactively vertically resize the window" (interactive "cHit >/< to enlarge/shrink") (cond ((eq key (string-to-char ">")) - (enlarge-window-horizontally ccr/v-resize-amount) - (call-interactively 'ccr/v-resize)) - ((eq key (string-to-char "<")) - (enlarge-window-horizontally (- ccr/v-resize-amount)) - (call-interactively 'ccr/v-resize)) - (t (push key unread-command-events)))) + (enlarge-window-horizontally ccr/v-resize-amount) + (call-interactively 'ccr/v-resize)) + ((eq key (string-to-char "<")) + (enlarge-window-horizontally (- ccr/v-resize-amount)) + (call-interactively 'ccr/v-resize)) + (t (push key unread-command-events)))) (defun ccr/h-resize (key) "Interactively horizontally resize the window" (interactive "cHit >/< to enlarge/shrink") (cond ((eq key (string-to-char ">")) - (enlarge-window ccr/h-resize-amount) - (call-interactively 'ccr/h-resize)) - ((eq key (string-to-char "<")) - (enlarge-window (- ccr/h-resize-amount)) - (call-interactively 'ccr/h-resize)) - (t (push key unread-command-events)))) + (enlarge-window ccr/h-resize-amount) + (call-interactively 'ccr/h-resize)) + ((eq key (string-to-char "<")) + (enlarge-window (- ccr/h-resize-amount)) + (call-interactively 'ccr/h-resize)) + (t (push key unread-command-events)))) :bind (("C-c w k" . windmove-up) - ("C-c w l" . windmove-right) - ("C-c w j" . windmove-down) - ("C-c w h" . windmove-left) - ("M-k" . windmove-up) - ("M-l" . windmove-right) - ("M-j" . windmove-down) - ("M-h" . windmove-left) - ("C-c w " . windmove-up) - ("C-c w " . windmove-right) - ("C-c w " . windmove-down) - ("C-c w " . windmove-left) - ("C-c w q" . delete-window) - ("C-c w K" . windmove-delete-up) - ("C-c w L" . windmove-delete-right) - ("C-c w J" . windmove-delete-down) - ("C-c w H" . windmove-delete-left) - ("C-c w x" . kill-buffer-and-window) - ("C-c w v" . split-window-right) - ("C-c w s" . split-window-below) - ("C-c w V" . ccr/v-resize) - ("C-c w S" . ccr/h-resize))) + ("C-c w l" . windmove-right) + ("C-c w j" . windmove-down) + ("C-c w h" . windmove-left) + ("M-k" . windmove-up) + ("M-l" . windmove-right) + ("M-j" . windmove-down) + ("M-h" . windmove-left) + ("C-c w " . windmove-up) + ("C-c w " . windmove-right) + ("C-c w " . windmove-down) + ("C-c w " . windmove-left) + ("C-c w q" . delete-window) + ("C-c w K" . windmove-delete-up) + ("C-c w L" . windmove-delete-right) + ("C-c w J" . windmove-delete-down) + ("C-c w H" . windmove-delete-left) + ("C-c w x" . kill-buffer-and-window) + ("C-c w v" . split-window-right) + ("C-c w s" . split-window-below) + ("C-c w V" . ccr/v-resize) + ("C-c w S" . ccr/h-resize))) (use-package vertico :custom @@ -379,10 +379,10 @@ (vertico-cycle t) (vertico-mode t) :bind (:map vertico-map - (("DEL" . vertico-directory-delete-char) - ("C-DEL" . vertico-directory-delete-word) - ("M-q" . vertico-quick-insert) - ("C-q" . vertico-quick-exit)))) + (("DEL" . vertico-directory-delete-char) + ("C-DEL" . vertico-directory-delete-word) + ("M-q" . vertico-quick-insert) + ("C-q" . vertico-quick-exit)))) ;; (use-package vertico-posframe ;; :after vertico @@ -417,7 +417,7 @@ ("C-c f f" . consult-find) ("C-c F" . consult-ripgrep) ("C-c f" . consult-find) - ("C-c l" . consult-line) + ("C-c l" . consult-line) ("C-c L" . consult-focus-lines) ("C-c m" . consult-mark) ("C-c o o" . consult-outline) @@ -445,9 +445,9 @@ (tab-always-indent 'complete) (kind-icon-default-face 'corfu-default) :bind (:map corfu-map - (("M-d" . corfu-doc-toggle) - ("M-l" . corfu-show-location) - ("SPC" . corfu-insert-separator))) + (("M-d" . corfu-doc-toggle) + ("M-l" . corfu-show-location) + ("SPC" . corfu-insert-separator))) :init (global-corfu-mode)) @@ -458,7 +458,7 @@ (use-package prog-mode :hook ((prog-mode . hl-line-mode) - (prog-mode . display-line-numbers-mode))) + (prog-mode . display-line-numbers-mode))) (use-package which-key :delight :config (which-key-mode) @@ -500,28 +500,28 @@ (use-package nix-ts-mode :hook ( - (nix-ts-mode . (lambda () - (require 'eglot) - (add-to-list 'eglot-server-programs - '(nix-ts-mode . ("nixd"))) - (eglot-ensure))) - (nix-ts-mode . electric-pair-mode) - (nix-ts-mode . (lambda () (setq-local indent-bars-spacing-override 2) (indent-bars-mode))) - (nix-ts-mode . (lambda () - (setq-local - treesit-font-lock-settings - (append treesit-font-lock-settings - (treesit-font-lock-rules - :language 'nix - :feature 'function - :override t - `((formal) @font-lock-type-face) - - :language 'nix - :feature 'function - `((attrpath) @font-lock-function-name-face) - ))))) - ) + (nix-ts-mode . (lambda () + (require 'eglot) + (add-to-list 'eglot-server-programs + '(nix-ts-mode . ("nixd"))) + (eglot-ensure))) + (nix-ts-mode . electric-pair-mode) + (nix-ts-mode . (lambda () (setq-local indent-bars-spacing-override 2) (indent-bars-mode))) + (nix-ts-mode . (lambda () + (setq-local + treesit-font-lock-settings + (append treesit-font-lock-settings + (treesit-font-lock-rules + :language 'nix + :feature 'function + :override t + `((formal) @font-lock-type-face) + + :language 'nix + :feature 'function + `((attrpath) @font-lock-function-name-face) + ))))) + ) :mode "\\.nix\\'" ) @@ -533,33 +533,33 @@ (use-package python-ts-mode :hook ((python-ts-mode . (lambda () - (require 'eglot) - (add-to-list 'eglot-server-programs - '(python-ts-mode . ("jedi-language-server"))) - (eglot-ensure)))) + (require 'eglot) + (add-to-list 'eglot-server-programs + '(python-ts-mode . ("jedi-language-server"))) + (eglot-ensure)))) :mode "\\.py\\'") (use-package solidity-mode :hook ((solidity-mode . (lambda () - (require 'eglot) - (add-to-list 'eglot-server-programs - '(solidity-mode . ("nomicfoundation-solidity-language-server" "--stdio"))) - (eglot-ensure)))) + (require 'eglot) + (add-to-list 'eglot-server-programs + '(solidity-mode . ("nomicfoundation-solidity-language-server" "--stdio"))) + (eglot-ensure)))) :mode "\\.sol\\'") (use-package typescript-ts-mode :hook ((typescript-ts-mode . (lambda () - (require 'eglot) - (eglot-ensure)))) + (require 'eglot) + (eglot-ensure)))) :mode "\\.ts\\'") (use-package rust-mode :init (setq rust-mode-treesitter-derive t) :hook ((rust-mode . (lambda () - (require 'eglot) - (eglot-ensure))))) + (require 'eglot) + (eglot-ensure))))) (use-package haskell-ts-mode :hook ((haskell--ts-mode . eglot-ensure)) @@ -581,11 +581,11 @@ :after eglot :config (add-to-list 'eglot-server-programs - '(terraform-mode . ("terraform-lsp"))) + '(terraform-mode . ("terraform-lsp"))) :hook ((terraform-mode . eglot-ensure) - ;; (terraform-mode . tree-sitter-hl-mode) - (terraform-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode))) - )) + ;; (terraform-mode . tree-sitter-hl-mode) + (terraform-mode . (lambda () (setq indent-bars-spacing-override 2) (indent-bars-mode))) + )) (use-package yaml-mode :hook (yaml-mode . yaml-ts-mode)) @@ -629,7 +629,7 @@ (use-package aggressive-indent :hook ((lisp-mode . aggressive-indent-mode) - (emacs-lisp-mode . aggressive-indent-mode))) + (emacs-lisp-mode . aggressive-indent-mode))) (use-package eldoc :delight) @@ -679,8 +679,8 @@ (eat-eshell-mode) (eat-eshell-visual-command-mode) :custom ((eshell-prefer-lisp-functions t) - (eshell-history-size 10000) - (eshell-banner-message "")) + (eshell-history-size 10000) + (eshell-banner-message "")) :config (defun ccr/start-eshell () ;; Used from outside Emacs by emacsclient --eval (eshell 'N) @@ -694,17 +694,17 @@ ;; (add-to-list 'eshell-modules-list 'eshell-smart) ;; plan 9 style (setq ccr/eshell-aliases - '((g . magit) - (gl . magit-log) - (d . dired) - (o . find-file) - (oo . find-file-other-window) - (l . (lambda () (eshell/ls '-la))) - (eshell/clear . eshell/clear-scrollback))) + '((g . magit) + (gl . magit-log) + (d . dired) + (o . find-file) + (oo . find-file-other-window) + (l . (lambda () (eshell/ls '-la))) + (eshell/clear . eshell/clear-scrollback))) (mapc (lambda (alias) - (defalias (car alias) (cdr alias))) - ccr/eshell-aliases) + (defalias (car alias) (cdr alias))) + ccr/eshell-aliases) (defun ccr/eshell-get-current-input () @@ -712,35 +712,35 @@ (when (eq major-mode 'eshell-mode) (let ((start (save-excursion (eshell-bol) (point))) (end (point-at-eol))) - (buffer-substring-no-properties start end)))) + (buffer-substring-no-properties start end)))) (defun ccr/eshell-replace-current-input (new-input) (when (eq major-mode 'eshell-mode) (let ((inhibit-read-only t)) - (eshell-bol) - (delete-region (point) (point-at-eol)) - (insert new-input) - (end-of-line)))) + (eshell-bol) + (delete-region (point) (point-at-eol)) + (insert new-input) + (end-of-line)))) (defun ccr/eshell-history () (interactive) (when (eq major-mode 'eshell-mode) (let* ((current-input (ccr/eshell-get-current-input)) (eshell-history (when (and eshell-history-file-name - (file-readable-p eshell-history-file-name)) + (file-readable-p eshell-history-file-name)) (f-read-text eshell-history-file-name))) (bash-history (when (file-readable-p "~/.bash_history") (f-read-text "~/.bash_history"))) (history (split-string (concat (or eshell-history "") "\n" (or bash-history "")) "\n" t)) (selection (completing-read "History: " history nil t current-input))) - (ccr/eshell-replace-current-input selection)))) + (ccr/eshell-replace-current-input selection)))) :bind (("C-c o e" . project-eshell) - (:map eshell-mode-map - ("C-r" . ccr/eshell-history) - ("C-" . corfu-send) - ))) ;; i.e. just C-r in semi-char-mode + (:map eshell-mode-map + ("C-r" . ccr/eshell-history) + ("C-" . corfu-send) + ))) ;; i.e. just C-r in semi-char-mode (use-package eshell-command-not-found :custom ((eshell-command-not-found-command "command-not-found")) @@ -757,7 +757,7 @@ (use-package eshell-prompt-extras :custom ((eshell-highlight-prompt nil) - (eshell-prompt-function 'epe-theme-lambda))) + (eshell-prompt-function 'epe-theme-lambda))) (use-package popper :custom From 1fd1c845e8514ed5f4fec2082bd1fdd874917e6c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 21 May 2025 21:04:04 +0200 Subject: [PATCH 3/3] Move `arbi` configuration file to secrets --- hosts/default.nix | 1 + modules/arbi/default.nix | 8 ++------ secrets/secrets.nix | 4 ++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 1b21982..3ac0ce9 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -119,6 +119,7 @@ group = "forgejo"; }; "matrix-registration-shared-secret".owner = "matrix-synapse"; + "arbi-config".owner = "arbi"; }; }; diff --git a/modules/arbi/default.nix b/modules/arbi/default.nix index 02ab9e5..3417b51 100644 --- a/modules/arbi/default.nix +++ b/modules/arbi/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: let rev = "d531730d9640160f0519ef4b3640f8da49dd96f8"; arbi-flake = builtins.getFlake "git+ssh://git@github.com/aciceri/arbi.git?rev=${rev}"; @@ -9,11 +9,7 @@ in services.arbi = { enable = true; log_level = "debug"; - configFile = pkgs.writeText "arbi-config.kdl" '' - endpoint "wss://eth-mainnet.g.alchemy.com/v2/" - pairs_file "pairs.json" - concurrency 4 - ''; + configFile = config.age.secrets.arbi-config.path; }; environment.persistence."/persist".directories = [ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7b341b1..3ab2d98 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -153,6 +153,10 @@ with keys.users; ccr-ssh sisko ]; + "arbi-config.age".publicKeys = [ + ccr-ssh + sisko + ]; # WireGuard "picard-wireguard-private-key.age".publicKeys = [