From 51534e639582d20298ea94f433577425138b157f Mon Sep 17 00:00:00 2001 From: Jack Jamison Date: Fri, 31 Jul 2026 14:48:48 -0400 Subject: remove redundant junk --- .config/emacs/archive/ide.el | 134 ++++++++++++++++++++++++++++++++++++++++++ .config/emacs/archive/lang.el | 21 +++++++ .config/emacs/early-init.el | 2 +- .config/emacs/ide.el | 134 ------------------------------------------ .config/emacs/init.el | 6 -- .config/emacs/lang.el | 21 ------- .config/emacs/lisp/proj | 2 +- 7 files changed, 157 insertions(+), 163 deletions(-) create mode 100644 .config/emacs/archive/ide.el create mode 100644 .config/emacs/archive/lang.el delete mode 100644 .config/emacs/ide.el delete mode 100644 .config/emacs/lang.el (limited to '.config') diff --git a/.config/emacs/archive/ide.el b/.config/emacs/archive/ide.el new file mode 100644 index 0000000..24a4d7e --- /dev/null +++ b/.config/emacs/archive/ide.el @@ -0,0 +1,134 @@ +;; == eglot +(use-package eglot + :ensure nil + :bind + (("C-c l a" . eglot-code-actions)) + (("C-c l r" . eglot-rename)) + :hook + (eglot-managed-mode . (lambda () (setq-local eldoc-documentation-function 'eldoc-documentation-enthusiast))) + (eglot-mode-hook . flymake-mode) + :config + (add-to-list 'eglot-ignored-server-capabilities ':inlayHintProvider) + (add-to-list 'eglot-ignored-server-capabilities ':documentOnTypeFormattingProvider) + (add-to-list 'eglot-ignored-server-capabilities ':documentHighlightProvider) + (add-to-list 'eglot-server-programs + '((c-ts-mode c++-ts-mode c-mode c++-mode) + . ("clangd" + "-j=8" + "--log=error" + "--malloc-trim" + "--background-index" + "--completion-style=detailed" + "--pch-storage=memory" + "--header-insertion=never" + "--header-insertion-decorators=0"))) + :custom + (eglot-send-changes-idle-time 0.1)) + +(use-package eldoc + :ensure nil + :config + (setq-default eldoc-documentation-strategy 'eldoc-documentation-enthusiast) + (setq-default eldoc-minor-mode-string "")) + +(use-package sideline-flymake + :ensure nil) +(use-package sideline + :ensure nil + :diminish + :hook + ((flymake-mode . sideline-mode)) + :init + (setq sideline-backends-right '(sideline-flymake) + sideline-backends-right-skip-current-line nil + sideline-order-right 'up + sideline-priority 100)) + +;; == dumb jump +(use-package dumb-jump + :ensure nil + :init + (add-hook 'xref-backend-functions #'dumb-jump-xref-activate) + (setq xref-show-definitions-function #'xref-show-definitions-completing-read)) + +;; == text completion +(use-package corfu + :ensure nil + :demand t + :bind + (:map corfu-map + ("C-g" . corfu-quit)) + :config + (add-hook 'corfu-mode-hook + (lambda () + ;; disable orderless + (setq-local completion-styles '(basic) + completion-category-overrides nil + completion-category-defaults nil))) + (global-corfu-mode)) + +(use-package corfu-history + :ensure nil + :demand t + :config + (corfu-history-mode)) + +(use-package cape + :ensure nil + :demand t + :init + (add-hook 'completion-at-point-functions #'cape-dabbrev) + (add-hook 'completion-at-point-functions #'cape-file) + :config + (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)) + ;; (defun my/lsp-capf-busted () + ;; "Return an uncached LSP completion function." + ;; (cape-capf-buster #'lsp-completion-at-point)) + ;; (add-hook 'lsp-completion-mode-hook + ;; (lambda () + ;; (setq-local completion-at-point-functions + ;; (list (my/lsp-capf-busted)))))) + +(use-package completion-preview + :ensure nil + :demand t + :diminish + :config + (global-completion-preview-mode) + (global-set-key (kbd "M-n") 'completion-preview-next-candidate) + (global-set-key (kbd "M-p") 'completion-preview-prev-candidate)) + +;; == snippets +(use-package yasnippet + :ensure nil + :diminish yas-minor-mode yas-global-mode + :config + (yas-reload-all) + :hook + (prog-mode . yas-minor-mode) + :bind + (:map yas-keymap + ("M-n" . yas-next-field) + ("M-p" . yas-prev-field) + ([(tab)] . nil) + ("TAB" . nil) + ("M-I" . nil)) + (:map yas-minor-mode-map + ("C-'". yas-expand) + ([(tab)] . nil) + ("TAB" . nil) + ("M-I" . nil))) + +;; (use-package yasnippet +;; :bind +;; (:map yas-minor-mode-map +;; ("C-'". yas-expand) +;; ([(tab)] . nil) +;; ("TAB" . nil)) +;; :config +;; (yas-reload-all) +;; (yas-global-mode t)) + +(use-package yasnippet-snippets + :ensure nil + :after yasnippet) diff --git a/.config/emacs/archive/lang.el b/.config/emacs/archive/lang.el new file mode 100644 index 0000000..8d3bba4 --- /dev/null +++ b/.config/emacs/archive/lang.el @@ -0,0 +1,21 @@ +;; c mode +(defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (setq c-default-style "k&r" + c-basic-offset 4 + indent-tabs-mode t) + (c-set-offset 'arglist-intro '+) + (c-set-offset 'case-label '+) + (add-to-list 'c-offsets-alist '(arglist-close . c-lineup-close-paren))) +(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + +;; odin mode +(use-package odin-mode + :ensure nil) + +;; jai mode +(use-package jai-mode + :ensure nil) + +;; markdown +(add-hook 'markdown-mode-hook #'auto-fill-mode) diff --git a/.config/emacs/early-init.el b/.config/emacs/early-init.el index 44df179..6e928d9 100644 --- a/.config/emacs/early-init.el +++ b/.config/emacs/early-init.el @@ -85,5 +85,5 @@ (set-selection-coding-system 'utf-8) (prefer-coding-system 'utf-8) -;; native comp warnings +;; silence native comp warnings (who cares) (setq native-comp-async-report-warnings-errors 'silent) diff --git a/.config/emacs/ide.el b/.config/emacs/ide.el deleted file mode 100644 index 24a4d7e..0000000 --- a/.config/emacs/ide.el +++ /dev/null @@ -1,134 +0,0 @@ -;; == eglot -(use-package eglot - :ensure nil - :bind - (("C-c l a" . eglot-code-actions)) - (("C-c l r" . eglot-rename)) - :hook - (eglot-managed-mode . (lambda () (setq-local eldoc-documentation-function 'eldoc-documentation-enthusiast))) - (eglot-mode-hook . flymake-mode) - :config - (add-to-list 'eglot-ignored-server-capabilities ':inlayHintProvider) - (add-to-list 'eglot-ignored-server-capabilities ':documentOnTypeFormattingProvider) - (add-to-list 'eglot-ignored-server-capabilities ':documentHighlightProvider) - (add-to-list 'eglot-server-programs - '((c-ts-mode c++-ts-mode c-mode c++-mode) - . ("clangd" - "-j=8" - "--log=error" - "--malloc-trim" - "--background-index" - "--completion-style=detailed" - "--pch-storage=memory" - "--header-insertion=never" - "--header-insertion-decorators=0"))) - :custom - (eglot-send-changes-idle-time 0.1)) - -(use-package eldoc - :ensure nil - :config - (setq-default eldoc-documentation-strategy 'eldoc-documentation-enthusiast) - (setq-default eldoc-minor-mode-string "")) - -(use-package sideline-flymake - :ensure nil) -(use-package sideline - :ensure nil - :diminish - :hook - ((flymake-mode . sideline-mode)) - :init - (setq sideline-backends-right '(sideline-flymake) - sideline-backends-right-skip-current-line nil - sideline-order-right 'up - sideline-priority 100)) - -;; == dumb jump -(use-package dumb-jump - :ensure nil - :init - (add-hook 'xref-backend-functions #'dumb-jump-xref-activate) - (setq xref-show-definitions-function #'xref-show-definitions-completing-read)) - -;; == text completion -(use-package corfu - :ensure nil - :demand t - :bind - (:map corfu-map - ("C-g" . corfu-quit)) - :config - (add-hook 'corfu-mode-hook - (lambda () - ;; disable orderless - (setq-local completion-styles '(basic) - completion-category-overrides nil - completion-category-defaults nil))) - (global-corfu-mode)) - -(use-package corfu-history - :ensure nil - :demand t - :config - (corfu-history-mode)) - -(use-package cape - :ensure nil - :demand t - :init - (add-hook 'completion-at-point-functions #'cape-dabbrev) - (add-hook 'completion-at-point-functions #'cape-file) - :config - (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)) - ;; (defun my/lsp-capf-busted () - ;; "Return an uncached LSP completion function." - ;; (cape-capf-buster #'lsp-completion-at-point)) - ;; (add-hook 'lsp-completion-mode-hook - ;; (lambda () - ;; (setq-local completion-at-point-functions - ;; (list (my/lsp-capf-busted)))))) - -(use-package completion-preview - :ensure nil - :demand t - :diminish - :config - (global-completion-preview-mode) - (global-set-key (kbd "M-n") 'completion-preview-next-candidate) - (global-set-key (kbd "M-p") 'completion-preview-prev-candidate)) - -;; == snippets -(use-package yasnippet - :ensure nil - :diminish yas-minor-mode yas-global-mode - :config - (yas-reload-all) - :hook - (prog-mode . yas-minor-mode) - :bind - (:map yas-keymap - ("M-n" . yas-next-field) - ("M-p" . yas-prev-field) - ([(tab)] . nil) - ("TAB" . nil) - ("M-I" . nil)) - (:map yas-minor-mode-map - ("C-'". yas-expand) - ([(tab)] . nil) - ("TAB" . nil) - ("M-I" . nil))) - -;; (use-package yasnippet -;; :bind -;; (:map yas-minor-mode-map -;; ("C-'". yas-expand) -;; ([(tab)] . nil) -;; ("TAB" . nil)) -;; :config -;; (yas-reload-all) -;; (yas-global-mode t)) - -(use-package yasnippet-snippets - :ensure nil - :after yasnippet) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 8cf4218..acf840b 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -2,12 +2,6 @@ (setq custom-file (make-temp-file "emacs-custom-")) (setq create-lockfiles nil) -;; backups in one directory -(setq backup-directory-alist - `((".*" . ,temporary-file-directory))) -(setq auto-save-file-name-transforms - `((".*" ,temporary-file-directory t))) - ;; better meta behaviour (setq inhibit-startup-message t vc-follow-symlinks t diff --git a/.config/emacs/lang.el b/.config/emacs/lang.el deleted file mode 100644 index 8d3bba4..0000000 --- a/.config/emacs/lang.el +++ /dev/null @@ -1,21 +0,0 @@ -;; c mode -(defun my-c-mode-common-hook () - ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode - (setq c-default-style "k&r" - c-basic-offset 4 - indent-tabs-mode t) - (c-set-offset 'arglist-intro '+) - (c-set-offset 'case-label '+) - (add-to-list 'c-offsets-alist '(arglist-close . c-lineup-close-paren))) -(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) - -;; odin mode -(use-package odin-mode - :ensure nil) - -;; jai mode -(use-package jai-mode - :ensure nil) - -;; markdown -(add-hook 'markdown-mode-hook #'auto-fill-mode) diff --git a/.config/emacs/lisp/proj b/.config/emacs/lisp/proj index a229987..847a203 160000 --- a/.config/emacs/lisp/proj +++ b/.config/emacs/lisp/proj @@ -1 +1 @@ -Subproject commit a229987953fcddf1033b0a95227e44169c2cc266 +Subproject commit 847a20360c7ef1affc730c6d8d626f923fe5894c -- cgit v1.2.3