aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rw-r--r--archive/README.org13
-rw-r--r--archive/docker/telega-server/Dockerfile (renamed from docker/telega-server/Dockerfile)0
-rw-r--r--archive/modules/telega-config.el (renamed from modules/telega-config.el)0
-rwxr-xr-xarchive/scripts/setup-telega.sh (renamed from scripts/setup-telega.sh)0
-rw-r--r--archive/tests/test-setup-telega.bats (renamed from tests/test-setup-telega.bats)0
-rw-r--r--archive/tests/test-telega-config--docker-pin.el (renamed from tests/test-telega-config--docker-pin.el)0
-rw-r--r--archive/tests/test-telega-config--server-death.el (renamed from tests/test-telega-config--server-death.el)0
-rw-r--r--archive/tests/test-telega-config.el (renamed from tests/test-telega-config.el)0
-rw-r--r--docs/design/module-inventory.org9
-rw-r--r--docs/specs/keybinding-console-safety-spec.org1
-rw-r--r--init.el1
-rw-r--r--modules/dashboard-config.el10
-rw-r--r--modules/transcription-config.el4
-rw-r--r--tests/test-dashboard-config-launchers.el31
-rw-r--r--tests/test-init-module-headers.el1
16 files changed, 38 insertions, 46 deletions
diff --git a/Makefile b/Makefile
index 920933a7..5ca028fb 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,6 @@
# make compile-file FILE= - Byte-compile one file with the project load path
# make lint - Run all linters (checkdoc, package-lint, elisp-lint)
# make bootstrap - Install every package headlessly (fresh machine)
-# make telega-image - Build the telega-server container image
# make profile - Profile Emacs startup performance
# make clean - Remove test artifacts and compiled files
# make clean-compiled - Remove .elc/.eln files only (keeps elpa/)
@@ -56,7 +55,7 @@ EMACS_TEST = $(EMACS_BATCH) -L $(TEST_DIR) -L $(MODULE_DIR)
.PHONY: help targets test test-all test-unit test-integration test-file test-name \
test-bash theme-studio-test theme-studio-check theme-studio-coverage theme-studio-gen theme-studio-open theme-studio-theme theme-studio-theme-load theme-studio-theme-reload deploy-wip \
benchmark coverage coverage-summary coverage-clean \
- validate-parens validate-modules compile compile-file lint bootstrap telega-image profile \
+ validate-parens validate-modules compile compile-file lint bootstrap profile \
task-sorted \
clean clean-compiled clean-tests reset
@@ -103,7 +102,6 @@ help:
@echo ""
@echo " Utilities:"
@echo " make bootstrap - Install every package headlessly (fresh machine)"
- @echo " make telega-image - Build the telega-server container image"
@echo " make profile - Profile Emacs startup performance"
@echo " make clean - Remove test artifacts and compiled files"
@echo " make clean-compiled - Remove .elc/.eln files only (keeps elpa/)"
@@ -459,16 +457,6 @@ lint:
bootstrap:
@bash scripts/bootstrap-packages.sh
-# telega-server container image. Built locally from a digest-pinned upstream
-# base plus the library upstream forgot (see docker/telega-server/Dockerfile).
-# The tag here is the source of truth: `cj/telega-docker-image' in
-# modules/telega-config.el must name the same one, and a test holds them equal.
-TELEGA_IMAGE = cj/telega-server:1.8.66-glycin
-
-telega-image:
- @docker build -t $(TELEGA_IMAGE) docker/telega-server
- @echo "built $(TELEGA_IMAGE)"
-
profile:
@echo "Profiling Emacs startup..."
@if [ -f "$(EMACS_HOME)/early-init.el" ]; then \
diff --git a/archive/README.org b/archive/README.org
index e292065a..4703fbe5 100644
--- a/archive/README.org
+++ b/archive/README.org
@@ -33,6 +33,8 @@ Retired files keep their origin directory so a restore is a straight move back:
- =archive/custom/= — retired vendored third-party files
- =archive/tests/= — tests belonging to retired modules
- =archive/gptel/= — the gptel feature subtree, retired as a unit
+- =archive/scripts/= — setup scripts that served a retired module
+- =archive/docker/= — container build files that served a retired module
* Inventory
@@ -53,6 +55,17 @@ Retired files keep their origin directory so a restore is a straight move back:
files moved to =archive/tests/= with it (=test-signal-config*.el=,
=test-signel-*.el=). The spec record is
=docs/specs/signal-client-spec.org= (IMPLEMENTED, then retired).
+- =telega-config.el= — the Telegram client (telega.el with TDLib in a pinned
+ docker image), retired whole on 2026-11-20 because I'd stopped using it. Its
+ three ERT files and the bats suite for the setup script moved to
+ =archive/tests/=. The pieces that only existed to serve it moved too:
+ =archive/scripts/setup-telega.sh= and =archive/docker/telega-server/=. The
+ =make telega-image= target was deleted, so a restore has to bring back that
+ target along with the files; the tag it built was
+ =cj/telega-server:1.8.66-glycin=. Retiring it freed =C-; T= and the
+ dashboard's =G= launcher. The installed =telega= package is untracked, so
+ I delete it by hand on each machine. The pin-mismatch diagnosis stays in
+ =docs/design/2026-08-23-telega-docker-pin-tdlib-mismatch.org=.
** archive/custom/
diff --git a/docker/telega-server/Dockerfile b/archive/docker/telega-server/Dockerfile
index 6bd2c579..6bd2c579 100644
--- a/docker/telega-server/Dockerfile
+++ b/archive/docker/telega-server/Dockerfile
diff --git a/modules/telega-config.el b/archive/modules/telega-config.el
index b9b80481..b9b80481 100644
--- a/modules/telega-config.el
+++ b/archive/modules/telega-config.el
diff --git a/scripts/setup-telega.sh b/archive/scripts/setup-telega.sh
index 351f98ba..351f98ba 100755
--- a/scripts/setup-telega.sh
+++ b/archive/scripts/setup-telega.sh
diff --git a/tests/test-setup-telega.bats b/archive/tests/test-setup-telega.bats
index 518ecc7b..518ecc7b 100644
--- a/tests/test-setup-telega.bats
+++ b/archive/tests/test-setup-telega.bats
diff --git a/tests/test-telega-config--docker-pin.el b/archive/tests/test-telega-config--docker-pin.el
index 8f5b62bd..8f5b62bd 100644
--- a/tests/test-telega-config--docker-pin.el
+++ b/archive/tests/test-telega-config--docker-pin.el
diff --git a/tests/test-telega-config--server-death.el b/archive/tests/test-telega-config--server-death.el
index 1151fa7e..1151fa7e 100644
--- a/tests/test-telega-config--server-death.el
+++ b/archive/tests/test-telega-config--server-death.el
diff --git a/tests/test-telega-config.el b/archive/tests/test-telega-config.el
index 54a601c9..54a601c9 100644
--- a/tests/test-telega-config.el
+++ b/archive/tests/test-telega-config.el
diff --git a/docs/design/module-inventory.org b/docs/design/module-inventory.org
index fb883d70..28337755 100644
--- a/docs/design/module-inventory.org
+++ b/docs/design/module-inventory.org
@@ -10,7 +10,7 @@ each module is inspected and classified. A module moves from [[*Pending
classification][Pending classification]] into [[*Classified modules][Classified
modules]] once its source has been read and its load-graph header written.
-Phase 1 exit criterion: every module required by =init.el= (103 total) is
+Phase 1 exit criterion: every module required by =init.el= (102 total) is
represented here with a category and target load shape, every eager survivor
has a documented reason, and top-level timer/process/network side effects are
identified. Classification proceeds in batches; the header-validation test
@@ -31,8 +31,8 @@ This inventory is independent from the helper inventory owned by
- Batch 6 (Programming modules, Layer 2-4): classified. 10 modules.
- Batch 7 (Org modules, Layer 3-4): classified. 13 modules.
- Batch 8 (Domain / integration / optional modules, Layer 2-4): classified. 18 modules.
-- Batch 9 (Remaining domain / integration / optional modules, Layer 2-4): classified. 19 modules.
-- 103 of 103 modules classified. Phase 1 classification complete.
+- Batch 9 (Remaining domain / integration / optional modules, Layer 2-4): classified. 18 modules.
+- 102 of 102 modules classified. Phase 1 classification complete.
- No load-order changes have been made; =init.el= keeps its current eager order.
* Legend
@@ -232,7 +232,6 @@ owns the intentional end-of-startup buffer-bury timer.
| =restclient-config= | 3 | D/P | eager | command | none | package config | yes |
| =slack-config= | 4 | O/D/P | eager | command | system-lib, cl-lib | package config | yes |
| =system-commands= | 3 | D/S | eager | command | keybindings, rx | system-command keymap under cj/custom-keymap | yes |
-| =telega-config= | 4 | O/D/P | eager | command | keybindings | telega keymap under cj/custom-keymap | yes |
| =tramp-config= | 3 | D/P | eager | package | none | package config | yes |
| =transcription-config= | 4 | O/D/P | eager | command | dired, notifications, system-lib, user-constants | 1 add-to-list | yes |
| =video-audio-recording= | 4 | O/D/S | eager | command | system-lib, keybindings | cj/record-map under C-; r | yes |
@@ -286,4 +285,4 @@ found and fixed; the =Phase 2 fix:= notes below describe the change applied.
* Pending classification
-- None. Every module required by =init.el= is classified (103 of 103).
+- None. Every module required by =init.el= is classified (102 of 102).
diff --git a/docs/specs/keybinding-console-safety-spec.org b/docs/specs/keybinding-console-safety-spec.org
index 9781b43a..cec9f6c5 100644
--- a/docs/specs/keybinding-console-safety-spec.org
+++ b/docs/specs/keybinding-console-safety-spec.org
@@ -349,7 +349,6 @@ Format: chord — command — what it does.
- C-; k — cj/org-babel-toggle-confirm — toggle the org-babel eval confirmation
- C-; P — cj/projectile-reset-cmds — reset projectile's cached project commands
- C-; SPC — cj/switch-to-previous-buffer — toggle to the previous buffer
-- C-; T — cj/telega — open Telegram (telega)
- C-; | — display-fill-column-indicator-mode — toggle the fill-column rule
- C-; # c — cj/count-characters-buffer-or-region — count characters
- C-; # w — cj/count-words-buffer-or-region — count words
diff --git a/init.el b/init.el
index beb073ba..827b20a5 100644
--- a/init.el
+++ b/init.el
@@ -77,7 +77,6 @@
(require 'erc-config) ;; seamless IRC client
(require 'slack-config) ;; slack client via emacs-slack
(require 'pearl-config) ;; Linear.app issue tracking via pearl (deepsat + craigjennings)
-(require 'telega-config) ;; telegram client via telega.el (TDLib in docker)
(require 'eshell-config) ;; emacs shell configuration
(require 'eat-config) ;; EAT terminal + the F12 dock-and-remember toggle
(require 'ai-term) ;; in-Emacs Claude launcher (vertical-split EAT terminal)
diff --git a/modules/dashboard-config.el b/modules/dashboard-config.el
index c7ff39dc..14e7bd71 100644
--- a/modules/dashboard-config.el
+++ b/modules/dashboard-config.el
@@ -66,7 +66,6 @@
(declare-function cj/music-playlist-toggle "music-config")
(declare-function cj/music-playlist-load "music-config")
(declare-function cj/erc-switch-to-buffer-with-completion "erc-config")
-(declare-function cj/telega "telega-config")
(declare-function cj/slack-start "slack-config")
(declare-function cj/kill-all-other-buffers-and-windows "undead-buffers")
@@ -156,17 +155,17 @@ Adjust this if the title doesn't appear centered under the banner image.")
(list "m" #'nerd-icons-mdicon "nf-md-music" "Music" "EMMS Music Player" (lambda () (cj/music-playlist-toggle) (cj/music-playlist-load)))
(list "e" #'nerd-icons-faicon "nf-fa-envelope" "Email" "Mu4e Email Client" (lambda () (mu4e)))
(list "i" #'nerd-icons-faicon "nf-fa-comments" "IRC" "Emacs Relay Chat" (lambda () (cj/erc-switch-to-buffer-with-completion)))
- (list "G" #'nerd-icons-faicon "nf-fa-telegram" "Telegram" "Telega Telegram Client" (lambda () (cj/telega)))
(list "s" #'nerd-icons-faicon "nf-fa-slack" "Slack" "Slack Client" (lambda () (cj/slack-start)))
(list "l" #'nerd-icons-octicon "nf-oct-issue_tracks" "Linear" "Linear Issue Tracker" (lambda () (pearl-list-issues))))
"Dashboard launcher table: (KEY ICON-FN ICON-NAME LABEL TOOLTIP ACTION).
Drives both `dashboard-navigator-buttons' and the dashboard-mode-map keys.")
-(defconst cj/dashboard--row-sizes '(5 4 3 2)
+(defconst cj/dashboard--row-sizes '(5 4 2 2)
"Navigator row lengths. Must sum to the number of `cj/dashboard--launchers'.
The top row carries Weather alongside the core tools; the last row pairs
Slack and Linear. (Signal left the table when the signel client was
-retired to archive/ -- agents drive Signal via signal-cli.)")
+retired to archive/ -- agents drive Signal via signal-cli. Telegram left
+it when the telega client was retired the same way.)")
(defun cj/dashboard--navigator-button (l)
"Build a `dashboard-navigator-buttons' entry from launcher L."
@@ -310,8 +309,7 @@ system-defaults) are preserved rather than overwritten."
;; Disable 'q' to quit dashboard
(define-key dashboard-mode-map (kbd "q") nil)
- ;; 'g' refreshes the dashboard (the dired/magit convention). Telegram moved to
- ;; 'G' in the launcher table to free it.
+ ;; 'g' refreshes the dashboard (the dired/magit convention).
(define-key dashboard-mode-map (kbd "g") #'dashboard-refresh-buffer)
;; Launcher keys, derived from `cj/dashboard--launchers' (same source as the
diff --git a/modules/transcription-config.el b/modules/transcription-config.el
index 6d7e39b9..f7813eaf 100644
--- a/modules/transcription-config.el
+++ b/modules/transcription-config.el
@@ -500,9 +500,7 @@ Prompts with completing-read to select from available backends."
(define-key dirvish-mode-map (kbd "T") #'cj/transcribe-media-at-point))
;; Reach the transcription commands via M-x. The previous `C-; T'
-;; menu was retired so the top-level slot could go to telega (which
-;; finally has a clean mnemonic at `C-; T' once nothing else is
-;; fighting over the same key).
+;; menu was retired to free that top-level slot.
(provide 'transcription-config)
;;; transcription-config.el ends here
diff --git a/tests/test-dashboard-config-launchers.el b/tests/test-dashboard-config-launchers.el
index 76fbcc42..566c693a 100644
--- a/tests/test-dashboard-config-launchers.el
+++ b/tests/test-dashboard-config-launchers.el
@@ -25,24 +25,23 @@
(require 'dashboard-config)
-;; Telegram moved from "g" to "G" so "g" is free for dashboard refresh.
-;; Signal ("S") added as the 14th launcher.
-;; Weather ("w") added after Agenda as the 15th launcher (top-row daily glance).
-(defconst test-dash--keys '("c" "d" "t" "a" "w" "r" "b" "f" "m" "e" "i" "G" "s" "l"))
+;; "g" is dashboard refresh (the dired/magit convention), so no launcher takes it.
+;; Signal ("S") and Telegram ("G") left the table when their clients were
+;; retired to archive/. Weather ("w") sits after Agenda as a top-row daily glance.
+(defconst test-dash--keys '("c" "d" "t" "a" "w" "r" "b" "f" "m" "e" "i" "s" "l"))
;; ----------------------------- launcher table --------------------------------
(ert-deftest test-dashboard-launchers-keys-in-order ()
- "Normal: 14 launchers with the expected keys in display order.
-(Signal left the table when the signel client was retired to archive/.)"
- (should (= 14 (length cj/dashboard--launchers)))
+ "Normal: 13 launchers with the expected keys in display order."
+ (should (= 13 (length cj/dashboard--launchers)))
(should (equal test-dash--keys (mapcar (lambda (l) (nth 0 l)) cj/dashboard--launchers))))
(ert-deftest test-dashboard-launchers-labels-in-order ()
- "Normal: labels in display order (Telegram and Slack reordered so Slack sits
-next to Linear on the last navigator row)."
+ "Normal: labels in display order, with Slack next to Linear on the last
+navigator row."
(should (equal '("Code" "Files" "Terminal" "Agenda" "Weather" "Feeds" "Books"
- "Flashcards" "Music" "Email" "IRC" "Telegram" "Slack" "Linear")
+ "Flashcards" "Music" "Email" "IRC" "Slack" "Linear")
(mapcar (lambda (l) (nth 3 l)) cj/dashboard--launchers))))
(ert-deftest test-dashboard-row-sizes-cover-all-launchers ()
@@ -52,8 +51,8 @@ next to Linear on the last navigator row)."
;; --------------------------- navigator rows ----------------------------------
-(ert-deftest test-dashboard-navigator-rows-grouped-5-4-3-2 ()
- "Normal: navigator derives rows per `cj/dashboard--row-sizes' (5 4 3 2), with
+(ert-deftest test-dashboard-navigator-rows-grouped-5-4-2-2 ()
+ "Normal: navigator derives rows per `cj/dashboard--row-sizes' (5 4 2 2), with
Weather joining the top row and Slack and Linear pairing on the last row."
(cl-letf (((symbol-function 'nerd-icons-faicon) (lambda (n &rest _) (concat "I:" n)))
((symbol-function 'nerd-icons-devicon) (lambda (n &rest _) (concat "I:" n)))
@@ -63,7 +62,9 @@ Weather joining the top row and Slack and Linear pairing on the last row."
((symbol-function 'nerd-icons-wicon) (lambda (n &rest _) (concat "I:" n))))
(let ((rows (cj/dashboard--navigator-rows)))
(should (= 4 (length rows)))
- (should (equal '(5 4 3 2) (mapcar #'length rows)))
+ (should (equal '(5 4 2 2) (mapcar #'length rows)))
+ (should (equal '("Email" "IRC")
+ (mapcar (lambda (b) (nth 1 b)) (nth 2 rows))))
(should (equal '("Code" "Files" "Terminal" "Agenda" "Weather")
(mapcar (lambda (b) (nth 1 b)) (nth 0 rows))))
(should (equal '("Slack" "Linear")
@@ -99,7 +100,6 @@ Weather joining the top row and Slack and Linear pairing on the last row."
((symbol-function 'mu4e) (lambda (&rest _) (push 'email calls)))
((symbol-function 'cj/erc-switch-to-buffer-with-completion) (lambda (&rest _) (push 'irc calls)))
((symbol-function 'cj/slack-start) (lambda (&rest _) (push 'slack calls)))
- ((symbol-function 'cj/telega) (lambda (&rest _) (push 'tg calls)))
((symbol-function 'pearl-list-issues) (lambda (&rest _) (push 'linear calls)))
;; wttrin is invoked via `call-interactively', so the stub must be
;; a command -- a plain variadic lambda masked the real arity bug.
@@ -108,12 +108,11 @@ Weather joining the top row and Slack and Linear pairing on the last row."
(dolist (key test-dash--keys)
(call-interactively (keymap-lookup map key)))
(should (memq 'code calls))
- (should (memq 'tg calls))
(should (memq 'linear calls))
(should (memq 'm-toggle calls))
(should (memq 'm-load calls))
(should (memq 'weather calls))
- (should (= 15 (length calls)))))) ; 14 keys, Music fires two
+ (should (= 14 (length calls)))))) ; 13 keys, Music fires two
(provide 'test-dashboard-config-launchers)
;;; test-dashboard-config-launchers.el ends here
diff --git a/tests/test-init-module-headers.el b/tests/test-init-module-headers.el
index f89d6624..d8a31f3b 100644
--- a/tests/test-init-module-headers.el
+++ b/tests/test-init-module-headers.el
@@ -135,7 +135,6 @@
"restclient-config"
"slack-config"
"system-commands"
- "telega-config"
"tramp-config"
"transcription-config"
"video-audio-recording"