Namespace most of my custom functions

lisp/icejam-company-yasnippet.el

@@ -69,7 +69,7 @@
 (define-key company-active-map (kbd "C-p") 'company-select-previous-or-abort)
 (define-key company-active-map (kbd "C-n") 'company-select-next-or-abort)
 
-(defun insert-space-and-complete ()
+(defun icejam/insert-space-and-complete ()
   "Insert space before trying to complete a section."
   (interactive)
   (save-excursion
@@ -81,11 +81,11 @@
 
 ;;; Yasnippet configuration
 (define-key prog-mode-map (kbd "C-c y") 'company-yasnippet)
-(define-key prog-mode-map (kbd "<f13>") 'insert-space-and-complete)
+(define-key prog-mode-map (kbd "<f13>") 'icejam/insert-space-and-complete)
 (define-key prog-mode-map (kbd "TAB") 'company-indent-or-complete-common)
 
 (define-key text-mode-map (kbd "C-c y") 'company-yasnippet)
-(define-key text-mode-map (kbd "<f13>") 'insert-space-and-complete)
+(define-key text-mode-map (kbd "<f13>") 'icejam/insert-space-and-complete)
 (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common)
 
 

lisp/icejam-deft.el

@@ -24,13 +24,5 @@
               "\\)")
            deft-auto-save-interval 30.0))
 
-(transient-define-prefix icejam-deft/menu ()
- "Start Deft."
- [""
- ("d" "Deft" deft)
- ("q" "quit" keyboard-quit)])
-
-(define-key icejam-keys-mode-map (kbd "C-c d") 'icejam-deft/menu)
-
 (provide 'icejam-deft)
 ;;; icejam-deft.el ends here

lisp/icejam-fonts.el

@@ -12,7 +12,7 @@
 
 ;; Set font face
 ;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun icejam-set-lsp-ui-font-hook ()
+(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
@@ -47,7 +47,7 @@
    'mode-line-inactive nil :font (format "%s %d" name (- size 1)))
 
   ;; Call LSP-UI hook
-  (icejam-set-lsp-ui-font-hook))
+  (icejam/set-lsp-ui-font-hook))
 
 (defvar icejam-font "Iosevka Term")
 ;; (defvar icejam-font "Monoid")

lisp/icejam-prog-mode.el

@@ -63,7 +63,7 @@
 (setq tab-stop-list (number-sequence tab-width 200 tab-width))
 
 ;; Ensure indentation in steps:
-(defun set-indent (step)
+(defun icejam/set-indent (step)
   "Set indentation to STEP."
   (interactive "NNumber of columns for one step: ")
   (setq-local tab-width step)
@@ -74,8 +74,14 @@
   :defer t
   :config (global-column-enforce-mode t))
 
-;; Vim-like regex replace with preview in buffer.
+;; PCRE to emacs regex translations
-(use-package visual-regexp :straight t :defer t)
+(use-package pcre2el :straight t)
+
+;; Visual regexp
+(use-package visual-regexp-steroids
+  :straight t
+  :requires (pcre2el)
+  :config (setq vr/engine 'pcre2el))
 
 (provide 'icejam-prog-mode)
-;;; icejam-prog-mode ends here
+;;; icejam-prog-mode.el ends here

lisp/icejam-sys-specific.el

@@ -19,7 +19,7 @@
       (setq mac-option-modifier 'meta)
       (setq mac-command-modifier 'hyper)
 
-      (defun mac-switch-meta nil
+      (defun icejam/mac-switch-meta nil
         "Switch meta between Option and Command."
         (interactive)
         (if (eq mac-option-modifier nil)

lisp/icejam-transient.el

@@ -4,7 +4,6 @@
 ;;; Code:
 
 (require 'icejam-avy)
-
 (use-package transient :straight t)
 
 (defun icejam-mark-and-indent-whole-buffer ()
@@ -12,7 +11,7 @@
   (interactive)
   (indent-region (point-min) (point-max)))
 
-(transient-define-prefix icejam-transient/project-menu ()
+(transient-define-prefix icejam/project-menu ()
   "Project Commands."
   [""
    ["Projectile"
@@ -37,7 +36,7 @@
     ("d" "deft"                 deft)
     ("T" "Speed Type"           speed-type-text)]])
 
-(transient-define-prefix icejam-transient/code-menu ()
+(transient-define-prefix icejam/code-menu ()
   "Code Commands."
   [""
    ["Manipulate"
@@ -54,7 +53,7 @@
     ("u" "Vundo"          vundo)
     ("d" "Dash"           dash-at-point)]])
 
-(transient-define-prefix icejam-transient/window-menu ()
+(transient-define-prefix icejam/window-menu ()
   "Windows Commands."
   [""
    ["Move"
@@ -71,7 +70,7 @@
     ""
     ("k" "Kill Buffer"  kill-buffer-and-window)]])
 
-(transient-define-prefix icejam-transient/language-context-menu ()
+(transient-define-prefix icejam/language-context-menu ()
   "Language (Buffer) Commands."
   [""
    ["Buffer"
@@ -82,13 +81,13 @@
     ("m" "iMenu"       lsp-ui-imenu)
     ("e" "Show Errors" flycheck-list-errors)]])
 
-(transient-define-prefix icejam-transient/history-menu ()
+(transient-define-prefix icejam/history-menu ()
   "Buffer History Commands."
   ["History"
    ("[" "Previous" previous-buffer)
    ("]" "Next" previous-buffer)])
 
-(transient-define-prefix icejam-transient/move-menu ()
+(transient-define-prefix icejam/move-menu ()
   "Move Commands."
   [""
    ["Move this buffer"
@@ -101,7 +100,7 @@
     ("l" "Character" avy-goto-line)
     ("c" "Line" avy-goto-char-2)]])
 
-(transient-define-prefix icejam-transient/font-menu ()
+(transient-define-prefix icejam/font-menu ()
   "Font Commands."
   [""
    ["Everywhere"
@@ -112,13 +111,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") 'icejam-transient/project-menu)
+(define-key global-map (kbd "C-c p") 'icejam/project-menu)
-(define-key global-map (kbd "C-c c") 'icejam-transient/code-menu)
+(define-key global-map (kbd "C-c c") 'icejam/code-menu)
-(define-key global-map (kbd "C-c w") 'icejam-transient/window-menu)
+(define-key global-map (kbd "C-c w") 'icejam/window-menu)
-(define-key global-map (kbd "C-c s") 'icejam-transient/history-menu)
+(define-key global-map (kbd "C-c s") 'icejam/history-menu)
-(define-key global-map (kbd "C-c f") 'icejam-transient/font-menu)
+(define-key global-map (kbd "C-c f") 'icejam/font-menu)
-(define-key global-map (kbd "C-c m") 'icejam-transient/move-menu)
+(define-key global-map (kbd "C-c m") 'icejam/move-menu)
-(define-key global-map (kbd "C-c l") 'icejam-transient/language-context-menu)
+(define-key global-map (kbd "C-c l") 'icejam/language-context-menu)
 
 (provide 'icejam-transient)
 ;;; icejam-transient.el ends here

lisp/langs/icejam-lang-clojure.el

@@ -36,7 +36,7 @@
 
 (defun icejam-lang-clojure/activate-clojure-mode ()
   "Goodies for clojure files."
-  (set-indent 2) ;; Default indentation of 2 characters
+  (icejam/set-indent 2) ;; Default indentation of 2 characters
   (column-enforce-n 80)
   (clj-refactor-mode 1)
   (cider-mode 1)

lisp/langs/icejam-lang-elisp.el

@@ -4,7 +4,7 @@
 
 (require 'icejam-prog-mode)
 
-(transient-define-prefix icejam-lang-elisp/transient-context-menu ()
+(transient-define-prefix icejam/elisp-lang-menu ()
   "Elisp Buffer Commands."
   [""
    ["Buffer"
@@ -14,20 +14,19 @@
   [""
    ("q" "Quit"        keyboard-quit)])
 
-(defun activate-emacs-lisp-mode ()
+(defun icejam/activate-emacs-lisp-mode ()
   "Goodies for editing Emacs files."
-  (set-indent 2) ;; Default indentation of 2 characters
+  (icejam/set-indent 2) ;; Default indentation of 2 characters
   (column-enforce-n 80)
   (setq-default indent-tabs-mode nil)
 
-  (define-key emacs-lisp-mode-map
+  (define-key emacs-lisp-mode-map (kbd "C-c l") 'icejam/elisp-lang-menu)
-              (kbd "C-c l") 'icejam-lang-elisp/transient-context-menu)
 
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)
                '(company-yasnippet company-elisp)))
 
-(add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode)
+(add-hook 'emacs-lisp-mode-hook 'icejam/activate-emacs-lisp-mode)
 
 (provide 'icejam-lang-elisp)
 ;;; icejam-lang-elisp.el ends here

lisp/langs/icejam-lang-elixir.el

@@ -13,7 +13,7 @@
 (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode))
 (add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-ts-mode))
 
-(transient-define-prefix icejam-lang-elixir/transient-context-menu ()
+(transient-define-prefix icejam/elixir-lang-menu ()
   "Elixir Buffer Commands."
   [""
    ["LSP"
@@ -26,9 +26,9 @@
   [""
    ("q" "Quit"        keyboard-quit)])
 
-(defun icejam-lang-elixir/activate-elixir-ts-mode ()
+(defun icejam/activate-elixir-ts-mode ()
   "All things Elixir."
-  (set-indent 2)
+  (icejam/set-indent 2)
   (column-enforce-n 98)
   (lsp)
   (setq-local flycheck-check-syntax-automatically '(save mode-enabled))
@@ -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") 'icejam-lang-elixir/transient-context-menu)
+  (define-key elixir-ts-mode-map (kbd "C-c l") 'icejam/elixir-lang-menu)
 
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'elixir-ts-mode-hook 'icejam-lang-elixir/activate-elixir-ts-mode)
+(add-hook 'elixir-ts-mode-hook 'icejam/activate-elixir-ts-mode)
 
 (provide 'icejam-lang-elixir)
 ;;; icejam-lang-elixir.el ends here

lisp/langs/icejam-lang-erlang.el

@@ -56,7 +56,7 @@
    (error line-start (file-name) ":" line ": " (message) line-end))
   :modes (my-erlang-mode))
 
-(defun erlang/activate-erlang-mode ()
+(defun icejam/activate-erlang-mode ()
   "All things for all Erlang, including header files."
   (when (featurep 'erlang-start) (unload-feature 'erlang-start))
 
@@ -74,7 +74,7 @@
                       (plist-get erlang/current-erlang :erlang-path)))
 
   (require 'erlang-start)
-  (set-indent 4)
+  (icejam/set-indent 4)
   (column-enforce-n 80)
 
   ;; Add include path so that Erlang does not complain about
@@ -97,7 +97,7 @@
   ;; Start LSP server
   (lsp))
 
-(add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode)
+(add-hook 'erlang-mode-hook 'icejam/activate-erlang-mode)
 
 (provide 'icejam-lang-erlang)
 ;;; icejam-lang-erlang.el ends here

lisp/langs/icejam-lang-fsharp.el

@@ -18,9 +18,9 @@
   :straight t
   :defer t)
 
-(defun activate-fsharp-mode ()
+(defun icejam/activate-fsharp-mode ()
   "Activate F# goodies."
-  (set-indent 4)
+  (icejam/set-indent 4)
   (column-enforce-n 100)
   (lsp-deferred)
 
@@ -28,7 +28,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'fsharp-mode-hook 'activate-fsharp-mode)
+(add-hook 'fsharp-mode-hook 'icejam/activate-fsharp-mode)
 
 (provide 'icejam-lang-fsharp)
 ;;; icejam-lang-fsharp.el ends here

lisp/langs/icejam-lang-gleam.el

@@ -21,7 +21,7 @@
 
 (defun icejam-lang-gleam/activate-gleam-mode ()
   "All things Gleam."
-  (set-indent 2)
+  (icejam/set-indent 2)
   (column-enforce-n 100)
   (lsp))
 

lisp/langs/icejam-lang-golang.el

@@ -1,4 +1,4 @@
-;;; golang.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-lang-golang.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -17,12 +17,13 @@
   :defer t
   :straight t)
 
-(defun activate-golang-mode ()
+(defun icejam/activate-golang-mode ()
-  (set-indent 8)
+  "Activate my own Golang mode settings."
+  (icejam/set-indent 8)
   (column-enforce-n 100)
   (lsp))
 
-(add-hook 'go-mode-hook 'activate-golang-mode)
+(add-hook 'go-mode-hook 'icejam/activate-golang-mode)
 
 (provide 'icejam-lang-golang)
 ;;; icejam-lang-golang.el ends here

lisp/langs/icejam-lang-haskell.el

@@ -21,9 +21,9 @@
   :defer t
   :requires (lsp-mode lsp-ui haskell-mode))
 
-(defun activate-haskell-mode ()
+(defun icejam/activate-haskell-mode ()
   "Run this in haskell-mode."
-  (set-indent 2)
+  (icejam/set-indent 2)
   (column-enforce-n 80)
   (lsp-deferred)
 
@@ -31,7 +31,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'haskell-mode-hook 'activate-haskell-mode)
+(add-hook 'haskell-mode-hook 'icejam/activate-haskell-mode)
 
 (provide 'icejam-lang-haskell)
 ;;; icejam-lang-haskell.el ends here

lisp/langs/icejam-lang-javascript.el

@@ -20,9 +20,9 @@
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 (add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode))
 
-(defun activate-js2-mode ()
+(defun icejam/activate-js2-mode ()
 	"JS2 mode overrides."
-	(set-indent 2)
+	(icejam/set-indent 2)
 
   (when (not (string-match-p ".json" (buffer-file-name)))
     (lsp-deferred))
@@ -41,7 +41,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'js2-mode-hook 'activate-js2-mode)
+(add-hook 'js2-mode-hook 'icejam/activate-js2-mode)
 
 (provide 'icejam-lang-javascript)
 ;;; icejam-lang-javascript.el ends here

lisp/langs/icejam-lang-kotlin.el

@@ -18,9 +18,9 @@
 	:defer t
 	:straight t)
 
-(defun activate-kotlin-mode ()
+(defun icejam/activate-kotlin-mode ()
   "All things Kotlin."
-  (set-indent 4)
+  (icejam/set-indent 4)
   (column-enforce-n 100)
   (lsp)
 
@@ -28,7 +28,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'kotlin-mode-hook 'activate-kotlin-mode)
+(add-hook 'kotlin-mode-hook 'icejam/activate-kotlin-mode)
 
 (provide 'icejam-lang-kotlin)
 ;;; icejam-lang-kotlin.el ends here

lisp/langs/icejam-lang-lean.el

@@ -14,7 +14,7 @@
   :requires (lsp)
   :defer t)
 
-(defun activate-lean-mode ()
+(defun icejam/activate-lean-mode ()
   "All things for Lean mode."
   (interactive)
 
@@ -25,7 +25,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'lean4-mode-hook 'activate-lean-mode)
+(add-hook 'lean4-mode-hook 'icejam/activate-lean-mode)
 
 (provide 'icejam-lang-lean)
 ;;; icejam-lang-lean.el ends here

lisp/langs/icejam-lang-markdown.el

@@ -11,7 +11,7 @@
 
 (defun icejam-lang-markdown/activate-markdown-mode ()
   "Reconfigure markdown mode for your own purposes."
-  (set-indent 2)
+  (icejam/set-indent 2)
   (column-enforce-n 10000)
 
   ;; Markdown mode reuses my bindings, remove them.

lisp/langs/icejam-lang-ocaml.el

@@ -35,7 +35,7 @@
   [""
    ("q" "Quit"      keyboard-quit)])
 
-(defun load-ocaml-site-packages ()
+(defun icejam/load-ocaml-site-packages ()
   "Generate ocaml config."
   (let ((opam-share (ignore-errors (car (process-lines "opam" "var" "share")))))
     (when (and opam-share (file-directory-p opam-share))
@@ -52,7 +52,7 @@
 
 ;; OCaml setup
 (add-hook 'tuareg-mode-hook 'merlin-mode)
-(add-hook 'tuareg-mode-hook 'load-ocaml-site-packages)
+(add-hook 'tuareg-mode-hook 'icejam/load-ocaml-site-packages)
 (add-hook 'merlin-mode-hook (lambda ()
                               (unbind-key "C-c C-d" merlin-mode-map)
                               (unbind-key "C-c C-l" merlin-mode-map)

lisp/langs/icejam-lang-php.el

@@ -34,7 +34,7 @@
 
 (defun icejam-lang-php/activate-php-mode ()
   "All things php."
-  (set-indent 4)
+  (icejam/set-indent 4)
   (column-enforce-n 80)
 
   (define-key php-mode-map (kbd "C-c l") 'icejam-lang-php/context-menu)

lisp/langs/icejam-lang-purescript.el

@@ -13,9 +13,9 @@
   :requires (lsp-mode lsp-ui)
   :straight t)
 
-(defun activate-purescript-mode ()
+(defun icejam/activate-purescript-mode ()
   "All things Purescript."
-  (set-indent 2)
+  (icejam/set-indent 2)
   (column-enforce-n 98)
 
   ;; Purescript indentation
@@ -25,7 +25,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'purescript-mode-hook 'activate-purescript-mode)
+(add-hook 'purescript-mode-hook 'icejam/activate-purescript-mode)
 
 (provide 'icejam-lang-purescript)
 ;;; icejam-lang-purescript.el ends here

lisp/langs/icejam-lang-ruby.el

@@ -14,9 +14,9 @@
   :straight t
   :defer t)
 
-(defun activate-ruby-mode ()
+(defun icejam/activate-ruby-mode ()
   "All things for ruby mode."
-  (set-indent 2)
+  (icejam/set-indent 2)
 
   ;; Disable reek syntax checking permanently
   (add-to-list (make-local-variable 'flycheck-disabled-checkers) 'ruby-reek 'ruby-rubocop)
@@ -33,7 +33,7 @@
 (add-hook 'enh-ruby-mode-hook 'ruby-end-mode)
 (eval-after-load 'rspec-mode
   '(rspec-install-snippets))
-(add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
+(add-hook 'enh-ruby-mode-hook 'icejam/activate-ruby-mod)
 ;; (add-hook 'enh-ruby-mode-hook 'lsp-deferred)
 
 (provide 'icejam-lang-ruby)

lisp/langs/icejam-lang-rust.el

@@ -13,10 +13,10 @@
   :defer t
   :requires (rust-mode lsp))
 
-(defun activate-rust-mode ()
+(defun icejam/activate-rust-mode ()
   "All things for Rust mode."
   (interactive)
-  (set-indent 4)
+  (icejam/set-indent 4)
   (column-enforce-n 99)
 
   ;; Run LSP
@@ -26,7 +26,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
-(add-hook 'rust-mode-hook 'activate-rust-mode)
+(add-hook 'rust-mode-hook 'icejam/activate-rust-mode)
 (add-hook 'rust-mode-hook 'flycheck-rust-setup)
 
 (provide 'icejam-lang-rust)

lisp/langs/icejam-lang-web.el

@@ -25,7 +25,7 @@
         ("erb"  . (("<%" "%>")
                    ("beg" "end")))))
 
-(defun activate-web-mode ()
+(defun icejam/activate-web-mode ()
 	"Web mode overrides."
 	;; Indent web mode scripts by 2
 	(setq-local web-mode-script-padding 2)
@@ -44,7 +44,7 @@
 	(when (string-match-p ".vue" (buffer-file-name))
 		(lsp)))
 
-(add-hook 'web-mode-hook 'activate-web-mode)
+(add-hook 'web-mode-hook 'icejam/activate-web-mode)
 
 (provide 'icejam-lang-web)
 ;;; icejam-lang-web.el ends here

lisp/langs/icejam-lang-ziglang.el

@@ -13,17 +13,17 @@
 
 (use-package zig-mode :straight t :defer t :requires (lsp))
 
-(defun activate-zig-mode ()
+(defun icejam/activate-zig-mode ()
   "Goodies for editing zig files."
 
   ;; Set column width to 100
   (column-enforce-n 100)
 
   ;; Set indentation to 4 chars
-  (set-indent 4)
+  (icejam/set-indent 4)
   (lsp))
 
-(add-hook 'zig-mode-hook 'activate-zig-mode)
+(add-hook 'zig-mode-hook 'icejam/activate-zig-mode)
 
 (provide 'icejam-lang-ziglang)
 ;;; icejam-lang-ziglang.el ends here