diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2025-03-01 14:29:45 -0500 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2025-03-01 14:29:45 -0500 |
commit | adfabe33cc7c3092cb6e843a5273507c34f6f99c (patch) | |
tree | 0a47c5ab39ff958bbccd5090e810924f956acff1 | |
parent | 3cc289665d0d3bd77d6c0ca378173468af4c0e6e (diff) |
Clean up some old config
-rw-r--r-- | emacs/.config/emacs/init.el | 11 | ||||
-rw-r--r-- | emacs/.config/emacs/lisp/kj-lib.el | 14 | ||||
-rw-r--r-- | emacs/.config/emacs/lisp/kj-multiple-cursors.el | 20 | ||||
-rw-r--r-- | emacs/.config/emacs/lisp/kj-timer.el | 49 |
4 files changed, 11 insertions, 83 deletions
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 191ac4f..b0a5e76 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -36,6 +36,17 @@ (setopt inhibit-compacting-font-caches t) (add-hook 'elpaca-after-init-hook 'kj/restore-file-name-handler-alist) +;;;; Utility functions +(defmacro define-repeating-key (keymap key cmd &optional desc) + `(let ((def + ,(if desc + `'(,desc . ,cmd) + `',cmd))) + (define-key ,keymap ,key def) + (put ',cmd 'repeat-map ',keymap))) + +(defun kj/default-directory-remote-p () + (file-remote-p default-directory)) ;;;; Basic settings and customizations (defvar kj/cache-dir "~/.cache/emacs") diff --git a/emacs/.config/emacs/lisp/kj-lib.el b/emacs/.config/emacs/lisp/kj-lib.el deleted file mode 100644 index 169209d..0000000 --- a/emacs/.config/emacs/lisp/kj-lib.el +++ /dev/null @@ -1,14 +0,0 @@ -;;; -*- lexical-binding: t; -*- - -(defmacro define-repeating-key (keymap key cmd &optional desc) - `(let ((def - ,(if desc - `'(,desc . ,cmd) - `',cmd))) - (define-key ,keymap ,key def) - (put ',cmd 'repeat-map ',keymap))) - -(defun kj/default-directory-remote-p () - (file-remote-p default-directory)) - -(provide 'kj-lib) diff --git a/emacs/.config/emacs/lisp/kj-multiple-cursors.el b/emacs/.config/emacs/lisp/kj-multiple-cursors.el deleted file mode 100644 index 962193d..0000000 --- a/emacs/.config/emacs/lisp/kj-multiple-cursors.el +++ /dev/null @@ -1,20 +0,0 @@ -;;; -*- lexical-binding: t; -*- - -(use-package multiple-cursors - :config - (defvar kj/multiple-cursors-map (make-sparse-keymap "cursors")) - (define-repeating-key kj/multiple-cursors-map "." mc/mark-next-like-this "→ this") - (define-repeating-key kj/multiple-cursors-map "," mc/mark-previous-like-this "← this") - (define-repeating-key kj/multiple-cursors-map ">" mc/skip-to-next-like-this "⇥ this") - (define-repeating-key kj/multiple-cursors-map "<" mc/skip-to-previous-like-this "⇤ this") - (define-repeating-key kj/multiple-cursors-map "<" mc/skip-to-previous-like-this "⇤ this") - (define-repeating-key kj/multiple-cursors-map "*" mc/mark-all-like-this "all like this") - (define-repeating-key kj/multiple-cursors-map "w" mc/mark-next-like-this-word "word") - (define-repeating-key kj/multiple-cursors-map "s" mc/mark-next-like-this-symbol "symbol") - (define-repeating-key kj/multiple-cursors-map "(" mc/mark-all-symbols-like-this-in-defun "symbol defun") - (define-repeating-key kj/multiple-cursors-map (kbd "DEL") mc/unmark-next-like-this "DEL last") - (define-repeating-key kj/multiple-cursors-map (kbd "<delete>") mc/unmark-previous-like-this "DEL first") - (define-key kj/multiple-cursors-map (kbd "C-g") '("quit" . ignore)) - (global-set-key (kbd "C-c m") (cons "cursors" kj/multiple-cursors-map))) - -(provide 'kj-multiple-cursors) diff --git a/emacs/.config/emacs/lisp/kj-timer.el b/emacs/.config/emacs/lisp/kj-timer.el deleted file mode 100644 index b3c64fe..0000000 --- a/emacs/.config/emacs/lisp/kj-timer.el +++ /dev/null @@ -1,49 +0,0 @@ -;;; kj-timer.el -- countdown timer -*- lexical-binding: t -*- - -(defvar kj/current-timer nil) -(defvar kj/roster nil) -(defvar kj/timer-seconds) - -(defun kj/display-timer (seconds current &optional next) - (with-current-buffer (get-buffer-create "*timer*") - (let* ((stopped (< seconds 0)) - (seconds (if stopped 0 (truncate seconds)))) - (erase-buffer) - (insert - (propertize (format "%02d:%02d" (/ seconds 60) - (% seconds 60)) - 'face - (append '(:height 1000) - (when stopped - '(:inherit 'org-imminent-deadline)))) - "\n" (propertize (concat current " · " (if next next "done")) - 'face '(:foreground "gray" :height 500))) - (set-left-margin (point-min) (point-max) 10)))) - -(defun kj/run-single-timer (seconds current next) - (let* ((stop-time (+ (float-time) seconds)) - (display-fn (lambda () - (kj/display-timer - (- stop-time (float-time)) - current next)))) - (setq kj/current-timer (run-at-time t 0.5 display-fn)))) - -(defun kj/timer (seconds &rest roster) - (with-current-buffer (get-buffer-create "*timer*") - (display-buffer (current-buffer)) - (setq cursor-type nil) - (use-local-map (define-keymap "SPC" 'kj/timer-next)) - (setq kj/roster roster) - (setq kj/timer-seconds seconds) - (kj/timer-next))) - -(defun kj/timer-next () - (interactive) - (unless kj/roster - (error "The timers are done.")) - (when kj/current-timer - (cancel-timer kj/current-timer)) - (kj/run-single-timer kj/timer-seconds (nth 0 kj/roster) (nth 1 kj/roster)) - (setq kj/roster (cdr kj/roster))) - -(provide 'kj-timer) |