From 185c11289039bd2c3957b9319dda8c32ba0f6134 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sun, 7 Mar 2021 18:24:10 +0200 Subject: [PATCH] Namespace packages --- init.el | 80 ++++++++++++++++++++-------------------- lang/clang.el | 8 ++-- lang/clojure.el | 6 +-- lang/elisp.el | 4 +- lang/elixir.el | 8 ++-- lang/erlang.el | 6 +-- lang/fsharp.el | 6 +-- lang/gleam.el | 2 +- lang/haskell.el | 8 ++-- lang/javascript.el | 8 ++-- lang/markdown.el | 4 +- lang/ocaml.el | 4 +- lang/other.el | 2 +- lang/php.el | 8 ++-- lang/purescript.el | 2 +- lang/ruby.el | 8 ++-- lang/rust.el | 6 +-- lang/sh.el | 2 +- lang/web.el | 6 +-- pkg/avy.el | 2 +- pkg/base.el | 2 +- pkg/company-yasnippet.el | 2 +- pkg/ctags.el | 4 +- pkg/dashboard.el | 2 +- pkg/deft.el | 8 ++-- pkg/diminish.el | 2 +- pkg/flycheck.el | 2 +- pkg/hydra.el | 4 +- pkg/ispell.el | 2 +- pkg/ivy.el | 22 +++++------ pkg/keys-mode.el | 36 +++++++++--------- pkg/lsp.el | 2 +- pkg/macros.el | 2 +- pkg/magit.el | 2 +- pkg/persp.el | 2 +- pkg/prog-mode.el | 2 +- pkg/projectile.el | 2 +- pkg/sys-specific.el | 66 ++++++++++++++++----------------- pkg/term.el | 6 +-- pkg/undo-tree.el | 2 +- themes/themes.el | 2 +- 41 files changed, 177 insertions(+), 177 deletions(-) diff --git a/init.el b/init.el index a416d43..718c669 100644 --- a/init.el +++ b/init.el @@ -25,52 +25,52 @@ (straight-use-package 'use-package) ;; General configuration files. -(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") -(require 'icejam-pkg-base "$HOME/.emacs.d/pkg/base.el") -(require 'icejam-pkg-sys-specific "$HOME/.emacs.d/pkg/sys-specific.el") -(require 'icejam-pkg-macros "$HOME/.emacs.d/pkg/macros.el") -(require 'icejam-pkg-ivy "$HOME/.emacs.d/pkg/ivy.el") -(require 'icejam-pkg-persp "$HOME/.emacs.d/pkg/persp.el") -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") -(require 'icejam-pkg-magit "$HOME/.emacs.d/pkg/magit.el") -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require 'icejam-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require 'icejam-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") -(require 'icejam-pkg-ispell "$HOME/.emacs.d/pkg/ispell.el") -(require 'icejam-pkg-deft "$HOME/.emacs.d/pkg/deft.el") -(require 'icejam-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el") -(require 'icejam-pkg-dashboard "$HOME/.emacs.d/pkg/dashboard.el") -(require 'icejam-pkg-undo-tree "$HOME/.emacs.d/pkg/undo-tree.el") -(require 'icejam-pkg-avy "$HOME/.emacs.d/pkg/avy.el") -(require 'icejam-pkg-term "$HOME/.emacs.d/pkg/term.el") +(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") +(require '+custom-pkg-base "$HOME/.emacs.d/pkg/base.el") +(require '+custom-pkg-sys-specific "$HOME/.emacs.d/pkg/sys-specific.el") +(require '+custom-pkg-macros "$HOME/.emacs.d/pkg/macros.el") +(require '+custom-pkg-ivy "$HOME/.emacs.d/pkg/ivy.el") +(require '+custom-pkg-persp "$HOME/.emacs.d/pkg/persp.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-magit "$HOME/.emacs.d/pkg/magit.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") +(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") +(require '+custom-pkg-ispell "$HOME/.emacs.d/pkg/ispell.el") +(require '+custom-pkg-deft "$HOME/.emacs.d/pkg/deft.el") +(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el") +(require '+custom-pkg-dashboard "$HOME/.emacs.d/pkg/dashboard.el") +(require '+custom-pkg-undo-tree "$HOME/.emacs.d/pkg/undo-tree.el") +(require '+custom-pkg-avy "$HOME/.emacs.d/pkg/avy.el") +(require '+custom-pkg-term "$HOME/.emacs.d/pkg/term.el") ;; Themes -(require 'icejam-themes "$HOME/.emacs.d/themes/themes.el") +(require '+custom-themes "$HOME/.emacs.d/themes/themes.el") ;; Actual supported languages and file syntax. -(require 'icejam-lang-elisp "$HOME/.emacs.d/lang/elisp.el") -(require 'icejam-lang-ruby "$HOME/.emacs.d/lang/ruby.el") -(require 'icejam-lang-web "$HOME/.emacs.d/lang/web.el") -(require 'icejam-lang-javascript "$HOME/.emacs.d/lang/javascript.el") -(require 'icejam-lang-elixir "$HOME/.emacs.d/lang/elixir.el") -(require 'icejam-lang-erlang "$HOME/.emacs.d/lang/erlang.el") -(require 'icejam-lang-gleam "$HOME/.emacs.d/lang/gleam.el") -(require 'icejam-lang-fsharp "$HOME/.emacs.d/lang/fsharp.el") -(require 'icejam-lang-sh "$HOME/.emacs.d/lang/sh.el") -(require 'icejam-lang-rust "$HOME/.emacs.d/lang/rust.el") -(require 'icejam-lang-haskell "$HOME/.emacs.d/lang/haskell.el") -(require 'icejam-lang-clang "$HOME/.emacs.d/lang/clang.el") -(require 'icejam-lang-clojure "$HOME/.emacs.d/lang/clojure.el") -(require 'icejam-lang-ocaml "$HOME/.emacs.d/lang/ocaml.el") -(require 'icejam-lang-purescript "$HOME/.emacs.d/lang/purescript.el") -(require 'icejam-lang-php "$HOME/.emacs.d/lang/php.el") -(require 'icejam-lang-markdown "$HOME/.emacs.d/lang/markdown.el") -(require 'icejam-lang-other "$HOME/.emacs.d/lang/other.el") +(require '+custom-lang-elisp "$HOME/.emacs.d/lang/elisp.el") +(require '+custom-lang-ruby "$HOME/.emacs.d/lang/ruby.el") +(require '+custom-lang-web "$HOME/.emacs.d/lang/web.el") +(require '+custom-lang-javascript "$HOME/.emacs.d/lang/javascript.el") +(require '+custom-lang-elixir "$HOME/.emacs.d/lang/elixir.el") +(require '+custom-lang-erlang "$HOME/.emacs.d/lang/erlang.el") +(require '+custom-lang-gleam "$HOME/.emacs.d/lang/gleam.el") +(require '+custom-lang-fsharp "$HOME/.emacs.d/lang/fsharp.el") +(require '+custom-lang-sh "$HOME/.emacs.d/lang/sh.el") +(require '+custom-lang-rust "$HOME/.emacs.d/lang/rust.el") +(require '+custom-lang-haskell "$HOME/.emacs.d/lang/haskell.el") +(require '+custom-lang-clang "$HOME/.emacs.d/lang/clang.el") +(require '+custom-lang-clojure "$HOME/.emacs.d/lang/clojure.el") +(require '+custom-lang-ocaml "$HOME/.emacs.d/lang/ocaml.el") +(require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el") +(require '+custom-lang-php "$HOME/.emacs.d/lang/php.el") +(require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el") +(require '+custom-lang-other "$HOME/.emacs.d/lang/other.el") ;; Diminish modeline litter -(require 'icejam-pkg-diminish "$HOME/.emacs.d/pkg/diminish.el") +(require '+custom-pkg-diminish "$HOME/.emacs.d/pkg/diminish.el") (custom-set-variables ;; custom-set-variables was added by Custom. diff --git a/lang/clang.el b/lang/clang.el index 758d026..1ac0e27 100644 --- a/lang/clang.el +++ b/lang/clang.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require 'icejam-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") +(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (defun activate-clang-mode () "Goodies for editing c files." @@ -32,5 +32,5 @@ (add-hook 'c-mode-hook 'activate-clang-mode) -(provide 'icejam-lang-clang) +(provide '+custom-lang-clang) ;;; clang.el ends here diff --git a/lang/clojure.el b/lang/clojure.el index 3c6fd8e..31f5227 100644 --- a/lang/clojure.el +++ b/lang/clojure.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package clojure-mode :defer t @@ -62,5 +62,5 @@ Cider: _j_: Jack in _t_: Test (add-hook 'cider-repl-mode-hook 'my-clj-repl-config) (add-hook 'cider-mode-hook #'cider-company-enable-fuzzy-completion) -(provide 'icejam-lang-clojure) +(provide '+custom-lang-clojure) ;;; clojure.el ends here diff --git a/lang/elisp.el b/lang/elisp.el index 33dc8dd..2088a7d 100644 --- a/lang/elisp.el +++ b/lang/elisp.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (defun activate-emacs-lisp-mode () "Goodies for editing Emacs files." @@ -16,5 +16,5 @@ (add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode) -(provide 'icejam-lang-elisp) +(provide '+custom-lang-elisp) ;;; elisp.el ends here diff --git a/lang/elixir.el b/lang/elixir.el index 6aef228..64c14ba 100644 --- a/lang/elixir.el +++ b/lang/elixir.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package elixir-mode :requires (lsp-mode lsp-ui) @@ -43,5 +43,5 @@ Other: _m_: iMenu (add-hook 'elixir-mode-hook 'activate-elixir-mode) -(provide 'icejam-lang-elixir) +(provide '+custom-lang-elixir) ;;; elixir.el ends here diff --git a/lang/erlang.el b/lang/erlang.el index f304bcc..0990e03 100644 --- a/lang/erlang.el +++ b/lang/erlang.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (use-package erlang :defer t @@ -109,5 +109,5 @@ (add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode) -(provide 'icejam-lang-erlang) +(provide '+custom-lang-erlang) ;;; erlang.el ends here diff --git a/lang/fsharp.el b/lang/fsharp.el index 2209911..7367508 100644 --- a/lang/fsharp.el +++ b/lang/fsharp.el @@ -10,8 +10,8 @@ ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") (use-package fsharp-mode :requires (lsp-mode lsp-ui) @@ -46,5 +46,5 @@ _i_: Indent buffer _m_: iMenu (add-hook 'fsharp-mode-hook 'activate-fsharp-mode) -(provide 'icejam-lang-fsharp) +(provide '+custom-lang-fsharp) ;;; fsharp.el ends here diff --git a/lang/gleam.el b/lang/gleam.el index 49701c6..14db9a8 100644 --- a/lang/gleam.el +++ b/lang/gleam.el @@ -14,5 +14,5 @@ :straight `(gleam-mode :type git :host github :repo "gleam-lang/gleam-mode") :mode "\\.gleam\\'") -(provide 'icejam-lang-gleam) +(provide '+custom-lang-gleam) ;;; gleam.el ends here diff --git a/lang/haskell.el b/lang/haskell.el index 0a0e334..9b0c1cd 100644 --- a/lang/haskell.el +++ b/lang/haskell.el @@ -10,9 +10,9 @@ ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package haskell-mode :straight t @@ -53,5 +53,5 @@ _i_: Indent buffer _m_: iMenu (add-hook 'haskell-mode-hook 'activate-haskell-mode) -(provide 'icejam-lang-haskell) +(provide '+custom-lang-haskell) ;;; haskell.el ends here diff --git a/lang/javascript.el b/lang/javascript.el index 41ad0d6..0e11d6f 100644 --- a/lang/javascript.el +++ b/lang/javascript.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require 'icejam-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el") (use-package js2-mode :requires (web-mode company-web lsp-mode lsp-ui) @@ -45,5 +45,5 @@ (add-hook 'js2-mode-hook 'activate-js2-mode) (add-hook 'vue-mode-hook 'lsp) -(provide 'icejam-lang-javascript) +(provide '+custom-lang-javascript) ;;; javascript.el ends here diff --git a/lang/markdown.el b/lang/markdown.el index 7d31cbf..d695d30 100644 --- a/lang/markdown.el +++ b/lang/markdown.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (use-package markdown-mode :straight t @@ -23,5 +23,5 @@ (add-hook 'markdown-mode-hook 'activate-markdown-mode) -(provide 'icejam-lang-markdown) +(provide '+custom-lang-markdown) ;;; markdown.el ends here diff --git a/lang/ocaml.el b/lang/ocaml.el index b9c8b4d..601d1f9 100644 --- a/lang/ocaml.el +++ b/lang/ocaml.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package tuareg :defer t @@ -95,5 +95,5 @@ _o_: Update opam env (add-hook 'reason-mode-hook 'my-reason-mode) (add-hook 'reason-mode-hook 'merlin-mode) -(provide 'icejam-lang-ocaml) +(provide '+custom-lang-ocaml) ;;; ocaml.el ends here diff --git a/lang/other.el b/lang/other.el index 5e1f264..d4fd557 100644 --- a/lang/other.el +++ b/lang/other.el @@ -25,5 +25,5 @@ :hook ((gitignore-mode . whitespace-mode) (before-save . whitespace-cleanup))) -(provide 'icejam-lang-other) +(provide '+custom-lang-other) ;;; other.el ends here diff --git a/lang/php.el b/lang/php.el index a41d92f..1042a20 100644 --- a/lang/php.el +++ b/lang/php.el @@ -10,9 +10,9 @@ ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package php-mode :requires (lsp-mode lsp-ui) @@ -45,5 +45,5 @@ _i_: Indent buffer _m_: iMenu (add-hook 'php-mode-hook 'activate-php-mode) -(provide 'icejam-lang-php) +(provide '+custom-lang-php) ;;; php.el ends here diff --git a/lang/purescript.el b/lang/purescript.el index e444cb7..2f202b0 100644 --- a/lang/purescript.el +++ b/lang/purescript.el @@ -27,5 +27,5 @@ (add-hook 'purescript-mode-hook 'activate-purescript-mode) -(provide 'icejam-lang-purescript) +(provide '+custom-lang-purescript) ;;; purescript.el ends here diff --git a/lang/ruby.el b/lang/ruby.el index f4cf5b9..c63d997 100644 --- a/lang/ruby.el +++ b/lang/ruby.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require 'icejam-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") +(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") (use-package rspec-mode :straight t :defer t) (use-package ruby-end :straight t :defer t) @@ -40,5 +40,5 @@ '(rspec-install-snippets)) (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode) -(provide 'icejam-lang-ruby) +(provide '+custom-lang-ruby) ;;; ruby.el ends here diff --git a/lang/rust.el b/lang/rust.el index 2b580b6..f03ef32 100644 --- a/lang/rust.el +++ b/lang/rust.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") (use-package rust-mode :straight t @@ -36,5 +36,5 @@ (add-hook 'rust-mode-hook 'flycheck-rust-setup) (add-hook 'rust-mode-hook 'racer-mode) -(provide 'icejam-lang-rust) +(provide '+custom-lang-rust) ;;; rust.el ends here diff --git a/lang/sh.el b/lang/sh.el index 4db6510..e026577 100644 --- a/lang/sh.el +++ b/lang/sh.el @@ -6,5 +6,5 @@ (add-to-list 'auto-mode-alist '("\\zshrc\\'" . sh-mode)) (add-to-list 'auto-mode-alist '("\\.zshrc\\'" . sh-mode)) -(provide 'icejam-lang-sh) +(provide '+custom-lang-sh) ;;; sh.el ends here diff --git a/lang/web.el b/lang/web.el index 11156d0..a1d28b2 100644 --- a/lang/web.el +++ b/lang/web.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require 'icejam-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el") -(require 'icejam-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el") +(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") (use-package web-mode :requires (lsp-mode flycheck) @@ -47,5 +47,5 @@ (add-hook 'web-mode-hook 'activate-web-mode) -(provide 'icejam-lang-web) +(provide '+custom-lang-web) ;;; web.el ends here diff --git a/pkg/avy.el b/pkg/avy.el index 4f05f76..737a414 100644 --- a/pkg/avy.el +++ b/pkg/avy.el @@ -14,5 +14,5 @@ :straight t :defer t) -(provide 'icejam-pkg-avy) +(provide '+custom-pkg-avy) ;;; avy.el ends here diff --git a/pkg/base.el b/pkg/base.el index c917493..ff67a45 100644 --- a/pkg/base.el +++ b/pkg/base.el @@ -120,5 +120,5 @@ (which-key-mode t) -(provide 'icejam-pkg-base) +(provide '+custom-pkg-base) ;;; base.el ends here diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el index 1a5d25c..b48a2b7 100644 --- a/pkg/company-yasnippet.el +++ b/pkg/company-yasnippet.el @@ -75,5 +75,5 @@ (define-key text-mode-map (kbd "") 'insert-space-and-complete) (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common) -(provide 'icejam-pkg-company-yasnippet) +(provide '+custom-pkg-company-yasnippet) ;;; company-yasnippet.el ends here diff --git a/pkg/ctags.el b/pkg/ctags.el index 726b2f6..5f4eceb 100644 --- a/pkg/ctags.el +++ b/pkg/ctags.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Old and rudimental completion framework. ;;; Code: -(require 'icejam-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") +(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") (setq tags-add-tables nil) @@ -52,5 +52,5 @@ (add-hook 'after-save-hook 'ctags/update-tags-on-save) -(provide 'icejam-pkg-ctags) +(provide '+custom-pkg-ctags) ;;; ctags.el ends here diff --git a/pkg/dashboard.el b/pkg/dashboard.el index b2ed646..4c447bf 100644 --- a/pkg/dashboard.el +++ b/pkg/dashboard.el @@ -23,5 +23,5 @@ ;; (registers . 5) (projects . 5))) -(provide 'icejam-pkg-dashboard) +(provide '+custom-pkg-dashboard) ;;; dashboard.el ends here diff --git a/pkg/deft.el b/pkg/deft.el index 0c35ecd..03e27ff 100644 --- a/pkg/deft.el +++ b/pkg/deft.el @@ -3,8 +3,8 @@ ;;; Notational velocity, backed by OneDrive. ;;; Code: -(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") -(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") +(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package deft :straight t @@ -19,7 +19,7 @@ ("d" deft "Deft") ("q" cancel "quit")) -(define-key icejam-keys-mode-map (kbd "C-c d") '+hydra-deft-menu/body) +(define-key +custom-keys-mode-map (kbd "C-c d") '+hydra-deft-menu/body) -(provide 'icejam-pkg-deft) +(provide '+custom-pkg-deft) ;;; deft.el ends here diff --git a/pkg/diminish.el b/pkg/diminish.el index 4f01b13..e5dbe8c 100644 --- a/pkg/diminish.el +++ b/pkg/diminish.el @@ -23,5 +23,5 @@ (eval-after-load "whitespace" '(diminish 'whitespace-mode)) (eval-after-load "auto-revert-mode" '(diminish 'auto-revert-mode)) -(provide 'icejam-pkg-diminish) +(provide '+custom-pkg-diminish) ;;; diminish.el ends here diff --git a/pkg/flycheck.el b/pkg/flycheck.el index 6a4fbf3..39b8bf1 100644 --- a/pkg/flycheck.el +++ b/pkg/flycheck.el @@ -25,5 +25,5 @@ (unbind-key "C-c ! v" flycheck-mode-map) (unbind-key "C-c ! x" flycheck-mode-map)) -(provide 'icejam-pkg-flycheck) +(provide '+custom-pkg-flycheck) ;;; flycheck.el ends here diff --git a/pkg/hydra.el b/pkg/hydra.el index 04c2f78..15dd033 100644 --- a/pkg/hydra.el +++ b/pkg/hydra.el @@ -3,7 +3,7 @@ ;;; Global hydra definitions. ;;; Code: -(require 'icejam-pkg-avy "$HOME/.emacs.d/pkg/avy.el") +(require '+custom-pkg-avy "$HOME/.emacs.d/pkg/avy.el") (defun mark-and-indent-whole-buffer () "Mark and indent whole buffer." @@ -151,5 +151,5 @@ Other: _m_: iMenu ("C-c m" . +hydra-bufmove/body) ("C-c l" . +hydra-language-context-menu/body)) -(provide 'icejam-pkg-hydra) +(provide '+custom-pkg-hydra) ;;; hydra.el ends here diff --git a/pkg/ispell.el b/pkg/ispell.el index bafdfa9..7c5915d 100644 --- a/pkg/ispell.el +++ b/pkg/ispell.el @@ -17,5 +17,5 @@ (unbind-key "C-c $" flyspell-mode-map) (unbind-key "C-M-i" flyspell-mode-map))) -(provide 'icejam-pkg-ispell) +(provide '+custom-pkg-ispell) ;;; ispell.el ends here diff --git a/pkg/ivy.el b/pkg/ivy.el index 5ff1fc9..7e8de04 100644 --- a/pkg/ivy.el +++ b/pkg/ivy.el @@ -3,7 +3,7 @@ ;;; Counsel, Swiper and Ivy. ;;; Code: -(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") +(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") (use-package counsel :straight t :defer t) (use-package swiper :straight t :defer t) @@ -23,17 +23,17 @@ (setq counsel-describe-function-function #'helpful-callable) (setq counsel-describe-variable-function #'helpful-variable) -(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 +(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 ;; List all key bindings there are. -(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) +(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) -(provide 'icejam-pkg-ivy) +(provide '+custom-pkg-ivy) ;;; ivy.el ends here diff --git a/pkg/keys-mode.el b/pkg/keys-mode.el index 3cbfc9a..34f2e29 100644 --- a/pkg/keys-mode.el +++ b/pkg/keys-mode.el @@ -10,46 +10,46 @@ ;;; Code: -(define-minor-mode icejam-keys-mode +(define-minor-mode +custom-keys-mode "Minor mode for all of my personal key bindings" :global t :keymap (make-sparse-keymap)) ;; Globally enable my minor mode -(icejam-keys-mode) +(+custom-keys-mode) ;;; Helpful key bindings -(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 +(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 ;; Move between windows key bindings -(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) +(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) ;; The same, but without using arrow keys -(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) +(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) ;; Kill current buffer and window -(define-key icejam-keys-mode-map (kbd "C-c q") 'kill-buffer-and-window) +(define-key +custom-keys-mode-map (kbd "C-c q") 'kill-buffer-and-window) ;; List buffers -(define-key icejam-keys-mode-map (kbd "C-c b") 'ibuffer) +(define-key +custom-keys-mode-map (kbd "C-c b") 'ibuffer) ;; Revert without asking (defun revert-buffer-no-confirm () "Revert buffer without confirmation." (interactive) (revert-buffer t t)) -(define-key icejam-keys-mode-map (kbd "C-c r") 'revert-buffer-no-confirm) +(define-key +custom-keys-mode-map (kbd "C-c r") 'revert-buffer-no-confirm) ;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;; -(define-key icejam-keys-mode-map [home] 'beginning-of-line) -(define-key icejam-keys-mode-map [end] 'end-of-line) +(define-key +custom-keys-mode-map [home] 'beginning-of-line) +(define-key +custom-keys-mode-map [end] 'end-of-line) -(provide 'icejam-pkg-keys-mode) +(provide '+custom-pkg-keys-mode) ;;; keys-mode.el ends here diff --git a/pkg/lsp.el b/pkg/lsp.el index f8a4b0d..84046ab 100644 --- a/pkg/lsp.el +++ b/pkg/lsp.el @@ -71,5 +71,5 @@ :defer t :requires (lsp-mode lsp-ui)) -(provide 'icejam-pkg-lsp) +(provide '+custom-pkg-lsp) ;;; lsp.el ends here diff --git a/pkg/macros.el b/pkg/macros.el index e0bde9f..cd3828c 100644 --- a/pkg/macros.el +++ b/pkg/macros.el @@ -9,5 +9,5 @@ (setq result (append (list (car form) result) (cdr form)))))) -(provide 'icejam-pkg-macros) +(provide '+custom-pkg-macros) ;;; macros ends here diff --git a/pkg/magit.el b/pkg/magit.el index b1a3af3..a1f186c 100644 --- a/pkg/magit.el +++ b/pkg/magit.el @@ -11,5 +11,5 @@ (:map magit-blame-mode-map (" b" . 'magit-blame-quit))) -(provide 'icejam-pkg-magit) +(provide '+custom-pkg-magit) ;;; magit.el ends here diff --git a/pkg/persp.el b/pkg/persp.el index eea94ac..0d05bae 100644 --- a/pkg/persp.el +++ b/pkg/persp.el @@ -29,5 +29,5 @@ (unbind-key "C-x x " persp-mode-map) (unbind-key "C-x x C-x x" persp-mode-map)) -(provide 'icejam-pkg-persp) +(provide '+custom-pkg-persp) ;;; persp.el ends here diff --git a/pkg/prog-mode.el b/pkg/prog-mode.el index c24cdca..6072859 100644 --- a/pkg/prog-mode.el +++ b/pkg/prog-mode.el @@ -79,5 +79,5 @@ :straight t :defer t) -(provide 'icejam-pkg-prog-mode) +(provide '+custom-pkg-prog-mode) ;;; prog-mode ends here diff --git a/pkg/projectile.el b/pkg/projectile.el index 192a9c1..db44923 100644 --- a/pkg/projectile.el +++ b/pkg/projectile.el @@ -20,5 +20,5 @@ (projectile-mode t) -(provide 'icejam-pkg-projectile) +(provide '+custom-pkg-projectile) ;;; projectile.el ends here diff --git a/pkg/sys-specific.el b/pkg/sys-specific.el index 0202777..0c9e1d1 100644 --- a/pkg/sys-specific.el +++ b/pkg/sys-specific.el @@ -7,9 +7,9 @@ (defconst IS-BSD (eq system-type 'berkeley-unix)) (defconst IS-GNU (eq system-type 'gnu/linux)) -(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") +(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") -(defun icejam-delete-window () +(defun +custom-function-delete-window () "Kill a window." (interactive) (delete-window)) @@ -31,20 +31,20 @@ (setq mac-command-modifier 'meta)))) ;;;;;;;;; Mac binding (fix) ;;;;;;;;;;;;;;;;;; - (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 (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 [(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 w)] 'icejam-delete-window) - (define-key icejam-keys-mode-map [(hyper z)] 'undo) - (define-key icejam-keys-mode-map [(hyper q)] 'kill-emacs) + (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 w)] '+delete-window) + (define-key +custom-keys-mode-map [(hyper z)] 'undo) + (define-key +custom-keys-mode-map [(hyper q)] 'kill-emacs) ;; Disable meta on right alt (useful for Polish characters) (setq mac-right-option-modifier nil))) @@ -53,28 +53,28 @@ (if IS-GNU (progn ;;;;;;;;; Linux Ergo bindings (fix) ;;;;;;;;;;;;;;;;;; - (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))) + (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))) ;;;;;;;;; BSD-specific config ;;;;;;;;;;;;;;;;;;;;; (if IS-BSD (progn - (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-") '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-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" 'icejam-delete-window) - (define-key icejam-keys-mode-map (kbd "A-z") 'undo) - (define-key icejam-keys-mode-map (kbd "A-q") 'kill-emacs)))) + (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)))) -(provide 'icejam-pkg-sys-specific) +(provide '+custom-pkg-sys-specific) ;;; sys-specific.el ends here diff --git a/pkg/term.el b/pkg/term.el index 6b1f4a4..5deb115 100644 --- a/pkg/term.el +++ b/pkg/term.el @@ -9,7 +9,7 @@ ;; Proper terminal in Emacs ;;; Code: -(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") +(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") (use-package vterm :straight t :defer t) @@ -19,7 +19,7 @@ (interactive) (vterm)) -(define-key icejam-keys-mode-map (kbd "") 'start-term) +(define-key +custom-keys-mode-map (kbd "") 'start-term) -(provide 'icejam-pkg-term) +(provide '+custom-pkg-term) ;;; term.el ends here diff --git a/pkg/undo-tree.el b/pkg/undo-tree.el index ca02d89..036b197 100644 --- a/pkg/undo-tree.el +++ b/pkg/undo-tree.el @@ -22,5 +22,5 @@ (global-undo-tree-mode t) -(provide 'icejam-pkg-undo-tree) +(provide '+custom-pkg-undo-tree) ;;; undo-tree.el ends here diff --git a/themes/themes.el b/themes/themes.el index ff7d47c..b51b418 100644 --- a/themes/themes.el +++ b/themes/themes.el @@ -72,5 +72,5 @@ :foreground (face-foreground 'default) :background (face-background 'default)) -(provide 'icejam-themes) +(provide '+custom-themes) ;;; themes.el ends here