diff options
Diffstat (limited to 'emacs')
47 files changed, 71 insertions, 1430 deletions
diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el index 6ef1d47..6f0df8e 100644 --- a/emacs/inits/01-basic.el +++ b/emacs/inits/01-basic.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-02-06 19h56 CET (1b415aec)> +;; Time-stamp: <2024-07-13 14h57 CEST (471b3659)> ;; ----------------------------------------------------------------------------- ;; Interface @@ -44,15 +44,14 @@ (set-face-attribute face nil :weight 'normal)) (face-list))) -(when 't - (setq my-font "Sudo-22") - (setq my-font "Commit Mono-24") +(progn (setq my-font "PxPlus IBM VGA 9x16-24") + (setq my-font "Commit Mono-24") + (setq my-font "Sudo-22") (setq my-font "Berkeley Mono-24") (set-frame-font my-font) (set-face-attribute 'font-lock-comment-face nil :slant 'italic)) - (setq-default line-spacing nil) (blink-cursor-mode 0) @@ -112,6 +111,7 @@ (use-package tramp :config + :defer (setq tramp-use-ssh-controlmaster-options nil)) (require 'saveplace) diff --git a/emacs/inits/04-input_method.el b/emacs/inits/04-input_method.el deleted file mode 100644 index 0cdd9de..0000000 --- a/emacs/inits/04-input_method.el +++ /dev/null @@ -1,29 +0,0 @@ -;; Time-stamp: <2021-09-27 08h47 EDT (hobbies)> - -;;(use-package agda-input -;; :load-path "~/.emacs.d/scripts/" -;; :config -;; (dolist (sym '(("chimney" "╝") -;; ("==>" "⟹") -;; ("amalg" "⨿") -;; ("bG" "𝔾") -;; ("bB" "𝔹") -;; ("bU" "𝕌"))) -;; (add-to-list 'agda-input-user-translations sym)) -;; (agda-input-setup)) - -(setq-default default-input-method "TeX") - -(defvar use-default-input-method nil) - -(make-variable-buffer-local 'use-default-input-method) - -(defun activate-default-input-method () - (interactive) - (if use-default-input-method - (activate-input-method default-input-method) - (inactivate-input-method))) - -;; (add-hook 'text-mode-hook #'activate-default-input-method) -;; (add-hook 'mail-mode-hook #'activate-default-input-method) -;; (add-hook 'isearch-mode-hook #'activate-default-input-method) diff --git a/emacs/inits/11-completion.el b/emacs/inits/11-completion.el index cc6f339..f9d0ed2 100644 --- a/emacs/inits/11-completion.el +++ b/emacs/inits/11-completion.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-01-14 12h49 CET (anker)> +;; Time-stamp: <2024-01-14 19h10 CET (068b8e3d)> (use-package savehist :ensure t diff --git a/emacs/inits/15-project-mgmt.el b/emacs/inits/15-project-mgmt.el index fcb1539..1136364 100644 --- a/emacs/inits/15-project-mgmt.el +++ b/emacs/inits/15-project-mgmt.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-07-07 13h44 BST (0fb87241)> +;; Time-stamp: <2024-07-13 15h01 CEST (471b3659)> (defun revert-all-file-buffers () "Refresh all open file buffers without confirmation" @@ -13,11 +13,4 @@ (message "Killed non-existing/unreadable file bufffer: %s" filename)))))) (message "Finished reverting buffers containing unmodified files.")) -(use-package project - :defer nil) - -(use-package magit - :ensure t - :bind (("C-x g" . magit-status)) - :config - (setq magit-process-find-password-functions '(magit-process-password-auth-source))) +(require 'project) diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el index 01d3c18..02f95ed 100644 --- a/emacs/inits/20-programming.el +++ b/emacs/inits/20-programming.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-07-07 13h51 BST (0fb87241)> +;; Time-stamp: <2024-07-13 15h00 CEST (471b3659)> ;; ----------------------------------------------------------------------------- ;; General setup @@ -21,18 +21,22 @@ (align-regexp begin end "\\(\\s-*\\)=" 1 1 )) (use-package eglot + :defer :config (add-to-list 'eglot-server-programs '(bqn-mode . ("bqnlsp")))) (use-package centered-window - :ensure t) + :defer + :ensure) (use-package hideshow + :defer :bind (("C-c C-f C-f" . hs-toggle-hiding))) (use-package dtrt-indent - :ensure t + :ensure + :defer :config (dtrt-indent-global-mode t)) @@ -48,7 +52,7 @@ (setq auto-hscroll-mode t) (when (not (eq major-mode 'python-mode)) (keymap-set (current-local-map) "M-/" 'completion-at-point)) - (yas-minor-mode-on)) + ) (add-hook 'prog-mode-hook #'programming-setup) @@ -56,24 +60,20 @@ ;; Specific packages (use-package comment-dwim-2 - :ensure t + :ensure + :defer :bind (("M-;" . comment-dwim-2)) :config (setq comment-multi-line t comment-style 'extra-line)) (use-package aggressive-indent - :ensure t - :defer t + :ensure + :defer :config (setq aggressive-indent-sit-for-time 1)) -(use-package yasnippet - :ensure t - :defer t - :commands yas-minor-mode-on) - (use-package elec-pair - :defer t + :defer :config (setq electric-pair-delete-adjacent-pairs t electric-pair-skip-self 'electric-pair-default-skip-self @@ -85,13 +85,13 @@ ;; C (use-package clang-format - :ensure t + :ensure :defer :config (setq clang-format-style "file")) (use-package cc-mode - :defer t + :defer :bind (:map c-mode-map ("M-m" . lh-matching-delim)) :hook ((c-mode c++-mode) . (lambda () @@ -189,7 +189,7 @@ ;; Python (use-package python-black - :ensure t + :defer :after python :config (setq python-black-extra-args '("-l120")) @@ -197,8 +197,8 @@ ) (use-package highlight-indent-guides - :ensure t - :defer t + :ensure + :defer :config (setq highlight-indent-guides-auto-odd-face-perc 3 highlight-indent-guides-auto-even-face-perc 5)) @@ -215,12 +215,12 @@ ;; Rust (use-package cargo - :ensure t - :defer t) + :ensure + :defer) (use-package rust-mode - :ensure t - :defer t + :ensure + :defer :bind (:map rust-mode-map ("M-," . lh-backward-delim) ("M-." . lh-forward-delim) @@ -245,16 +245,9 @@ ;; ------------------------------------------------------------------- ;; Misc languages -(add-to-list 'auto-mode-alist - '("\\.jinja\\'" . (lambda () - (text-mode) - (auto-fill-mode -1) - (programming-setup)))) - (use-package json-mode - :ensure t - :defer t - :mode (("\\.json\\.jinja\\'" . json-mode)) + :ensure + :defer :hook (json-mode . (lambda () (programming-setup) (setq standard-indent 2) @@ -266,7 +259,7 @@ (use-package zig-mode :ensure t - :defer t + :defer :hook (zig-mode . (lambda () (eglot-ensure))) :init (defun my-zig-run () @@ -283,11 +276,11 @@ ("C-c C-r" . my-zig-run))) (use-package uiua-ts-mode - :ensure t + :ensure :defer) (use-package bqn-mode - :ensure t + :ensure :defer :bind (:map bqn-mode-map ("M-TAB" . expand-abbrev) diff --git a/emacs/inits/22-lisp.el b/emacs/inits/22-lisp.el index fb1304e..186d18d 100644 --- a/emacs/inits/22-lisp.el +++ b/emacs/inits/22-lisp.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2021-09-27 08h48 EDT (hobbies)> +;; Time-stamp: <2023-12-01 20h44 CET (oranje)> ;; ---------------------------------------------------------------------------- ;; Lisp helpers diff --git a/emacs/inits/23-text-related.el b/emacs/inits/23-text-related.el index 162c29f..79b4da7 100644 --- a/emacs/inits/23-text-related.el +++ b/emacs/inits/23-text-related.el @@ -1,10 +1,11 @@ -;; Time-stamp: <2024-07-08 10h18 CEST (anker)> +;; Time-stamp: <2024-07-13 15h08 CEST (471b3659)> ;; ----------------------------------------------------------------------------- ;; Spelling (use-package spell-fu - :ensure t + :ensure + :defer :config (setq ispell-dictionary "en_GB-ise-w_accents" ispell-personal-dictionary "~/.aspell.en.pws") @@ -27,14 +28,14 @@ (siege-mode 1) (spell-fu-mode 1))) -(use-package dictionary :ensure t :defer t) +(use-package dictionary :ensure :defer) ;; ----------------------------------------------------------------------------- ;; Markdown (use-package markdown-mode - :ensure t - :defer t + :ensure + :defer :hook (markdown-mode . (lambda () (auto-fill-mode -1) (visual-line-mode)))) @@ -43,7 +44,7 @@ ;; Org (use-package org - :defer t + :defer :bind (:map org-mode-map ("M-h" . nil)) ;; :hook (org-mode . (lambda () diff --git a/emacs/inits/24-latex.el b/emacs/inits/24-latex.el index 4b9e908..6c2b617 100644 --- a/emacs/inits/24-latex.el +++ b/emacs/inits/24-latex.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-05-27 20h16 CEST (83a9252e)> +;; Time-stamp: <2024-06-22 12h27 CEST (ed9189e9)> (defvar latex-template-dir (expand-file-name "~/typeset/latex-templates")) (defun prompt-latex-file-template () @@ -126,6 +126,7 @@ populated from the directory *latex-template-dir*" ;; (add-hook 'TeX-after-compilation-finished-functions #'TeX-revert-document-buffer) ) +;; TODO investigate tex-parens (use-package cdlatex :ensure t diff --git a/emacs/inits/25-theorems.el b/emacs/inits/25-theorems.el index fda7ed5..51426b3 100644 --- a/emacs/inits/25-theorems.el +++ b/emacs/inits/25-theorems.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-02-19 18h48 CET (anker)> +;; Time-stamp: <2024-07-13 15h02 CEST (471b3659)> ;; ----------------------------------------------------------------------------- ;; Coq @@ -111,8 +111,8 @@ ) (use-package proof-general - :ensure t - :defer t + :ensure + :defer :functions coq-local-environment :init (setq proof-splash-enable nil proof-follow-mode 'followdown) @@ -132,19 +132,19 @@ ;; ----------------------------------------------------------------------------- ;; Agda -(load-file (let ((coding-system-for-read 'utf-8)) - (shell-command-to-string "agda-mode locate"))) +;; (load-file (let ((coding-system-for-read 'utf-8)) +;; (shell-command-to-string "agda-mode locate"))) -(add-hook 'agda2-mode - (lambda () - (subword-mode 1) - (auto-fill-mode) - (aggressive-indent-mode -1))) +;; (add-hook 'agda2-mode +;; (lambda () +;; (subword-mode 1) +;; (auto-fill-mode) +;; (aggressive-indent-mode -1))) ;; ----------------------------------------------------------------------------- ;; Lean -(use-package lean4-mode - :load-path "~/.emacs.d/lean4-mode" - :defer t - :mode ("\\.lean$" . lean4-mode)) +;; (use-package lean-mode +;; :ensure t +;; :defer t +;; :mode ("\\.lean$" . lean-mode)) diff --git a/emacs/inits/27-gemini.el b/emacs/inits/27-gemini.el index 7a2a1ae..85b8851 100644 --- a/emacs/inits/27-gemini.el +++ b/emacs/inits/27-gemini.el @@ -1,13 +1,13 @@ -;; Time-stamp: <2024-05-27 20h18 CEST (83a9252e)> +;; Time-stamp: <2024-07-13 15h03 CEST (471b3659)> (use-package elpher - :ensure t - :demand + :ensure + :defer :config (setq elpher-default-url-type "gemini")) (use-package visual-fill-column - :ensure t + :ensure :defer) (defvar gemlog-directory (expand-file-name "~/hobbies/l-3.space/")) @@ -54,8 +54,8 @@ (insert symb " ")))) (use-package gemini-mode - :ensure t - :demand + :ensure + :defer :bind (:map gemini-mode-map ("C-c C-f" . gemini-insert-footnote)) :hook (gemini-mode . (lambda () diff --git a/emacs/inits/70-global-keybinds.el b/emacs/inits/70-global-keybinds.el index 045e62f..866cdd2 100644 --- a/emacs/inits/70-global-keybinds.el +++ b/emacs/inits/70-global-keybinds.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2024-07-08 10h27 CEST (anker)> +;; Time-stamp: <2024-07-13 15h08 CEST (471b3659)> (setq time-stamp-active t time-stamp-line-limit 3 @@ -26,7 +26,8 @@ (global-set-key (kbd "C-z") 'nil) (use-package eterm-256color - :ensure t + :ensure + :defer :config (add-hook 'term-mode-hook #'eterm-256color-mode) (global-set-key (kbd "C-c c") 'ansi-term)) @@ -46,7 +47,7 @@ (if (region-active-p) (kill-region 0 0 t) (backward-kill-word arg))) -(global-set-key (kdb "M-h") 'better-backward-kill-word) +(global-set-key (kbd "M-h") 'better-backward-kill-word) (global-set-key (kbd "M-<Backspace>") 'better-backward-kill-word) ;; ----------------------------------------------------------------------------- diff --git a/emacs/inits/99-last.el b/emacs/inits/99-last.el index 1bcec66..9f62f15 100644 --- a/emacs/inits/99-last.el +++ b/emacs/inits/99-last.el @@ -1,8 +1,8 @@ -;; Time-stamp: <2020-08-12 22:05:48 (user@hobbies)> +;; Time-stamp: <2024-03-18 09h51 CET (0c109a04)> (add-hook 'after-init-hook (lambda () - (run-with-idle-timer 20 nil (lambda () (setq gc-cons-threshold 80000000))))) + (run-with-idle-timer 20 nil (lambda () (setq gc-cons-threshold 40000000))))) (setq read-process-output-max (* 1024 1024)) (setq file-name-handler-alist old-file-name-handler-alist) diff --git a/emacs/inits/30-irc.el b/emacs/inits/NO-30-irc.el index 7e20970..7e20970 100644 --- a/emacs/inits/30-irc.el +++ b/emacs/inits/NO-30-irc.el diff --git a/emacs/work_inits/01-basic.el b/emacs/work_inits/01-basic.el deleted file mode 100644 index ecfe165..0000000 --- a/emacs/work_inits/01-basic.el +++ /dev/null @@ -1,145 +0,0 @@ -;; Time-stamp: <2022-07-27 11h57 CEST (radix)> - -;; ----------------------------------------------------------------------------- -;; Interface - -(tool-bar-mode -1) -(menu-bar-mode -1) -(scroll-bar-mode -1) -(fset 'yes-or-no-p 'y-or-n-p) - -(setq select-enable-clipboard t - select-enable-primary t - save-interprogram-paste-before-kill t - require-final-newline t - visible-bell nil) - -(setq echo-keystrokes 0.1 - confirm-kill-emacs 'y-or-n-p - disabled-command-function nil - ring-bell-function 'ignore) - -(size-indication-mode t) - -(defun enlarge-to-fill () - "Stretch the buffer to accomodate `fill-column` many columns." - (interactive) - (let ((ww (window-width))) - (when (< ww (+ 1 fill-column)) - (enlarge-window-horizontally (- (+ 1 fill-column) ww))))) - -(global-set-key (kbd "C-c 3") (lambda () - (interactive) - (split-window-horizontally) - (enlarge-to-fill))) - -(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 Slab-10") - (set-face-attribute 'variable-pitch nil :font "Frank Ruehl CLM-18")) - - -(setq-default line-spacing nil) - -(blink-cursor-mode 0) -(setq cursor-type 'box) -;; (set-cursor-color "orange") - -(set-fringe-style 0) -;; (set-fringe-mode 128) - -;; ----------------------------------------------------------------------------- -;; Backups - -(setq backup-by-copying t - backup-directory-alist '(("." . "/home/user/store/backups/")) - delete-old-versions t - kept-new-versions 6 - kept-old-versions 2 - version-control t) - -(setq create-lockfiles nil) - -;; ----------------------------------------------------------------------------- -;; Defaults - -(setq fill-column 80) - -(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) -(setq scroll-step 1 - scroll-margin 5) - -(setq next-line-add-newlines nil) - -(setq enable-dir-local-variables nil) - -(setq shell-file-name "bash") - -;; ----------------------------------------------------------------------------- -;; Basic packages - -(use-package recentf - :demand t - :config - (setq recentf-max-saved-items 42) - (recentf-mode)) - -(use-package uniquify - :config - (setq uniquify-buffer-name-style 'forward)) - -(use-package tramp - :config - (setq tramp-use-ssh-controlmaster-options nil)) - -(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 - -(defun immortal-scratch () - (if (eq (current-buffer) (get-buffer "*scratch*")) - (progn (bury-buffer) nil) t)) - -(add-hook 'kill-buffer-query-functions 'immortal-scratch) - -;; I couldn't understand the config options, so this is the next best thing -(defun display-startup-echo-area-message () nil) - -(setq initial-scratch-message nil - initial-buffer-choice t) - -(add-hook 'after-init-hook - (lambda () - (setq default-directory "~/"))) diff --git a/emacs/work_inits/01-basic.elc b/emacs/work_inits/01-basic.elc Binary files differdeleted file mode 100644 index 7e9830b..0000000 --- a/emacs/work_inits/01-basic.elc +++ /dev/null diff --git a/emacs/work_inits/02-modeline.el b/emacs/work_inits/02-modeline.el deleted file mode 100644 index 6ea2b07..0000000 --- a/emacs/work_inits/02-modeline.el +++ /dev/null @@ -1,36 +0,0 @@ -;; Time-stamp: <2021-09-27 08h47 EDT (hobbies)> - -;; ----------------------------------------------------------------------------- -;; Mode-line -;; -;; The mode-line is set to eliminate duplicate information between buffers. -;; Everything else is intended to be displayed in another, centralised location. - -(defun abbreviate-left-trim-path (p len) - (let ((pa (abbreviate-file-name p))) - (if (> (length pa) (+ 3 len)) - (format "...%s" (substring pa (- (length pa) len))) - pa))) - -(setq display-time-format "%d/%H.%M" - display-time-default-load-average nil) -(display-time-mode 1) - -(setq global-mode-string nil) -(setq-default mode-line-format - '("" mode-line-front-space - mode-line-modified "%@" - " %l:%c %[" mode-line-buffer-identification "%] %I" - " " mode-line-modes ;; (vc-mode vc-mode) - (:eval (abbreviate-left-trim-path default-directory 20)) - mode-line-misc-info mode-line-end-spaces)) - -;; ----------------------------------------------------------------------------- -;; Minions to clean mode-line - -(use-package minions - :ensure t - :config - (setq minions-mode-line-lighter ":" - minions-direct '(god-local-mode)) - (minions-mode 1)) diff --git a/emacs/work_inits/02-modeline.elc b/emacs/work_inits/02-modeline.elc Binary files differdeleted file mode 100644 index e0dc4dc..0000000 --- a/emacs/work_inits/02-modeline.elc +++ /dev/null diff --git a/emacs/work_inits/03-miscload.el b/emacs/work_inits/03-miscload.el deleted file mode 100644 index 6f4ffbf..0000000 --- a/emacs/work_inits/03-miscload.el +++ /dev/null @@ -1,8 +0,0 @@ -;; Time-stamp: <2020-08-12 22:25:58 (user@hobbies)> - -(use-package siege-mode - :load-path "~/.emacs.d/scripts/siege-mode/") - -;; (use-package maxima -;; :defer t -;; :config (setq imaxima-use-maxima-mode-flag t)) diff --git a/emacs/work_inits/03-miscload.elc b/emacs/work_inits/03-miscload.elc Binary files differdeleted file mode 100644 index 741b5be..0000000 --- a/emacs/work_inits/03-miscload.elc +++ /dev/null diff --git a/emacs/work_inits/05-helpful.el b/emacs/work_inits/05-helpful.el deleted file mode 100644 index f8ac203..0000000 --- a/emacs/work_inits/05-helpful.el +++ /dev/null @@ -1,17 +0,0 @@ -;; Time-stamp: <2019-01-26 12:49:57 (tslil@winslow)> - -(use-package helpful - :ensure t - :bind (("C-h f" . helpful-callable) - ("C-h v" . helpful-variable) - ("C-h k" . helpful-key) - ("C-h F" . helpful-function) - ("C-c h" . heplful-at-point)) - :config - (advice-add #'describe-key :override #'helpful-key) - (advice-add #'describe-function :override #'helpful-callable) - (advice-add #'describe-variable :override #'helpful-variable) - (advice-add #'describe-symbol :override #'helpful-symbol)) - -(use-package apropos - :config (setq apropos-do-all t)) diff --git a/emacs/work_inits/05-helpful.elc b/emacs/work_inits/05-helpful.elc Binary files differdeleted file mode 100644 index 783abef..0000000 --- a/emacs/work_inits/05-helpful.elc +++ /dev/null diff --git a/emacs/work_inits/11-completion.el b/emacs/work_inits/11-completion.el deleted file mode 100644 index 17b85d3..0000000 --- a/emacs/work_inits/11-completion.el +++ /dev/null @@ -1,159 +0,0 @@ -;; Time-stamp: <2022-07-28 14h06 CEST (radix)> - -;; ----------------------------------------------------------------------------- -;; Vertico - -(use-package vertico - :ensure t - :bind (:map vertico-map ("<tab>" . vertico-insert)) - :init - (vertico-mode) - (setq vertico-cycle t) - (setq completion-styles '(substring))) - -(use-package orderless - :ensure t - :config - (setq orderless-component-separator 'orderless-escapable-split-on-space - completion-styles '(orderless basic) - completion-category-overrides '((file (styles basic partial-completion))))) - -(use-package savehist - :ensure t - :init (savehist-mode)) - -(use-package emacs - :init - ;; Add prompt indicator to `completing-read-multiple'. - (defun crm-indicator (args) - (cons (concat "[CRM] " (car args)) (cdr args))) - (advice-add #'completing-read-multiple :filter-args #'crm-indicator) - - ;; Grow and shrink minibuffer - ;;(setq resize-mini-windows t) - - ;; Do not allow the cursor in the minibuffer prompt - (setq minibuffer-prompt-properties - '(read-only t cursor-intangible t face minibuffer-prompt)) - (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode) - - ;; Enable recursive minibuffers - (setq enable-recursive-minibuffers t)) - -;; ----------------------------------------------------------------------------- -;; Consult - -(use-package consult - :ensure t - :bind (;; C-c bindings (mode-specific-map) - ("C-c h" . consult-history) - ("C-c m" . consult-mode-command) - ("C-c b" . consult-bookmark) - ("C-c k" . consult-kmacro) - ;; C-x bindings (ctl-x-map) - ("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command - ("C-x b" . consult-buffer) ;; orig. switch-to-buffer - ("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window - ("C-x 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame - ;; Custom M-# bindings for fast register access - ("M-#" . consult-register-load) - ("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated) - ("C-M-#" . consult-register) - ;; Other custom bindings - ("M-y" . consult-yank-pop) ;; orig. yank-pop - ("<help> a" . consult-apropos) ;; orig. apropos-command - ;; 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 - ("M-g M-g" . consult-goto-line) ;; orig. goto-line - ("M-g o" . consult-outline) ;; Alternative: consult-org-heading - ("M-g m" . consult-mark) - ("M-g k" . consult-global-mark) - ("M-g i" . consult-imenu) - ("M-g I" . consult-project-imenu) - ;; M-s bindings (search-map) - ("M-s f" . consult-find) - ("M-s L" . consult-locate) - ("C-c g" . consult-ripgrep) - ("C-c G" . consult-git-grep) - ("M-s l" . consult-line) - ("M-s m" . consult-multi-occur) - ("M-s k" . consult-keep-lines) - ("M-s u" . consult-focus-lines) - ;; Isearch integration - ;; ("M-s e" . consult-isearch) - :map isearch-mode-map - ;; ("M-e" . consult-isearch) ;; orig. isearch-edit-string - ;; ("M-s e" . consult-isearch) ;; orig. isearch-edit-string - ("M-s l" . consult-line)) ;; needed by consult-line to detect isearch - - :init - ;; Optionally configure the register formatting. This improves the register - ;; preview for `consult-register', `consult-register-load', - ;; `consult-register-store' and the Emacs built-ins. - (setq register-preview-delay 0 - register-preview-function #'consult-register-format) - - ;; Optionally tweak the register preview window. - ;; This adds thin lines, sorting and hides the mode line of the window. - (advice-add #'register-preview :override #'consult-register-window) - - ;; Use Consult to select xref locations with preview - (setq xref-show-xrefs-function #'consult-xref - xref-show-definitions-function #'consult-xref) - - :config - (consult-customize - consult-theme - :preview-key '(:debounce 0.2 any) - - consult-ripgrep consult-git-grep consult-grep - consult-bookmark consult-recent-file consult-xref - consult--source-buffer consult--source-project-buffer consult--source-bookmark - :preview-key (kbd "M-.")) - - (defun previous-history-or-next () - (interactive) - (if (string= "" (minibuffer-contents-no-properties)) - (progn - (previous-history-element 1) - (end-of-line)) - (vertico-next))) - - (defvar my-consult-line-map - (let ((map (make-sparse-keymap))) - (define-key map "\C-s" #'previous-history-or-next) - map)) - - (consult-customize consult-line :keymap my-consult-line-map) - - ;; Optionally configure the narrowing key. - ;; Both < and C-+ work reasonably well. - (setq consult-narrow-key "<") ;; (kbd "C-+") - - ;; Optionally make narrowing help available in the minibuffer. - ;; You may want to use `embark-prefix-help-command' or which-key instead. - ;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help) - - ;; Projectile integration - (autoload 'projectile-project-root "projectile") - (setq consult-project-function #'projectile-project-root) - - ;; Ues consult for capfs - (setq completion-in-region-function #'consult-completion-in-region)) - -;; ----------------------------------------------------------------------------- -;; Marginalia - -(use-package marginalia - :ensure t - :bind (:map minibuffer-local-map ("M-A" . marginalia-cycle)) - :init (marginalia-mode)) - - -;; CTRLF -(use-package ctrlf - :ensure t - :config - (ctrlf-mode)) diff --git a/emacs/work_inits/11-completion.elc b/emacs/work_inits/11-completion.elc Binary files differdeleted file mode 100644 index b88cc25..0000000 --- a/emacs/work_inits/11-completion.elc +++ /dev/null diff --git a/emacs/work_inits/13-ibuffer.el b/emacs/work_inits/13-ibuffer.el deleted file mode 100644 index 1562f29..0000000 --- a/emacs/work_inits/13-ibuffer.el +++ /dev/null @@ -1,56 +0,0 @@ -;; Time-stamp: <2022-06-13 10h46 CDT (radix)> - -(use-package ibuffer - :bind (("C-x C-b" . ibuffer)) - :hook (ibuffer-mode . (lambda () - (ibuffer-switch-to-saved-filter-groups "default"))) - :config - (setq ibuffer-display-summary nil - ibuffer-saved-filter-groups - '(("default" - ("c{,++}" (or (mode . c-mode) - (mode . c++-mode) - (mode . makefile-gmake-mode))) - ("dired" (mode . dired-mode)) - ("elisp" (or (mode . emacs-lisp-mode) - (name . "^\\*Backtrace\\*"))) - ("emacs" (or (name . "^\\*scratch\\*$") - (name . "^\\*Messages\\*$") - (name . "^\\*init log\\*$") - (name . "^\\*Compile-Log\\*$") - (mode . helpful-mode) - (name . "^\\*Help\\*$"))) - ("magit" (name . "^magit[:-]")) - ("python" (mode . python-mode)) - ("REPL" (name . "^\\*.*REPL.*\\*$"))))) - - (defadvice ibuffer-update-title-and-summary (after remove-column-titles) - (with-current-buffer "*Ibuffer*" - (read-only-mode -1) - (goto-char 1) - (search-forward "-\n" nil t) - (delete-region 1 (point)) - (let ((window-min-height 1)) - ;; save a little screen estate - (shrink-window-if-larger-than-buffer)) - (read-only-mode 1))) - - (ad-activate 'ibuffer-update-title-and-summary) - - (define-ibuffer-column size-h - (:name "Size" :inline t) - (cond - ((> (buffer-size) 1000000) (format "%7.1fM" (/ (buffer-size) 1000000.0))) - ((> (buffer-size) 100000) (format "%7.0fk" (/ (buffer-size) 1000.0))) - ((> (buffer-size) 1000) (format "%7.1fk" (/ (buffer-size) 1000.0))) - (t (format "%8d" (buffer-size))))) - - (setq ibuffer-formats - '((mark modified read-only locked " " - (name 18 18 :left :elide) - " " - (size-h 9 -1 :right) - " " - (mode 16 16 :left :elide) - " " - filename-and-process)))) diff --git a/emacs/work_inits/13-ibuffer.elc b/emacs/work_inits/13-ibuffer.elc Binary files differdeleted file mode 100644 index 077c67e..0000000 --- a/emacs/work_inits/13-ibuffer.elc +++ /dev/null diff --git a/emacs/work_inits/14-movement.el b/emacs/work_inits/14-movement.el deleted file mode 100644 index a411277..0000000 --- a/emacs/work_inits/14-movement.el +++ /dev/null @@ -1,110 +0,0 @@ -;; Time-stamp: <2021-09-27 08h47 EDT (hobbies)> - -;; ------------------------------------------------------------------- -;; Repeated key presses for region - -(use-package expand-region :ensure t - :bind (("M-r" . er/expand-region)) - :config - (setq expand-region-fast-keys-enabled t - expand-region-contract-fast-key "c" - expand-region-reset-fast-key "e" - expand-region-autocopy-register "i")) - -;; ------------------------------------------------------------------- -;; Window switching - -(use-package switch-window :ensure t - :bind (("C-x o" . switch-window) - ("C-x C-o" . other-frame) - ("C-c o" . switch-window) - ("C-c n" . switch-window-then-maximize) - :map switch-window-extra-map - ("u" . switch-window-mvborder-up) - ("e" . switch-window-mvborder-down) - ("n" . switch-window-mvborder-left) - ("o" . switch-window-mvborder-right) - ("i" . nil) - ("j" . nil) - ("k" . nil) - ("l" . nil)) - :config - (setq switch-window-input-style 'minibuffer - switch-window-shortcut-style 'qwerty - switch-window-multiple-frames nil - switch-window-qwerty-shortcuts - '("a" "r" "s" "t" "n" "e" "i" "o"))) - -;; ------------------------------------------------------------------- -;; Character jumping - -(use-package avy - :ensure t - :demand - :bind (("C-," . avy-goto-char-timer) - ("C-." . avy-goto-char-in-line) - ("M-g s" . avy-goto-word-or-subword-1) - ("M-g w" . avy-goto-word-1) - ("M-g a" . avy-goto-word-0) - ("M-g C-g" . avy-goto-line)) - :config - (setq avy-keys '(?a ?r ?s ?t ?g ?k ?n ?e ?i ?o ?q ?w ?f ?p) - avy-dispatch-alist '((?w . avy-action-kill-move) - (?W . avy-action-kill-stay) - (?j . avy-action-teleport) - (?m . avy-action-mark) - (?c . avy-action-copy) - (?y . avy-action-yank) - (?i . avy-action-ispell) - (?z . avy-action-zap-to-char)))) - -;; ------------------------------------------------------------------- -;; General stuff - -;; (global-set-key (kbd "C-b") 'recenter-top-bottom) -;; (global-set-key (kbd "M-b") 'downcase-word) -;; (global-set-key (kbd "C-l") 'backward-char) -;; (global-set-key (kbd "M-l") 'backward-word) - -(global-set-key (kbd "C-M-e") 'end-of-buffer) -(global-set-key (kbd "C-M-a") 'beginning-of-buffer) - -(global-set-key (kbd "M-h") 'backward-kill-word) - -(global-set-key (kbd "M-z") 'zap-up-to-char) - -;; Fast movement -(global-set-key (kbd "M-n") 'scroll-up-command) -(global-set-key (kbd "M-p") 'scroll-down-command) - -(global-set-key (kbd "C-S-n") - (lambda () (interactive) (ignore-errors (forward-line 5)))) - -(global-set-key (kbd "C-S-p") - (lambda () (interactive) (ignore-errors (forward-line -5)))) - -(global-set-key (kbd "C-S-f") - (lambda () (interactive) (ignore-errors (forward-char 5)))) - -(global-set-key (kbd "C-S-b") - (lambda () (interactive) (ignore-errors (backward-char 5)))) - -;; Hardcore mode -(defconst hardcore-nav-mode nil) -(when hardcore-nav-mode - (global-set-key (kbd "<XF86Back>") nil) - (global-set-key (kbd "<XF86Forward>") nil) - (global-set-key (kbd "<right>") nil) - (global-set-key (kbd "<left>") nil) - (global-set-key (kbd "<up>") nil) - (global-set-key (kbd "<down>") nil) - (global-set-key (kbd "S-<right>") nil) - (global-set-key (kbd "S-<left>") nil) - (global-set-key (kbd "S-<up>") nil) - (global-set-key (kbd "C-<down>") nil) - (global-set-key (kbd "C-<right>") nil) - (global-set-key (kbd "C-<left>") nil) - (global-set-key (kbd "C-<up>") nil) - (global-set-key (kbd "C-<down>") nil) - (global-set-key (kbd "<Home>") nil) - (global-set-key (kbd "<End>") nil)) diff --git a/emacs/work_inits/14-movement.elc b/emacs/work_inits/14-movement.elc Binary files differdeleted file mode 100644 index 26dec51..0000000 --- a/emacs/work_inits/14-movement.elc +++ /dev/null diff --git a/emacs/work_inits/15-project-mgmt.el b/emacs/work_inits/15-project-mgmt.el deleted file mode 100644 index a9e5336..0000000 --- a/emacs/work_inits/15-project-mgmt.el +++ /dev/null @@ -1,30 +0,0 @@ -;; Time-stamp: <2022-05-10 20h39 CDT (radix)> - -(use-package projectile - :ensure t - :bind (("C-c p" . projectile-switch-project) - ("C-c f" . projectile-find-file-dwim)) - :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 () " ¶") - )) - -(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/work_inits/15-project-mgmt.elc b/emacs/work_inits/15-project-mgmt.elc Binary files differdeleted file mode 100644 index c7940d8..0000000 --- a/emacs/work_inits/15-project-mgmt.elc +++ /dev/null diff --git a/emacs/work_inits/20-programming.el b/emacs/work_inits/20-programming.el deleted file mode 100644 index 90ab2d8..0000000 --- a/emacs/work_inits/20-programming.el +++ /dev/null @@ -1,277 +0,0 @@ -;; Time-stamp: <2022-07-21 10h34 CEST (radix)> - -;; ----------------------------------------------------------------------------- -;; General setup - -;; Always split horizontally when compiling -;; (defadvice compile (around split-horizontally activate) -;; (let ((split-width-threshold 0) -;; (split-height-threshold nil)) -;; ad-do-it)) - -;; Resize to fill column (and a little bit) -;; (defadvice compile (after resize-window-properly activate) -;; (let ((ww (window-width))) -;; (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))) - -(defun align-to-equals (begin end) - "Align region to equal signs" - (interactive "r") - (align-regexp begin end "\\(\\s-*\\)=" 1 1 )) - -;; (use-package flycheck -;; :defer t -;; :ensure t) - -;; (use-package origami -;; :ensure t -;; :bind (("C-c C-f C-f" . origami-recursively-toggle-node) -;; ("C-c C-f C-o" . origami-show-only-node) -;; ("C-c C-f C-u" . origami-undo) -;; ("C-c C-f C-r" . origami-redo)) -;; :config -;; (global-origami-mode -1)) - -(use-package hideshow - :bind (("C-c C-f C-f" . hs-toggle-hiding))) - -(defun programming-setup () - (subword-mode 1) - (electric-pair-local-mode) - (set-fill-column 80) - (hs-minor-mode) - ;; Emacs25 compat - (if (fboundp 'display-line-numbers-mode) - (display-line-numbers-mode) - (linum-mode)) - (setq auto-hscroll-mode t) - (yas-minor-mode-on)) - -(add-hook 'prog-mode-hook #'programming-setup) - -;; ----------------------------------------------------------------------------- -;; Specific packages - -(use-package shift-number - :ensure t - :bind (("C-c s p" . shift-number-up) - ("C-c s n" . shift-number-down))) - -(use-package comment-dwim-2 - :ensure t - :bind (("M-;" . comment-dwim-2)) - :config (setq comment-multi-line t - comment-style 'extra-line)) - -(use-package aggressive-indent - :ensure t - :defer t) - -(use-package yasnippet - :ensure t - :defer t - :commands yas-minor-mode-on) - -(use-package elec-pair - :defer t - :config - (setq electric-pair-delete-adjacent-pairs t - electric-pair-skip-self 'electric-pair-default-skip-self - electric-pair-preserve-balance t - electric-pair-skip-whitespace t - electric-pair-inhibit-predicate 'electric-pair-default-inhibit)) - -;; (use-package lsp-mode -;; :ensure t -;; :defer t -;; :init -;; (setq lsp-keymap-prefix "M-l")) - -;; ----------------------------------------------------------------------------- -;; C - -;; What are these? -;; (setq gdb-show-threads-by-default nil -;; gdb-many-windows nil -;; gdb-show-main nil) - -(use-package cc-mode - :defer t - :bind (:map c-mode-map - ("M-/" . lh-matching-delim)) - :hook ((c-mode c++-mode) . (lambda () - (auto-fill-mode) - (set-fill-column 80) - (abbrev-mode 0) - ;; (flycheck-mode 1) - ;; (lsp) ;; clangd seems pretty good! - (c-toggle-hungry-state 1) - (c-toggle-electric-state 1) - (c-toggle-syntactic-indentation 1))) - :config - (c-add-style "gnu-mod" - '("gnu" - (c-basic-offset . 4) ; Guessed value - (c-offsets-alist - (block-close . 0) ; Guessed value - (case-label . +) ; Guessed value - (defun-block-intro . +) ; Guessed value - (defun-close . 0) ; Guessed value - (statement . 0) ; Guessed value - (statement-block-intro . +) ; Guessed value - (statement-case-intro . 0) ; Guessed value - (substatement . +) ; Guessed value - (topmost-intro . 0) ; Guessed value - (access-label . -) - (annotation-top-cont . 0) - (annotation-var-cont . +) - (arglist-close . c-lineup-close-paren) - (arglist-cont c-lineup-gcc-asm-reg 0) - (arglist-cont-nonempty . c-lineup-arglist) - (arglist-intro . +) - (block-open . 0) - (brace-entry-open . 0) - (brace-list-close . 0) - (brace-list-entry . 0) - (brace-list-intro . +) - (brace-list-open . 0) - (c . c-lineup-C-comments) - (catch-clause . 0) - (class-close . 0) - (class-open . 0) - (comment-intro . c-lineup-comment) - (composition-close . 0) - (composition-open . 0) - (cpp-define-intro c-lineup-cpp-define +) - (cpp-macro . -1000) - (cpp-macro-cont . +) - (defun-open . 0) - (do-while-closure . 0) - (else-clause . 0) - (extern-lang-close . 0) - (extern-lang-open . 0) - (friend . 0) - (func-decl-cont . +) - (inclass . +) - (incomposition . +) - (inexpr-class . +) - (inexpr-statement . +) - (inextern-lang . +) - (inher-cont . c-lineup-multi-inher) - (inher-intro . +) - (inlambda . 0) - (inline-close . 0) - (inline-open . +) - (inmodule . +) - (innamespace . +) - (knr-argdecl . 0) - (knr-argdecl-intro . +) - (label . 2) - (lambda-intro-cont . +) - (member-init-cont . c-lineup-multi-inher) - (member-init-intro . +) - (module-close . 0) - (module-open . 0) - (namespace-close . 0) - (namespace-open . 0) - (objc-method-args-cont . c-lineup-ObjC-method-args) - (objc-method-call-cont c-lineup-ObjC-method-call-colons c-lineup-ObjC-method-call +) - (objc-method-intro . [0]) - (statement-case-open . 0) - (statement-cont . +) - (stream-op . c-lineup-streamop) - (string . -1000) - (substatement-label . 2) - (substatement-open . +) - (template-args-cont c-lineup-template-args +) - (topmost-intro-cont . c-lineup-topmost-intro-cont)))) - - (setq c-default-style '((java-mode . "java") - (awk-mode . "awk") - (other . "gnu-mod")))) - -;; ----------------------------------------------------------------------------- -;; Python - -;; (use-package yapfify -;; :ensure t -;; :defer t -;; :config -;; (setq yapfify-executable "yapf3")) - -(use-package highlight-indent-guides - :ensure t - :defer t - :config - (setq highlight-indent-guides-auto-odd-face-perc 1.5 - highlight-indent-guides-auto-even-face-perc 3)) - -(use-package python - :hook (python-mode . (lambda () - (highlight-indent-guides-mode) - ;; (yapf-mode) - )) - ;; :config - ;; (setq python-shell-interpreter "python3") - ) - -;; ------------------------------------------------------------------- -;; Misc languages - -(use-package json-mode - :ensure t - :defer t - :bind (:map json-mode-map - ("C-c C-f" . nil))) - -;; (use-package js-comint -;; :ensure t -;; :defer t -;; :config -;; (setq js-comint-program-command "node" -;; js-comint-program-arguments nil)) - -;; (use-package js2-mode -;; :ensure t -;; :defer t -;; :after js-comint -;; :mode "\\.js$" -;; :bind (:map js2-mode-map -;; ("TAB" . js2-indent-line) -;; ("C-x C-e" . js-send-last-sexp) -;; ("C-c C-b" . js-send-buffer) -;; ("C-c C-l" . js-load-file)) -;; :hook (js2-mode . (lambda () -;; (auto-revert-mode -1) -;; (yas-minor-mode-on)))) - -;; (use-package lua-mode -;; :after nodemcu-mode -;; :ensure t -;; :defer t -;; :bind (:map lua-mode-map -;; ("C-x C-e" . lua-send-current-line) -;; ("C-c C-d" . lua-send-defun) -;; ("C-c C-e" . lua-send-region) -;; ("C-c C-u" . nodemcu-better-upload-current-file) -;; ("C-c C-t" . nodemcu-terminal) -;; ("M-n" . lua-forward-sexp) -;; ("M-p" . lua-backwards-to-block-begin-or-end)) -;; :hook (lua-mode . (lambda () -;; (require 'nodemcu-mode) -;; (nodemcu-mode 1)))) - -;; (use-package gforth -;; :commands forth-mode -;; :mode (("\\.fs$" . forth-mode) -;; ("\\.fb$" . forth-block-mode) -;; ("\\.4th$" . forth-mode))) diff --git a/emacs/work_inits/20-programming.elc b/emacs/work_inits/20-programming.elc Binary files differdeleted file mode 100644 index 14d096a..0000000 --- a/emacs/work_inits/20-programming.elc +++ /dev/null diff --git a/emacs/work_inits/21-functional.el b/emacs/work_inits/21-functional.el deleted file mode 100644 index d9e4214..0000000 --- a/emacs/work_inits/21-functional.el +++ /dev/null @@ -1,42 +0,0 @@ -;; Time-stamp: <2021-09-27 08h48 EDT (hobbies)> - -;; ----------------------------------------------------------------------------- -;; Haskell - -(use-package lsp-haskell :ensure t :defer) - -(use-package haskell-mode - :ensure t - :bind (:map haskell-mode-map - ("C-c C-p". haskell-navigate-imports) - ("C-c C-c" . haskell-compile) - ("C-c C-z" . haskell-interactive-switch) - ("C-c C-l" . haskell-process-load-file) - ("C-c C-b" . haskell-interactive-switch) - ("C-c C-t" . haskell-process-do-type) - ("C-c C-i" . haskell-process-do-info) - ("C-x C-d" . nil) - ("C-c M-." . nil) - ("C-c C-d" . nil)) - :hook ((haskell-interactive-mode . visual-line-mode) - (haskell-mode . (lambda () - (subword-mode 1) - (aggressive-indent-mode -1) - (haskell-indentation-mode) - (interactive-haskell-mode) - (turn-on-haskell-doc-mode) - (turn-on-haskell-decl-scan) - (lsp) - (haskell-mode-stylish-buffer)))) - :config - (setq haskell-doc-show-global-types t - haskell-doc-show-prelude t - haskell-doc-show-user-defined t - haskell-doc-show-reserved t - haskell-interactive-mode-eval-pretty t - haskell-process-type 'auto - haskell-stylish-on-save t - haskell-process-use-presentation-mode t - haskell-process-suggest-imports t - haskell-process-suggest-hoogle-imports t - haskell-process-show-debug-tips nil)) diff --git a/emacs/work_inits/21-functional.elc b/emacs/work_inits/21-functional.elc Binary files differdeleted file mode 100644 index de7f119..0000000 --- a/emacs/work_inits/21-functional.elc +++ /dev/null diff --git a/emacs/work_inits/22-lisp.el b/emacs/work_inits/22-lisp.el deleted file mode 100644 index 1a7e33d..0000000 --- a/emacs/work_inits/22-lisp.el +++ /dev/null @@ -1,104 +0,0 @@ -;; Time-stamp: <2022-06-03 09h28 CDT (radix)> - -;; ---------------------------------------------------------------------------- -;; Lisp helpers - -(defvar lh-pairs '(("(" . ")") - ("[" . "]") - ("{" . "}") - ("<" . ">") - ("\"" . "\""))) - -(defun lh-forward-delim () - (interactive) - (save-match-data - (re-search-forward - (regexp-opt (mapcar #'cdr lh-pairs))))) - -(defun lh-backward-delim () - (interactive) - (save-match-data - (re-search-backward - (regexp-opt (mapcar #'car lh-pairs))))) - -(defun lh-matching-delim () - (interactive) - (cond - ((looking-at (regexp-opt (mapcar #'car lh-pairs))) - (forward-sexp)) - ((looking-back (regexp-opt (mapcar #'cdr lh-pairs)) nil) - (backward-sexp)) - (t (backward-up-list 1 t t)))) - -(defun lh-slurp-forward () - (interactive) - (corral-shift-forward ?\( ?\))) - -(defun lh-slurp-backward () - (interactive) - (corral-shift-backward ?\( ?\))) - -(defun lh-open-parentheses-dwim (arg) - (interactive "P") - (if (or (= (line-beginning-position) (point)) - (looking-at "\\Sw")) (insert-parentheses arg) - (backward-sexp) - (insert-parentheses 1))) - -(defun lh-end-of-defun (arg) - (interactive "P") - (end-of-defun arg) - (re-search-backward ")") - (forward-char)) - -(defun lh-avy-open-paren () - (interactive) - (avy-goto-char ?\( )) - -(defun lh-avy-close-paren () - (interactive) - (avy-goto-char ?\) )) - -(use-package corral :ensure t) -(defun make-lisp-bindings () - (let ((map (eval (read (format "%s-map" major-mode))))) - (progn - (require 'corral) - (define-key map (kbd "M-e") 'forward-sexp) - (define-key map (kbd "M-a") 'backward-sexp) - (define-key map (kbd "M-,") 'lh-backward-delim) - (define-key map (kbd "M-.") 'lh-forward-delim) - (define-key map (kbd "M-/") 'lh-matching-delim) - (define-key map (kbd "C-c (") 'lh-avy-open-paren) - (define-key map (kbd "C-c )") 'lh-avy-close-paren) - (define-key map (kbd "(") 'lh-open-parentheses-dwim) - (define-key map (kbd "C-c r") 'raise-sexp) - (define-key map (kbd "C-k") 'kill-sexp) - (define-key map (kbd "M-(") 'corral-parentheses-forward) - (define-key map (kbd "M-)") 'corral-parentheses-backward) - (define-key map (kbd "M-{") 'corral-braces-forward) - (define-key map (kbd "M-}") 'corral-braces-backward) - (define-key map (kbd "M-[") 'corral-brackets-forward) - (define-key map (kbd "M-]") 'corral-brackets-backward) - (define-key map (kbd "C-)") 'lh-slurp-forward) - (define-key map (kbd "C-(") 'lh-slurp-backward) - (define-key map (kbd "M-p") 'beginning-of-defun) - (define-key map (kbd "M-n") 'lh-end-of-defun) - t))) - -;; ---------------------------------------------------------------------------- -;; Mode configurations - -;; (use-package rainbow-blocks :ensure t) - -(add-hook 'emacs-lisp-mode-hook - (lambda () - (eldoc-mode) - (aggressive-indent-mode) - (make-lisp-bindings))) - -(use-package caps-lock-mode - :load-path "~/.emacs.d/scripts/") - -;; (use-package slime-company -;; :ensure t :defer t) diff --git a/emacs/work_inits/22-lisp.elc b/emacs/work_inits/22-lisp.elc Binary files differdeleted file mode 100644 index cc0294b..0000000 --- a/emacs/work_inits/22-lisp.elc +++ /dev/null diff --git a/emacs/work_inits/23-text-related.el b/emacs/work_inits/23-text-related.el deleted file mode 100644 index 8aac63e..0000000 --- a/emacs/work_inits/23-text-related.el +++ /dev/null @@ -1,175 +0,0 @@ -;; Time-stamp: <2020-05-17 15:35:55 (tslil@bison)> - -;; ----------------------------------------------------------------------------- -;; Spelling - -(use-package spell-fu - :ensure t - :config - (setq ispell-dictionary "en_GB-ise-w_accents" - ispell-personal-dictionary "~/.aspell.en.pws") - - ;; The default was this "\\b\\([[:alpha:]][[:alpha:]']*\\)\\b", but that - ;; didn't play well with ``LaTeX's quoting system''. - (setq-default spell-fu-word-regexp "\\([[:alpha:]]+\\('[[:alpha:]]+\\)*\\)" - spell-fu-faces-exclude '(font-latex-math-face - font-latex-sedate-face - font-lock-keyword-face - font-lock-function-name-face - font-lock-variable-name-face))) - -;; (defun flyspell-correct-selectrum (candidates word) -;; (let* ((save "[SAVE]") -;; (accept-session "[ACCEPT (session)]") -;; (accept-buffer "[ACCEPT (buffer)]") -;; (skip "[SKIP]") -;; (selectrucm-should-sort nil) -;; (result (selectrum-completing-read -;; (format "Correcting '%s': " word) -;; (append candidates -;; (list save accept-session accept-buffer skip))))) -;; (cond -;; ((string= result save) -;; (cons 'save word)) -;; ((string= result accept-session) -;; (cons 'session word)) -;; ((string= result accept-buffer) -;; (cons 'buffer word)) -;; ((string= result skip) -;; (cons 'skip word)) -;; (t -;; result)))) - -;; (use-package flyspell-correct -;; :ensure t -;; :defer t -;; :config -;; (setq flyspell-correct-interface #'flyspell-correct-selectrum)) - -;; (use-package flyspell -;; :ensure t -;; :bind (:map flyspell-mode-map -;; ("M-$" . flyspell-correct-wrapper) -;; ("C-," . nil) -;; ("C-." . nil) -;; ("C-\"" . nil)) -;; :init -;; (setq ispell-dictionary "british" -;; flyspell-default-dictionary "british")) - -(setq sentence-end-double-space nil) - -(add-hook 'mail-mode-hook (lambda () - (electric-pair-local-mode 1) - (turn-on-auto-fill) - (spell-fu-mode 1) - ;; (flyspell-mode 1) - (company-mode 1))) - -(add-hook 'text-mode-hook (lambda () - ;; (set-input-method "Adga") - (subword-mode 1) - (electric-pair-local-mode 1) - (turn-on-auto-fill) - (siege-mode 1) - (spell-fu-mode 1) - ;; (flyspell-mode 1) - )) - -(use-package dictionary :ensure t :defer t) - -;; ----------------------------------------------------------------------------- -;; Org - -(use-package org - :defer t - :bind (:map org-mode-map - ("M-h" . nil)) - ;; :hook (org-mode . (lambda () - ;; (activate-input-method default-input-method))) - :config - (setq org-use-sub-superscripts (quote {}) - org-modules nil)) - - -;; ----------------------------------------------------------------------------- -;; Deft - -(use-package deft - :ensure t - :defer t - :commands (deft) - :bind (("C-c C-z" . deft)) - :config - (setq deft-default-extension "org" - deft-directory "~/store/notes" - deft-use-filename-as-title nil - deft-use-filter-string-for-filename t - deft-file-naming-rules '((noslash . "_") - (nospace . "_") - (case-fn . downcase)) - deft-org-mode-title-prefix t) - - ;; (defvar deft-take-note-pre-grab - ;; '((region-thing . (let ((r (if (region-active-p) - ;; (buffer-substring (region-beginning) (region-end)) - ;; (thing-at-point 'line)))) - ;; (if r (concat r "\n") ""))) - ;; (bfn . (let ((f (buffer-file-name)) - ;; (b (buffer-name))) (if f f (concat b " (no file associated)"))))) - ;; "List of pairs of symbol names and (functions evaluating to) - ;; strings evaluated before the buffer is created, and made - ;; available for deft-take-note-default-contents.") - - ;; (defvar deft-take-note-post-grab '() - ;; "List of pairs of symbol names and (functions evaluating to) - ;; strings evaluated after the buffer is created, and made - ;; available for deft-take-note-default-contents.") - - ;; (defvar deft-take-note-default-contents '(region-thing bfn "\n") - ;; "List with string literals and symbols defined in the pre and - ;; post grab lists to be inserted into the buffer.") - - ;; (defun deft-take-note () - ;; (interactive) - ;; (let ((pre-alist (mapcar #'(lambda (elt) `(,(car elt) . ,(eval (cdr elt)))) - ;; deft-take-note-pre-grab))) - ;; (let ((bn (concat (format-time-string "%Y%m%d-%H:%M:%S.%N-%Z") "." - ;; deft-default-extension))) - ;; (switch-to-buffer bn) - ;; (set-visited-file-name (expand-file-name - ;; (concat deft-directory "/" bn))) - ;; (let ((complete-alist - ;; (append pre-alist - ;; (mapcar #'(lambda (elt) `(,(car elt) . ,(eval (cdr elt)))) - ;; deft-take-note-post-grab)))) - ;; (mapc #'(lambda (elt) (if (eq (type-of elt) 'string) - ;; (insert elt) - ;; (insert (cdr (assoc elt complete-alist))))) - ;; deft-take-note-default-contents))))) - ) - -;; ----------------------------------------------------------------------------- -;; Useful keybinds - -(defun vi-open-line-above () - "Insert a newline above the current line and put point at beginning." - (interactive) - (unless (bolp) - (beginning-of-line)) - (newline) - (forward-line -1) - (indent-according-to-mode)) - -(defun vi-open-line-below () - "Insert a newline below the current line and put point at beginning." - (interactive) - (unless (eolp) - (end-of-line)) - (newline-and-indent)) - -(global-set-key (kbd "M-o") 'vi-open-line-below) -(global-set-key (kbd "C-o") 'vi-open-line-above) - -(global-set-key (kbd "M-C-+") 'text-scale-increase) -(global-set-key (kbd "M-C--") 'text-scale-decrease) diff --git a/emacs/work_inits/23-text-related.elc b/emacs/work_inits/23-text-related.elc Binary files differdeleted file mode 100644 index 9d6b3a1..0000000 --- a/emacs/work_inits/23-text-related.elc +++ /dev/null diff --git a/emacs/work_inits/27-gemini.el b/emacs/work_inits/27-gemini.el deleted file mode 100644 index 65a499d..0000000 --- a/emacs/work_inits/27-gemini.el +++ /dev/null @@ -1,61 +0,0 @@ -;; Time-stamp: <2021-09-27 08h48 EDT (hobbies)> - -(use-package elpher - :ensure t - :defer) - -(use-package visual-fill-column - :ensure t - :defer) - -(defvar gemlog-directory (expand-file-name "~/hobbies/l-3.space/")) -(defvar gemlog-file-name "%y%02m%02d") -(defvar gemlog-time-string "%Y-%02m-%02d %02Hh%02M %Z") -(defvar gemlog-time-zone "UTC") - -(defun gemlog-new-entry () - (interactive) - (let* ((title (read-string "Title: ")) - (number 1) - (file (format "%s/log-%s-%d.gmi" - gemlog-directory - (format-time-string gemlog-file-name nil t) - number))) - (while (file-exists-p file) - (setq number (+ 1 number)) - (setq file (format "%s/log-%s-%d.gmi" - gemlog-directory - (format-time-string gemlog-file-name nil t) - number))) - (find-file file) - (setq-local time-stamp-time-zone gemlog-time-zone - time-stamp-format gemlog-time-string) - (insert "Time-stamp: <>") (newline) (newline) - (insert "# " title) (newline) (newline) - (time-stamp))) - -(defvar gemini-footnote-symbols '("⁰" "¹" "²" "³" "⁴" "⁵" "⁶" "⁷" "⁸" "⁹" "ᵃ" "ᵇ" "ᶜ" "ᵈ" "ᵉ" "ᶠ")) - -(defun gemini-insert-footnote () - (interactive) - (let ((symb (car gemini-footnote-symbols)) - (n 0)) - (while (and symb (save-excursion (beginning-of-buffer) (search-forward symb nil t))) - (setq n (1+ n) - symb (nth n gemini-footnote-symbols))) - (if (not symb) (message "Ran out of footnote symbols. Customise `gemini-footnote-symbols'.") - (insert symb) - (end-of-buffer) - (unless (= (point) (point-at-bol)) (newline)) - (insert symb " ")))) - -(use-package gemini-mode - :ensure t - :bind (:map gemini-mode-map - ("C-c C-f" . gemini-insert-footnote)) - :hook (gemini-mode . (lambda () - (setq time-stamp-time-zone gemlog-time-zone - time-stamp-format gemlog-time-string) - (setq-local indent-tabs-mode nil) - (auto-fill-mode -1) - (set-fill-column 80)))) diff --git a/emacs/work_inits/27-gemini.elc b/emacs/work_inits/27-gemini.elc Binary files differdeleted file mode 100644 index 49bc88d..0000000 --- a/emacs/work_inits/27-gemini.elc +++ /dev/null diff --git a/emacs/work_inits/50-file-assocs.el b/emacs/work_inits/50-file-assocs.el deleted file mode 100644 index 0024f1a..0000000 --- a/emacs/work_inits/50-file-assocs.el +++ /dev/null @@ -1,20 +0,0 @@ -;; Time-stamp: <2019-09-11 11:29:16 (tslil@basingstoke)> - -(use-package gnuplot-mode - :ensure t - :mode "\\.gnp$") - -(use-package scad-mode - :ensure t - :mode "\\.scad$") - -(setq auto-mode-alist - (append - '(("\\.emacs$" . emacs-lisp-mode) - ("\\.scm$" . scheme-mode) - ("\\.sch$" . scheme-mode) - ("\\.sc$" . scheme-mode) - ("\\.cl$" . lisp-mode) - ("\\.py$" . python-mode) - ("\\.pg$" . perl-mode) - ) auto-mode-alist)) diff --git a/emacs/work_inits/50-file-assocs.elc b/emacs/work_inits/50-file-assocs.elc Binary files differdeleted file mode 100644 index a69a3a7..0000000 --- a/emacs/work_inits/50-file-assocs.elc +++ /dev/null diff --git a/emacs/work_inits/60-misc-configs.el b/emacs/work_inits/60-misc-configs.el deleted file mode 100644 index 4df81e0..0000000 --- a/emacs/work_inits/60-misc-configs.el +++ /dev/null @@ -1,22 +0,0 @@ -;; Time-stamp: <2021-09-27 08h49 EDT (hobbies)> - -(use-package dired - :defer t - :config - (setq dired-listing-switches "--group-directories-first -alh" - dired-auto-revert-buffer t - dired-dwim-target t - ;; ??? - ;; dired-guess-shell-alist-user '(("\\.djvu\\'" "zathura") - ;; ("\\.pdf\\'" "zathura") - ;; ("\\.ps\\'" "zathura")) - )) - -(use-package browse-url - :defer t - :config - (setq browse-url-generic-program "firefox" - browse-url-browser-function 'browse-url-default-browser)) - -(setq backup-directory-alist `((".*" . ,temporary-file-directory)) - auto-save-file-name-transforms `((".*" ,temporary-file-directory t))) diff --git a/emacs/work_inits/60-misc-configs.elc b/emacs/work_inits/60-misc-configs.elc Binary files differdeleted file mode 100644 index 05db8fe..0000000 --- a/emacs/work_inits/60-misc-configs.elc +++ /dev/null diff --git a/emacs/work_inits/70-global-keybinds.el b/emacs/work_inits/70-global-keybinds.el deleted file mode 100644 index 816998f..0000000 --- a/emacs/work_inits/70-global-keybinds.el +++ /dev/null @@ -1,49 +0,0 @@ -;; Time-stamp: <2020-10-26 17h12 EDT (hobbies)> - -(setq time-stamp-active t - time-stamp-line-limit 3 - time-stamp-format "%Y-%02m-%02d %02Hh%02M %Z (%s)") - -(add-hook 'before-save-hook #'time-stamp) - -(defun insert-timestamp () - (interactive) - (save-excursion - (goto-char (point-min)) - (unless (search-forward "Time-stamp: " - (line-beginning-position (1+ time-stamp-line-limit)) - t) - (goto-char (point-min)) - (newline) - (beginning-of-line 0) - (comment-dwim nil) - (insert (concat "Time-stamp: " "<>")) - (newline)) - (time-stamp))) -(global-set-key (kbd "C-x t") 'insert-timestamp) - -(global-set-key (kbd "C-z") 'nil) - -(use-package eterm-256color - :ensure t - :config - (add-hook 'term-mode-hook #'eterm-256color-mode) - (global-set-key (kbd "C-c c") 'ansi-term)) - -(global-set-key (kbd "C-x e") 'eval-expression) - -(global-set-key (kbd "M-i") 'indent-region) - -(global-set-key (kbd "C-v") 'delete-indentation) - -;; ----------------------------------------------------------------------------- -;; Killing -(global-set-key (kbd "C-c C-k") 'kill-whole-line) -(global-set-key (kbd "M-z") 'zap-up-to-char) - -(defun kill-region-or-backward-kill-word (arg) - (interactive "p") - (if (region-active-p) (kill-region 0 0 t) - (backward-kill-word arg))) - -(global-set-key (kbd "C-w") 'kill-region-or-backward-kill-word) diff --git a/emacs/work_inits/70-global-keybinds.elc b/emacs/work_inits/70-global-keybinds.elc Binary files differdeleted file mode 100644 index b794297..0000000 --- a/emacs/work_inits/70-global-keybinds.elc +++ /dev/null diff --git a/emacs/work_inits/99-last.el b/emacs/work_inits/99-last.el deleted file mode 100644 index 1bcec66..0000000 --- a/emacs/work_inits/99-last.el +++ /dev/null @@ -1,8 +0,0 @@ -;; Time-stamp: <2020-08-12 22:05:48 (user@hobbies)> - -(add-hook 'after-init-hook - (lambda () - (run-with-idle-timer 20 nil (lambda () (setq gc-cons-threshold 80000000))))) - -(setq read-process-output-max (* 1024 1024)) -(setq file-name-handler-alist old-file-name-handler-alist) diff --git a/emacs/work_inits/99-last.elc b/emacs/work_inits/99-last.elc Binary files differdeleted file mode 100644 index fb76db6..0000000 --- a/emacs/work_inits/99-last.elc +++ /dev/null |