From dd5387cd7e2a26d4f2bdd486f74454917e457889 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sat, 27 Jul 2024 11:37:43 +0300 Subject: [PATCH] Clear up functions named with +custom --- README.MD | 2 +- lisp/icejam-custom-init.el | 2 + lisp/icejam-deft.el | 4 +- lisp/icejam-fonts.el | 60 ++++++++-------- lisp/icejam-ivy.el | 18 ++--- lisp/icejam-keys-mode.el | 37 +++++----- lisp/icejam-sys-specific.el | 78 ++++++++++----------- lisp/icejam-themes.el | 2 +- lisp/icejam-transient.el | 42 +++++------ lisp/langs/icejam-lang-clang.el | 4 +- lisp/langs/icejam-lang-clojure.el | 14 ++-- lisp/langs/icejam-lang-dart.el | 4 +- lisp/langs/icejam-lang-dhall.el | 5 +- lisp/langs/icejam-lang-elisp.el | 8 +-- lisp/langs/icejam-lang-elixir.el | 12 ++-- lisp/langs/icejam-lang-gleam.el | 4 +- lisp/langs/icejam-lang-markdown.el | 4 +- lisp/langs/icejam-lang-ocaml.el | 20 +++--- lisp/langs/icejam-lang-other.el | 4 +- lisp/langs/icejam-lang-php.el | 12 ++-- lisp/langs/icejam-lang-python.el | 12 ++-- lisp/themes/icejam-base16-harmonic-light.el | 10 +-- lisp/themes/icejam-base16-zenburn.el | 12 ++-- 23 files changed, 187 insertions(+), 183 deletions(-) diff --git a/README.MD b/README.MD index 6f81df7..099729d 100644 --- a/README.MD +++ b/README.MD @@ -19,6 +19,6 @@ git clone git@github.com:maciej-szlosarczyk/emacs.git ~/.emacs.d And then put the following lines into init.el ```emacs -(require '+custom-init "$HOME/.emacs.d/custom-init.el") +(require 'icejam-custom-init) (provide 'init) ``` diff --git a/lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el index 7c4bc6d..f56b89a 100644 --- a/lisp/icejam-custom-init.el +++ b/lisp/icejam-custom-init.el @@ -35,6 +35,8 @@ (add-to-list 'load-path (concat user-emacs-directory "lisp/themes")) (add-to-list 'load-path (concat user-emacs-directory "lisp/langs")) +(defgroup :icejam nil "My customisation group.") + ;; General configuration files. (require 'icejam-keys-mode) (require 'icejam-base) diff --git a/lisp/icejam-deft.el b/lisp/icejam-deft.el index 583a2ca..0567c9c 100644 --- a/lisp/icejam-deft.el +++ b/lisp/icejam-deft.el @@ -24,13 +24,13 @@ "\\)") deft-auto-save-interval 30.0)) -(transient-define-prefix +custom-pkg-deft/menu () +(transient-define-prefix icejam-deft/menu () "Start Deft." ["" ("d" "Deft" deft) ("q" "quit" keyboard-quit)]) -(define-key +custom-keys-mode-map (kbd "C-c d") '+custom-pkg-deft/menu) +(define-key icejam-keys-mode-map (kbd "C-c d") 'icejam-deft/menu) (provide 'icejam-deft) ;;; icejam-deft.el ends here diff --git a/lisp/icejam-fonts.el b/lisp/icejam-fonts.el index 8e365e5..b856d54 100644 --- a/lisp/icejam-fonts.el +++ b/lisp/icejam-fonts.el @@ -12,20 +12,20 @@ ;; Set font face ;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun +custom-set-lsp-ui-font-hook () - "Reset LSP IO font to specified +custom-font and +custom-font-size." +(defun icejam-set-lsp-ui-font-hook () + "Reset LSP IO font to specified icejam-font and icejam-font-size." (setq lsp-ui-doc-frame-hook nil) (add-hook 'lsp-ui-doc-frame-hook (lambda (frame _w) (set-face-attribute 'default frame :font - (format "%s %d" +custom-font (- +custom-font-size 2)))))) + (format "%s %d" icejam-font (- icejam-font-size 2)))))) (defun set-font (name size) "Set font to NAME and its SIZE to X pixels." (interactive "sNew font: \nnEnter size for %s: ") - (setq +custom-font name) - (setq +custom-font-size size) + (setq icejam-font name) + (setq icejam-font-size size) (set-face-attribute 'default nil :font (format "%s %d" name size)) @@ -47,23 +47,23 @@ 'mode-line-inactive nil :font (format "%s %d" name (- size 1))) ;; Call LSP-UI hook - (+custom-set-lsp-ui-font-hook)) + (icejam-set-lsp-ui-font-hook)) -(defvar +custom-font "Iosevka Term") -;; (defvar +custom-font "Monoid") -;; (defvar +custom-font "Fira Mono") -;; (defvar +custom-font "Fira Code") -;; (defvar +custom-font "Red Hat Mono") -;; (defvar +custom-font "Agave Nerd Font Mono") -;; (defvar +custom-font "Input Mono Condensed") -;; (defvar +custom-font "SF Mono") -;; (defvar +custom-font "Monaco") -;; (defvar +custom-font "JetBrains Mono") -;; (defvar +custom-font "JuliaMono") -;; (defvar +custom-font "Rec Mono Semicasual") -;; (defvar +custom-font "Victor Mono") -;; (defvar +custom-font "IBM Plex Mono") -(defvar +custom-font-size 14) +(defvar icejam-font "Iosevka Term") +;; (defvar icejam-font "Monoid") +;; (defvar icejam-font "Fira Mono") +;; (defvar icejam-font "Fira Code") +;; (defvar icejam-font "Red Hat Mono") +;; (defvar icejam-font "Agave Nerd Font Mono") +;; (defvar icejam-font "Input Mono Condensed") +;; (defvar icejam-font "SF Mono") +;; (defvar icejam-font "Monaco") +;; (defvar icejam-font "JetBrains Mono") +;; (defvar icejam-font "JuliaMono") +;; (defvar icejam-font "Rec Mono Semicasual") +;; (defvar icejam-font "Victor Mono") +;; (defvar icejam-font "IBM Plex Mono") +(defvar icejam-font-size 14) (defun set-font-to-screen () "Automatically set font size to suit the monitor." @@ -73,28 +73,28 @@ (cond ((eq (x-display-list) nil)) ;; built-in screen ((>= 1050 (x-display-pixel-height)) - (set-font +custom-font +custom-font-size)) + (set-font icejam-font icejam-font-size)) ;; 4K screen on a Mac ((>= 1080 (x-display-pixel-height)) - (set-font +custom-font +custom-font-size)) + (set-font icejam-font icejam-font-size)) ;; Other screens ((>= 1120 (x-display-pixel-height)) - (set-font +custom-font +custom-font-size)) + (set-font icejam-font icejam-font-size)) ((>= 1440 (x-display-pixel-height)) - (set-font +custom-font (+ +custom-font-size 3))) + (set-font icejam-font (+ icejam-font-size 3))) ((>= 1920 (x-display-pixel-height)) - (set-font +custom-font +custom-font-size)) + (set-font icejam-font icejam-font-size)) ;; 4K screen on Windows or Linux ((>= 2160 (x-display-pixel-height)) - (set-font +custom-font (- +custom-font-size 3))) + (set-font icejam-font (- icejam-font-size 3))) ;; Default - (t (set-font +custom-font (- +custom-font-size 3))))) + (t (set-font icejam-font (- icejam-font-size 3))))) ;; Do it automatically on startup (set-font-to-screen) @@ -102,12 +102,12 @@ (defun set-font-size (size) "Set font to a specified SIZE." (interactive "nEnter size for font: ") - (set-font +custom-font size)) + (set-font icejam-font size)) (defun set-font-size-for-this-frame (new-size) "Set font NEW-SIZE for this frame only." (interactive "nEnter new size for font in this frame: ") - (set-frame-font (format "%s %d" +custom-font new-size))) + (set-frame-font (format "%s %d" icejam-font new-size))) ;; Remove ugly black line (set-face-attribute 'vertical-border nil :foreground diff --git a/lisp/icejam-ivy.el b/lisp/icejam-ivy.el index 0841116..6e642f9 100644 --- a/lisp/icejam-ivy.el +++ b/lisp/icejam-ivy.el @@ -24,17 +24,17 @@ ivy-display-style 'fancy ;; Formatting style )) -(define-key +custom-keys-mode-map (kbd "C-c a") 'counsel-rg) -(define-key +custom-keys-mode-map (kbd "C-c t") 'counsel-find-file) -(define-key +custom-keys-mode-map (kbd "C-c C-s") 'swiper) ;; Find things by regexp -(define-key +custom-keys-mode-map (kbd "M-x") 'counsel-M-x) ;; M-x on steroids +(define-key icejam-keys-mode-map (kbd "C-c a") 'counsel-rg) +(define-key icejam-keys-mode-map (kbd "C-c t") 'counsel-find-file) +(define-key icejam-keys-mode-map (kbd "C-c C-s") 'swiper) ;; Find things by regexp +(define-key icejam-keys-mode-map (kbd "M-x") 'counsel-M-x) ;; M-x on steroids ;; List all key bindings there are. -(define-key +custom-keys-mode-map (kbd " f") 'counsel-describe-function) -(define-key +custom-keys-mode-map (kbd " v") 'counsel-describe-variable) -(define-key +custom-keys-mode-map (kbd " l") 'counsel-find-library) -(define-key +custom-keys-mode-map (kbd " i") 'counsel-info-lookup-symbol) -(define-key +custom-keys-mode-map (kbd " u") 'counsel-unicode-char) +(define-key icejam-keys-mode-map (kbd " f") 'counsel-describe-function) +(define-key icejam-keys-mode-map (kbd " v") 'counsel-describe-variable) +(define-key icejam-keys-mode-map (kbd " l") 'counsel-find-library) +(define-key icejam-keys-mode-map (kbd " i") 'counsel-info-lookup-symbol) +(define-key icejam-keys-mode-map (kbd " u") 'counsel-unicode-char) (provide 'icejam-ivy) ;;; icejam-ivy.el ends here diff --git a/lisp/icejam-keys-mode.el b/lisp/icejam-keys-mode.el index fac9a33..062e31d 100644 --- a/lisp/icejam-keys-mode.el +++ b/lisp/icejam-keys-mode.el @@ -10,46 +10,47 @@ ;;; Code: -(define-minor-mode +custom-keys-mode +(define-minor-mode icejam-keys-mode "Minor mode for all of my personal key bindings." :global t + :group 'icejam :keymap (make-sparse-keymap)) ;; Globally enable my minor mode -(+custom-keys-mode) +(icejam-keys-mode) ;;; Helpful key bindings -(define-key +custom-keys-mode-map (kbd "C-c \\") 'split-window-right) ;; Split window to the right -(define-key +custom-keys-mode-map (kbd "C-c /") 'split-window-below) ;; Split window to the bottom +(define-key icejam-keys-mode-map (kbd "C-c \\") 'split-window-right) ;; Split window to the right +(define-key icejam-keys-mode-map (kbd "C-c /") 'split-window-below) ;; Split window to the bottom ;; Move between windows key bindings -(define-key +custom-keys-mode-map (kbd "C-c ") 'windmove-left) -(define-key +custom-keys-mode-map (kbd "C-c ") 'windmove-right) -(define-key +custom-keys-mode-map (kbd "C-c ") 'windmove-up) -(define-key +custom-keys-mode-map (kbd "C-c ") 'windmove-down) +(define-key icejam-keys-mode-map (kbd "C-c ") 'windmove-left) +(define-key icejam-keys-mode-map (kbd "C-c ") 'windmove-right) +(define-key icejam-keys-mode-map (kbd "C-c ") 'windmove-up) +(define-key icejam-keys-mode-map (kbd "C-c ") 'windmove-down) ;; The same, but without using arrow keys -(define-key +custom-keys-mode-map (kbd "C-c [") 'windmove-left) -(define-key +custom-keys-mode-map (kbd "C-c ]") 'windmove-right) -(define-key +custom-keys-mode-map (kbd "C-c {") 'windmove-up) -(define-key +custom-keys-mode-map (kbd "C-c }") 'windmove-down) +(define-key icejam-keys-mode-map (kbd "C-c [") 'windmove-left) +(define-key icejam-keys-mode-map (kbd "C-c ]") 'windmove-right) +(define-key icejam-keys-mode-map (kbd "C-c {") 'windmove-up) +(define-key icejam-keys-mode-map (kbd "C-c }") 'windmove-down) ;; Kill current buffer and window -(define-key +custom-keys-mode-map (kbd "C-c q") 'kill-buffer-and-window) +(define-key icejam-keys-mode-map (kbd "C-c q") 'kill-buffer-and-window) ;; List buffers -(define-key +custom-keys-mode-map (kbd "C-c b") 'ibuffer) +(define-key icejam-keys-mode-map (kbd "C-c b") 'ibuffer) ;; Revert without asking -(defun revert-buffer-no-confirm () +(defun icejam-revert-buffer-no-confirm () "Revert buffer without confirmation." (interactive) (revert-buffer t t)) -(define-key +custom-keys-mode-map (kbd "C-c r") 'revert-buffer-no-confirm) +(define-key icejam-keys-mode-map (kbd "C-c r") 'icejam-revert-buffer-no-confirm) ;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;; -(define-key +custom-keys-mode-map [home] 'beginning-of-line) -(define-key +custom-keys-mode-map [end] 'end-of-line) +(define-key icejam-keys-mode-map [home] 'beginning-of-line) +(define-key icejam-keys-mode-map [end] 'end-of-line) (provide 'icejam-keys-mode) ;;; icejam-keys-mode.el ends here diff --git a/lisp/icejam-sys-specific.el b/lisp/icejam-sys-specific.el index 292cfd8..4ec6050 100644 --- a/lisp/icejam-sys-specific.el +++ b/lisp/icejam-sys-specific.el @@ -9,7 +9,7 @@ (require 'icejam-keys-mode) -(defun +custom-function-delete-window () +(defun icejam-function-delete-window () "Kill a window." (interactive) (delete-window)) @@ -31,27 +31,27 @@ (setq mac-command-modifier 'meta)))) ;;;;;;;;; Mac binding (fix) ;;;;;;;;;;;;;;;;;; - (define-key +custom-keys-mode-map (kbd "H-") 'end-of-line) - (define-key +custom-keys-mode-map (kbd "H-") 'beginning-of-line) - (define-key +custom-keys-mode-map (kbd "H-") 'scroll-down) ; WTF is this reverse, I dunno - (define-key +custom-keys-mode-map (kbd "H-") 'scroll-up) + (define-key icejam-keys-mode-map (kbd "H-") 'end-of-line) + (define-key icejam-keys-mode-map (kbd "H-") 'beginning-of-line) + (define-key icejam-keys-mode-map (kbd "H-") 'scroll-down) ; WTF is this reverse, I dunno + (define-key icejam-keys-mode-map (kbd "H-") 'scroll-up) - (define-key +custom-keys-mode-map [(hyper a)] 'mark-whole-buffer) - (define-key +custom-keys-mode-map [(hyper v)] 'yank) - (define-key +custom-keys-mode-map [(hyper x)] 'kill-region) - (define-key +custom-keys-mode-map [(hyper c)] 'kill-ring-save) - (define-key +custom-keys-mode-map [(hyper s)] 'save-buffer) - (define-key +custom-keys-mode-map [(hyper l)] 'goto-line) - (define-key +custom-keys-mode-map [(hyper b)] 'treemacs) - (define-key +custom-keys-mode-map [(hyper w)] '+custom-function-delete-window) - (define-key +custom-keys-mode-map [(hyper z)] 'undo) - (define-key +custom-keys-mode-map [(hyper q)] 'kill-emacs) + (define-key icejam-keys-mode-map [(hyper a)] 'mark-whole-buffer) + (define-key icejam-keys-mode-map [(hyper v)] 'yank) + (define-key icejam-keys-mode-map [(hyper x)] 'kill-region) + (define-key icejam-keys-mode-map [(hyper c)] 'kill-ring-save) + (define-key icejam-keys-mode-map [(hyper s)] 'save-buffer) + (define-key icejam-keys-mode-map [(hyper l)] 'goto-line) + (define-key icejam-keys-mode-map [(hyper b)] 'treemacs) + (define-key icejam-keys-mode-map [(hyper w)] 'icejam-function-delete-window) + (define-key icejam-keys-mode-map [(hyper z)] 'undo) + (define-key icejam-keys-mode-map [(hyper q)] 'kill-emacs) ;; Disable meta on right alt (useful for Polish characters) ;; (setq mac-right-option-modifier nil) )) -(defun +custom-switch-right-left-alt () +(defun icejam-switch-right-left-alt () "Set keyboard to das keyboard." (interactive) (if (eq mac-right-option-modifier nil) @@ -66,38 +66,38 @@ (if IS-GNU (progn ;;;; Save and undo - (define-key +custom-keys-mode-map (kbd "s-s") 'save-buffer) - (define-key +custom-keys-mode-map (kbd "s-z") 'undo) - (define-key +custom-keys-mode-map (kbd "s-a") 'mark-whole-buffer) + (define-key icejam-keys-mode-map (kbd "s-s") 'save-buffer) + (define-key icejam-keys-mode-map (kbd "s-z") 'undo) + (define-key icejam-keys-mode-map (kbd "s-a") 'mark-whole-buffer) ;;;;;;;; Copy and paste bindings ;;;;;;;;;;;;;;;;;; - (define-key +custom-keys-mode-map (kbd "s-x") 'kill-region) - (define-key +custom-keys-mode-map (kbd "s-v") 'yank) - (define-key +custom-keys-mode-map (kbd "s-c") 'kill-ring-save) + (define-key icejam-keys-mode-map (kbd "s-x") 'kill-region) + (define-key icejam-keys-mode-map (kbd "s-v") 'yank) + (define-key icejam-keys-mode-map (kbd "s-c") 'kill-ring-save) ;;;;;;;;; Linux Ergo bindings (fix) ;;;;;;;;;;;;;;;;;; - (define-key +custom-keys-mode-map (kbd "C-") 'end-of-line) - (define-key +custom-keys-mode-map (kbd "C-") 'beginning-of-line) - (define-key +custom-keys-mode-map (kbd "C-") 'scroll-down) ; WTF is this reverse, I dunno - (define-key +custom-keys-mode-map (kbd "C-") 'scroll-up))) + (define-key icejam-keys-mode-map (kbd "C-") 'end-of-line) + (define-key icejam-keys-mode-map (kbd "C-") 'beginning-of-line) + (define-key icejam-keys-mode-map (kbd "C-") 'scroll-down) ; WTF is this reverse, I dunno + (define-key icejam-keys-mode-map (kbd "C-") 'scroll-up))) ;;;;;;;;; BSD-specific config ;;;;;;;;;;;;;;;;;;;;; (if IS-BSD (progn - (define-key +custom-keys-mode-map (kbd "A-") 'end-of-line) - (define-key +custom-keys-mode-map (kbd "A-") 'beginning-of-line) - (define-key +custom-keys-mode-map (kbd "A-") 'scroll-down) ; WTF is this reverse, I dunno - (define-key +custom-keys-mode-map (kbd "A-") 'scroll-up) + (define-key icejam-keys-mode-map (kbd "A-") 'end-of-line) + (define-key icejam-keys-mode-map (kbd "A-") 'beginning-of-line) + (define-key icejam-keys-mode-map (kbd "A-") 'scroll-down) ; WTF is this reverse, I dunno + (define-key icejam-keys-mode-map (kbd "A-") 'scroll-up) - (define-key +custom-keys-mode-map (kbd "A-a") 'mark-whole-buffer) - (define-key +custom-keys-mode-map (kbd "A-v") 'yank) - (define-key +custom-keys-mode-map (kbd "A-x") 'kill-region) - (define-key +custom-keys-mode-map (kbd "A-c") 'kill-ring-save) - (define-key +custom-keys-mode-map (kbd "A-s") 'save-buffer) - (define-key +custom-keys-mode-map (kbd "A-l") 'goto-line) - (define-key +custom-keys-mode-map (kbd "A-w" '+delete-window) - (define-key +custom-keys-mode-map (kbd "A-z") 'undo) - (define-key +custom-keys-mode-map (kbd "A-q") 'kill-emacs)))) + (define-key icejam-keys-mode-map (kbd "A-a") 'mark-whole-buffer) + (define-key icejam-keys-mode-map (kbd "A-v") 'yank) + (define-key icejam-keys-mode-map (kbd "A-x") 'kill-region) + (define-key icejam-keys-mode-map (kbd "A-c") 'kill-ring-save) + (define-key icejam-keys-mode-map (kbd "A-s") 'save-buffer) + (define-key icejam-keys-mode-map (kbd "A-l") 'goto-line) + (define-key icejam-keys-mode-map (kbd "A-w" '+delete-window) + (define-key icejam-keys-mode-map (kbd "A-z") 'undo) + (define-key icejam-keys-mode-map (kbd "A-q") 'kill-emacs)))) (provide 'icejam-sys-specific) ;;; icejam-sys-specific.el ends here diff --git a/lisp/icejam-themes.el b/lisp/icejam-themes.el index 83171eb..c7b6c7f 100644 --- a/lisp/icejam-themes.el +++ b/lisp/icejam-themes.el @@ -47,7 +47,7 @@ (require 'icejam-base16-harmonic-light) (spaceline-emacs-theme) -(enable-theme 'base16-zenburn-modified) +(enable-theme 'icejam-base16-zenburn) (provide 'icejam-themes) ;;; icejam-themes.el ends here diff --git a/lisp/icejam-transient.el b/lisp/icejam-transient.el index eacac9e..96ce5eb 100644 --- a/lisp/icejam-transient.el +++ b/lisp/icejam-transient.el @@ -7,12 +7,12 @@ (use-package transient :straight t) -(defun mark-and-indent-whole-buffer () +(defun icejam-mark-and-indent-whole-buffer () "Mark and indent whole buffer." (interactive) (indent-region (point-min) (point-max))) -(transient-define-prefix +custom-pkg-transient/project-menu () +(transient-define-prefix icejam-transient/project-menu () "Project Commands." ["" ["Projectile" @@ -37,8 +37,8 @@ ("d" "deft" deft) ("T" "Speed Type" speed-type-text)]]) -(transient-define-prefix +custom-pkg-transient/code-menu () - "Code Commands" +(transient-define-prefix icejam-transient/code-menu () + "Code Commands." ["" ["Manipulate" ("c" "Toggle Comment" comment-line) @@ -54,8 +54,8 @@ ("u" "Vundo" vundo) ("d" "Dash" dash-at-point)]]) -(transient-define-prefix +custom-pkg-transient/window-menu () - "Windows Commands" +(transient-define-prefix icejam-transient/window-menu () + "Windows Commands." ["" ["Move" ("" " Left" windmove-left) @@ -71,24 +71,24 @@ "" ("k" "Kill Buffer" kill-buffer-and-window)]]) -(transient-define-prefix +custom-pkg-transient/language-context-menu () - "Language (Buffer) Commands" +(transient-define-prefix icejam-transient/language-context-menu () + "Language (Buffer) Commands." ["" ["Buffer" - ("r" "Reload" revert-buffer-no-confirm) + ("r" "Reload" icejam-revert-buffer-no-confirm) ("f" "Format" lsp-format-buffer) - ("i" "Indent" mark-and-indent-whole-buffer)] + ("i" "Indent" icejam-mark-and-indent-whole-buffer)] ["Other" ("m" "iMenu" lsp-ui-imenu) ("e" "Show Errors" flycheck-list-errors)]]) -(transient-define-prefix +custom-pkg-transient/history-menu () - "Buffer History Commands" +(transient-define-prefix icejam-transient/history-menu () + "Buffer History Commands." ["History" ("[" "Previous" previous-buffer) ("]" "Next" previous-buffer)]) -(transient-define-prefix +custom-pkg-transient/move-menu () +(transient-define-prefix icejam-transient/move-menu () "Move Commands." ["" ["Move this buffer" @@ -101,7 +101,7 @@ ("l" "Character" avy-goto-line) ("c" "Line" avy-goto-char-2)]]) -(transient-define-prefix +custom-pkg-transient/font-menu () +(transient-define-prefix icejam-transient/font-menu () "Font Commands." ["" ["Everywhere" @@ -112,13 +112,13 @@ ("d" "Smaller" (lambda () (interactive) (text-scale-decrease 1))) ("r" "Reset" (lambda () (interactive) (text-scale-adjust 0)))]]) -(define-key global-map (kbd "C-c p") '+custom-pkg-transient/project-menu) -(define-key global-map (kbd "C-c c") '+custom-pkg-transient/code-menu) -(define-key global-map (kbd "C-c w") '+custom-pkg-transient/window-menu) -(define-key global-map (kbd "C-c s") '+custom-pkg-transient/history-menu) -(define-key global-map (kbd "C-c f") '+custom-pkg-transient/font-menu) -(define-key global-map (kbd "C-c m") '+custom-pkg-transient/move-menu) -(define-key global-map (kbd "C-c l") '+custom-pkg-transient/language-context-menu) +(define-key global-map (kbd "C-c p") 'icejam-transient/project-menu) +(define-key global-map (kbd "C-c c") 'icejam-transient/code-menu) +(define-key global-map (kbd "C-c w") 'icejam-transient/window-menu) +(define-key global-map (kbd "C-c s") 'icejam-transient/history-menu) +(define-key global-map (kbd "C-c f") 'icejam-transient/font-menu) +(define-key global-map (kbd "C-c m") 'icejam-transient/move-menu) +(define-key global-map (kbd "C-c l") 'icejam-transient/language-context-menu) (provide 'icejam-transient) ;;; icejam-transient.el ends here diff --git a/lisp/langs/icejam-lang-clang.el b/lisp/langs/icejam-lang-clang.el index 781b942..f408ab6 100644 --- a/lisp/langs/icejam-lang-clang.el +++ b/lisp/langs/icejam-lang-clang.el @@ -4,7 +4,7 @@ (require 'icejam-prog-mode) -(defun +custom-lang-clang/activate-clang-mode () +(defun icejam-lang-clang/activate-clang-mode () "Goodies for editing c files." ;; Set column width to 100 @@ -22,7 +22,7 @@ (add-to-list (make-local-variable 'company-backends) '(company-etags company-yasnippet))) -(add-hook 'c-mode-hook '+custom-lang-clang/activate-clang-mode) +(add-hook 'c-mode-hook 'icejam-lang-clang/activate-clang-mode) (provide 'icejam-lang-clang) ;;; icejam-lang-clang.el ends here diff --git a/lisp/langs/icejam-lang-clojure.el b/lisp/langs/icejam-lang-clojure.el index 52418de..a600b2f 100644 --- a/lisp/langs/icejam-lang-clojure.el +++ b/lisp/langs/icejam-lang-clojure.el @@ -20,21 +20,21 @@ :straight t) ;; Transient -(transient-define-prefix +custom-lang-clojure/cider-context-menu () +(transient-define-prefix icejam-lang-clojure/cider-context-menu () "Clojure Buffer Commands." ["" ["Cider" ("j" "Jack in" cider-jack-in) ("t" "Test" cider-test-run-loaded-tests)] ["Buffer" - ("r" "Reload" revert-buffer-no-confirm) + ("r" "Reload" icejam-revert-buffer-no-confirm) ("f" "Format" cider-format-buffer) ("l" "Load" cider-load-buffer) ("e" "Show Errors" flycheck-list-errors)]] ["" ("q" "Quit" keyboard-quit)]) -(defun +custom-lang-clojure/activate-clojure-mode () +(defun icejam-lang-clojure/activate-clojure-mode () "Goodies for clojure files." (set-indent 2) ;; Default indentation of 2 characters (column-enforce-n 80) @@ -43,20 +43,20 @@ (setq-local indent-tabs-mode nil) (define-key - clojure-mode-map (kbd "C-c l") '+custom-lang-clojure/cider-context-menu) + clojure-mode-map (kbd "C-c l") 'icejam-lang-clojure/cider-context-menu) ;; Do not enable paredit for clojure ;; (paredit-mode 1) ;; Do not show separate error window when in REPL (setq cider-show-error-buffer 'except-in-repl)) -(add-hook 'clojure-mode-hook '+custom-lang-clojure/activate-clojure-mode) +(add-hook 'clojure-mode-hook 'icejam-lang-clojure/activate-clojure-mode) -(defun +custom-lang-clojure/clj-repl-config () +(defun icejam-lang-clojure/clj-repl-config () "Do not show stacktrace when in REPL." (setq-local cider-show-error-buffer 'except-in-repl)) -(add-hook 'cider-repl-mode-hook '+custom-lang-clojure/clj-repl-config) +(add-hook 'cider-repl-mode-hook 'icejam-lang-clojure/clj-repl-config) (add-hook 'cider-mode-hook #'cider-company-enable-fuzzy-completion) (provide 'icejam-lang-clojure) diff --git a/lisp/langs/icejam-lang-dart.el b/lisp/langs/icejam-lang-dart.el index e4b3f46..b884350 100644 --- a/lisp/langs/icejam-lang-dart.el +++ b/lisp/langs/icejam-lang-dart.el @@ -7,11 +7,11 @@ (use-package dart-mode :straight t :defer t) (use-package lsp-dart :defer t :straight t :requires (dart-mode lsp)) -(defun +custom-lang-dart/activate-dart-mode () +(defun icejam-lang-dart/activate-dart-mode () "Reconfigure dart mode for your own purposes." (lsp)) -(add-hook 'dart-mode-hook '+custom-lang-dart/activate-dart-mode) +(add-hook 'dart-mode-hook 'icejam-lang-dart/activate-dart-mode) (provide 'icejam-lang-dart) ;;; icejam-lang-dart.el ends here diff --git a/lisp/langs/icejam-lang-dhall.el b/lisp/langs/icejam-lang-dhall.el index 3f19c22..c96f820 100644 --- a/lisp/langs/icejam-lang-dhall.el +++ b/lisp/langs/icejam-lang-dhall.el @@ -3,14 +3,15 @@ ;;; Code: (require 'icejam-prog-mode) +(require 'icejam-lsp) (use-package dhall-mode :straight t :defer t :requires (lsp)) -(defun +custom-lang-dhall/activate-dhall-mode () +(defun icejam-lang-dhall/activate-dhall-mode () "Reconfigure dhall mode for your own purposes." (lsp)) -(add-hook 'dhall-mode-hook '+custom-lang-dhall/activate-dhall-mode) +(add-hook 'dhall-mode-hook 'icejam-lang-dhall/activate-dhall-mode) (add-hook 'dhall-mode-hook 'display-line-numbers-mode) (provide 'icejam-lang-dhall) diff --git a/lisp/langs/icejam-lang-elisp.el b/lisp/langs/icejam-lang-elisp.el index b17fd55..a82aa7f 100644 --- a/lisp/langs/icejam-lang-elisp.el +++ b/lisp/langs/icejam-lang-elisp.el @@ -4,12 +4,12 @@ (require 'icejam-prog-mode) -(transient-define-prefix +custom-lang-elisp/transient-context-menu () +(transient-define-prefix icejam-lang-elisp/transient-context-menu () "Elisp Buffer Commands." ["" ["Buffer" - ("r" "Reload" revert-buffer-no-confirm) - ("i" "Indent" mark-and-indent-whole-buffer) + ("r" "Reload" icejam-revert-buffer-no-confirm) + ("i" "Indent" icejam-mark-and-indent-whole-buffer) ("e" "Show Errors" flycheck-list-errors)]] ["" ("q" "Quit" keyboard-quit)]) @@ -21,7 +21,7 @@ (setq-default indent-tabs-mode nil) (define-key emacs-lisp-mode-map - (kbd "C-c l") '+custom-lang-elisp/transient-context-menu) + (kbd "C-c l") 'icejam-lang-elisp/transient-context-menu) ;; Company list override (add-to-list (make-local-variable 'company-backends) diff --git a/lisp/langs/icejam-lang-elixir.el b/lisp/langs/icejam-lang-elixir.el index a163a62..24d4759 100644 --- a/lisp/langs/icejam-lang-elixir.el +++ b/lisp/langs/icejam-lang-elixir.el @@ -13,20 +13,20 @@ (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode)) (add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-ts-mode)) -(transient-define-prefix +custom-lang-elixir/transient-context-menu () +(transient-define-prefix icejam-lang-elixir/transient-context-menu () "Elixir Buffer Commands." ["" ["LSP" ("m" "iMenu" lsp-ui-imenu)] ["Buffer" - ("r" "Reload" revert-buffer-no-confirm) + ("r" "Reload" icejam-revert-buffer-no-confirm) ("f" "Format" elixir-format) - ("i" "Indent" mark-and-indent-whole-buffer) + ("i" "Indent" icejam-mark-and-indent-whole-buffer) ("e" "Show Errors" flycheck-list-errors)]] ["" ("q" "Quit" keyboard-quit)]) -(defun +custom-lang-elixir/activate-elixir-ts-mode () +(defun icejam-lang-elixir/activate-elixir-ts-mode () "All things Elixir." (set-indent 2) (column-enforce-n 98) @@ -38,13 +38,13 @@ ;; If needed, switch the one below to false to disable documentation pop-ups ;; (setq-local lsp-ui-doc-enable t) - (define-key elixir-ts-mode-map (kbd "C-c l") '+custom-lang-elixir/transient-context-menu) + (define-key elixir-ts-mode-map (kbd "C-c l") 'icejam-lang-elixir/transient-context-menu) ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet))) -(add-hook 'elixir-ts-mode-hook '+custom-lang-elixir/activate-elixir-ts-mode) +(add-hook 'elixir-ts-mode-hook 'icejam-lang-elixir/activate-elixir-ts-mode) (provide 'icejam-lang-elixir) ;;; icejam-lang-elixir.el ends here diff --git a/lisp/langs/icejam-lang-gleam.el b/lisp/langs/icejam-lang-gleam.el index 4f177b7..3e793be 100644 --- a/lisp/langs/icejam-lang-gleam.el +++ b/lisp/langs/icejam-lang-gleam.el @@ -19,13 +19,13 @@ :repo "gleam-lang/gleam-mode" :files ("gleam-mode.el" "tree-sitter-gleam"))) -(defun +custom-lang-gleam/activate-gleam-mode () +(defun icejam-lang-gleam/activate-gleam-mode () "All things Gleam." (set-indent 2) (column-enforce-n 100) (lsp)) -(add-hook 'gleam-mode-hook '+custom-lang-gleam/activate-gleam-mode) +(add-hook 'gleam-mode-hook 'icejam-lang-gleam/activate-gleam-mode) (provide 'icejam-lang-gleam) ;;; icejam-lang-gleam.el ends here diff --git a/lisp/langs/icejam-lang-markdown.el b/lisp/langs/icejam-lang-markdown.el index c4edfd2..0355677 100644 --- a/lisp/langs/icejam-lang-markdown.el +++ b/lisp/langs/icejam-lang-markdown.el @@ -9,7 +9,7 @@ :defer t :init (setq-default markdown-command "pandoc")) -(defun +custom-lang-markdown/activate-markdown-mode () +(defun icejam-lang-markdown/activate-markdown-mode () "Reconfigure markdown mode for your own purposes." (set-indent 2) (column-enforce-n 10000) @@ -21,7 +21,7 @@ (define-key markdown-mode-map (kbd "C-c ") nil) (define-key markdown-mode-map (kbd "C-c C-v") 'markdown-preview)) -(add-hook 'markdown-mode-hook '+custom-lang-markdown/activate-markdown-mode) +(add-hook 'markdown-mode-hook 'icejam-lang-markdown/activate-markdown-mode) (add-hook 'markdown-mode-hook 'display-line-numbers-mode) (provide 'icejam-lang-markdown) diff --git a/lisp/langs/icejam-lang-ocaml.el b/lisp/langs/icejam-lang-ocaml.el index 9f32e66..5ce6b20 100644 --- a/lisp/langs/icejam-lang-ocaml.el +++ b/lisp/langs/icejam-lang-ocaml.el @@ -23,12 +23,12 @@ :defer t :straight t) -(transient-define-prefix +custom-lang-ocaml/context-menu () +(transient-define-prefix icejam-lang-ocaml/context-menu () "Ocaml Actions." ["OCaml actions" ["" - ("r" "Reload" revert-buffer-no-confirm) - ("i" "Indent" mark-and-indent-whole-buffer)] + ("r" "Reload" icejam-revert-buffer-no-confirm) + ("i" "Indent" icejam-mark-and-indent-whole-buffer)] ["" ("f" "Format" ocamlformat) ("e" "Opam Env" tuareg-opam-update-env)]] @@ -48,7 +48,7 @@ ;; Use opam switch to lookup ocamlmerlin binary (setq merlin-command 'opam))) - (define-key tuareg-mode-map (kbd "C-c l") '+custom-lang-ocaml/context-menu)) + (define-key tuareg-mode-map (kbd "C-c l") 'icejam-lang-ocaml/context-menu)) ;; OCaml setup (add-hook 'tuareg-mode-hook 'merlin-mode) @@ -66,12 +66,12 @@ ;; Use tuareg-opam with lock files (add-to-list 'auto-mode-alist '("\\.opam.locked\\'" . tuareg-opam-mode)) -(transient-define-prefix +custom-lang-ocaml/reasonml-context-menu () +(transient-define-prefix icejam-lang-ocaml/reasonml-context-menu () "ReasonML Actions" ["ReasonML actions" ["" - ("r" "Reload" revert-buffer-no-confirm) - ("i" "Indent" mark-and-indent-whole-buffer)] + ("r" "Reload" icejam-revert-buffer-no-confirm) + ("i" "Indent" icejam-mark-and-indent-whole-buffer)] ["" ("f" "Format" refmt) ("e" "Opam Env" tuareg-opam-update-env)]] @@ -79,16 +79,16 @@ ("q" "Quit" keyboard-quit)]) -(defun custom-lang-ocaml/activate-reason-mode () +(defun icejam-lang-ocaml/activate-reason-mode () "Generate reason config." (define-key - reason-mode-map (kbd "C-c l") '+custom-lang-ocaml/reasonml-context-menu)) + reason-mode-map (kbd "C-c l") 'icejam-lang-ocaml/reasonml-context-menu)) ;; Reason setup (add-hook 'reason-mode-hook (lambda () (add-hook 'before-save-hook #'refmt-before-save))) -(add-hook 'reason-mode-hook 'custom-lang-ocaml/activate-reason-mode) +(add-hook 'reason-mode-hook 'icejam-lang-ocaml/activate-reason-mode) (add-hook 'reason-mode-hook 'merlin-mode) (provide 'icejam-lang-ocaml) diff --git a/lisp/langs/icejam-lang-other.el b/lisp/langs/icejam-lang-other.el index 81b3f34..588b47f 100644 --- a/lisp/langs/icejam-lang-other.el +++ b/lisp/langs/icejam-lang-other.el @@ -24,11 +24,11 @@ ;; Yaml (use-package yaml-mode :straight t :defer t :requires (lsp)) -(defun +custom-lang-yaml/activate-yaml-mode () +(defun icejam-lang-yaml/activate-yaml-mode () "Activate yaml-mode." (lsp)) -(add-hook 'yaml-mode-hook '+custom-lang-yaml/activate-yaml-mode) +(add-hook 'yaml-mode-hook 'icejam-lang-yaml/activate-yaml-mode) ;; Other text files (use-package json-mode :straight t :defer t) diff --git a/lisp/langs/icejam-lang-php.el b/lisp/langs/icejam-lang-php.el index e1a38fc..e9a9e06 100644 --- a/lisp/langs/icejam-lang-php.el +++ b/lisp/langs/icejam-lang-php.el @@ -18,32 +18,32 @@ :requires (lsp-mode lsp-ui) :straight t) -(transient-define-prefix +custom-lang-php/context-menu () +(transient-define-prefix icejam-lang-php/context-menu () "PHP Buffer Commands." ["" ["LSP" ("m" "iMenu" lsp-ui-imenu)] ["Buffer" - ("r" "Reload" revert-buffer-no-confirm) + ("r" "Reload" icejam-revert-buffer-no-confirm) ("f" "Format" lsp-format-buffer) - ("i" "Indent" mark-and-indent-whole-buffer) + ("i" "Indent" icejam-mark-and-indent-whole-buffer) ("e" "Show Errors" flycheck-list-errors)]] ["" ("q" "Quit" keyboard-quit)]) -(defun +custom-lang-php/activate-php-mode () +(defun icejam-lang-php/activate-php-mode () "All things php." (set-indent 4) (column-enforce-n 80) - (define-key php-mode-map (kbd "C-c l") '+custom-lang-php/context-menu) + (define-key php-mode-map (kbd "C-c l") 'icejam-lang-php/context-menu) ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet))) -(add-hook 'php-mode-hook '+custom-lang-php/activate-php-mode) +(add-hook 'php-mode-hook 'icejam-lang-php/activate-php-mode) (provide 'icejam-lang-php) ;;; icejam-lang-php.el ends here diff --git a/lisp/langs/icejam-lang-python.el b/lisp/langs/icejam-lang-python.el index 5546c3e..35aab4d 100644 --- a/lisp/langs/icejam-lang-python.el +++ b/lisp/langs/icejam-lang-python.el @@ -5,32 +5,32 @@ (require 'icejam-prog-mode) (require 'icejam-transient) -(transient-define-prefix +custom-lang-python/transient-context-menu () +(transient-define-prefix icejam-lang-python/transient-context-menu () "Python Buffer Commands." ["" ["LSP" ("m" "iMenu" lsp-ui-imenu)] ["Buffer" - ("r" "Reload" revert-buffer-no-confirm) + ("r" "Reload" icejam-revert-buffer-no-confirm) ("f" "Format" lsp-format-buffer) - ("i" "Indent" mark-and-indent-whole-buffer) + ("i" "Indent" icejam-mark-and-indent-whole-buffer) ("e" "Show Errors" flycheck-list-errors)]] ["" ("q" "Quit" keyboard-quit)]) -(defun +custom-lang-python/activate-python-mode () +(defun icejam-lang-python/activate-python-mode () (lsp) (column-enforce-n 99) - (define-key python-mode-map (kbd "C-c l") '+custom-lang-python/transient-context-menu) + (define-key python-mode-map (kbd "C-c l") 'icejam-lang-python/transient-context-menu) ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet))) -(add-hook 'python-mode-hook '+custom-lang-python/activate-python-mode) +(add-hook 'python-mode-hook 'icejam-lang-python/activate-python-mode) (provide 'icejam-lang-python) ;;; icejam-lang-python.el ends here diff --git a/lisp/themes/icejam-base16-harmonic-light.el b/lisp/themes/icejam-base16-harmonic-light.el index e5b4d0f..6d642fc 100644 --- a/lisp/themes/icejam-base16-harmonic-light.el +++ b/lisp/themes/icejam-base16-harmonic-light.el @@ -1,4 +1,4 @@ -;;; base16-harmonic-light-modified-theme.el --- summary +;;; icejam-base16-harmonic-light-modified.el --- summary ;;; Commentary: ;; Author: Maciej Szlosarczyk @@ -9,7 +9,7 @@ (use-package base16-theme :straight t :defer t) -(defvar base16-harmonic-light-modified-colors +(defvar icejam-base16-harmonic-light-colors '(:base00 "#f7f9fb" :base01 "#e5ebf1" :base02 "#cbd6e2" @@ -29,12 +29,12 @@ "All colors for Base16 Harmonic Light Modified are defined here.") ;; Define the theme -(deftheme base16-harmonic-light-modified) +(deftheme icejam-base16-harmonic-light) ;; Add all the faces to the theme -(base16-theme-define 'base16-harmonic-light-modified base16-harmonic-light-modified-colors) +(base16-theme-define 'icejam-base16-harmonic-light icejam-base16-harmonic-light-colors) ;; Mark the theme as provided -(provide-theme 'base16-harmonic-light-modified) +(provide-theme 'icejam-base16-harmonic-light) (provide 'icejam-base16-harmonic-light) ;;; icejam-base16-harmonic-light.el ends here diff --git a/lisp/themes/icejam-base16-zenburn.el b/lisp/themes/icejam-base16-zenburn.el index 2ba0acb..01fa2ab 100644 --- a/lisp/themes/icejam-base16-zenburn.el +++ b/lisp/themes/icejam-base16-zenburn.el @@ -1,4 +1,4 @@ -;; base16-zenburn-modified-theme.el -- A base16 colorscheme +;; icejam-base16-zenburn.el -- A base16 colorscheme ;;; Commentary: ;; Base16: (https://github.com/chriskempson/base16) @@ -17,9 +17,9 @@ ;; 0B made lighter by 10% #5f7f5f => #799979 -(use-package base16-theme :straight t :defer t) +(use-package base16-theme :straight t) -(defvar base16-zenburn-modified-colors +(defvar icejam-base16-zenburn-colors '(:base00 "#383838" :base01 "#404040" :base02 "#5b5b5b" @@ -39,12 +39,12 @@ "All colors for Base16 Zenburn-Modified are defined here.") ;; Define the theme -(deftheme base16-zenburn-modified) +(deftheme icejam-base16-zenburn) ;; Add all the faces to the theme -(base16-theme-define 'base16-zenburn-modified base16-zenburn-modified-colors) +(base16-theme-define 'icejam-base16-zenburn icejam-base16-zenburn-colors) ;; Mark the theme as provided -(provide-theme 'base16-zenburn-modified) +(provide-theme 'icejam-base16-zenburn) (provide 'icejam-base16-zenburn) ;;; icejam-base16-zenburn.el ends here