diff --git a/lang/clang.el b/lang/clang.el index a75bda4..8335569 100644 --- a/lang/clang.el +++ b/lang/clang.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (defun +custom-lang-clang/activate-clang-mode () "Goodies for editing c files." diff --git a/lang/clojure.el b/lang/clojure.el index 1cb8c2b..64a3e3e 100644 --- a/lang/clojure.el +++ b/lang/clojure.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-transient) (use-package clojure-mode :defer t :straight t) diff --git a/lang/common-lisp.el b/lang/common-lisp.el index 3ea6c09..1ad5a2f 100644 --- a/lang/common-lisp.el +++ b/lang/common-lisp.el @@ -8,7 +8,7 @@ ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-company-yasnippet) (use-package slime :straight t) diff --git a/lang/dart.el b/lang/dart.el index d7aff77..ae8de6e 100644 --- a/lang/dart.el +++ b/lang/dart.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package dart-mode :straight t :defer t) (use-package lsp-dart :defer t :straight t :requires (dart-mode lsp)) diff --git a/lang/dhall.el b/lang/dhall.el index 6199e1d..e70a604 100644 --- a/lang/dhall.el +++ b/lang/dhall.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package dhall-mode :straight t :defer t :requires (lsp)) diff --git a/lang/elisp.el b/lang/elisp.el index ac4c49c..975aae2 100644 --- a/lang/elisp.el +++ b/lang/elisp.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (transient-define-prefix +custom-lang-elisp/transient-context-menu () "Elisp Buffer Commands." diff --git a/lang/elixir.el b/lang/elixir.el index 6db37ec..e28d472 100644 --- a/lang/elixir.el +++ b/lang/elixir.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-flycheck) (require 'icejam-transient) diff --git a/lang/erlang.el b/lang/erlang.el index 8ba6539..9cb35bb 100644 --- a/lang/erlang.el +++ b/lang/erlang.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-lsp) (require 'icejam-projectile) diff --git a/lang/fsharp.el b/lang/fsharp.el index a117abc..db023aa 100644 --- a/lang/fsharp.el +++ b/lang/fsharp.el @@ -10,7 +10,7 @@ ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-lsp) (use-package fsharp-mode diff --git a/lang/gleam.el b/lang/gleam.el index 4e9dcd6..bff82cd 100644 --- a/lang/gleam.el +++ b/lang/gleam.el @@ -10,7 +10,7 @@ ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package gleam-mode :requires (tree-sitter-indent lsp column-enforce-mode) diff --git a/lang/golang.el b/lang/golang.el index 8bee585..dc322f6 100644 --- a/lang/golang.el +++ b/lang/golang.el @@ -10,7 +10,7 @@ ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package go-mode :requires (lsp-mode lsp-ui) diff --git a/lang/haskell.el b/lang/haskell.el index e44d7db..1b376db 100644 --- a/lang/haskell.el +++ b/lang/haskell.el @@ -10,7 +10,7 @@ ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package haskell-mode :straight t diff --git a/lang/javascript.el b/lang/javascript.el index 3c3dbd0..3df2dae 100644 --- a/lang/javascript.el +++ b/lang/javascript.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-flycheck) (require 'icejam-lsp) diff --git a/lang/lean.el b/lang/lean.el index 22efc56..1fb0cff 100644 --- a/lang/lean.el +++ b/lang/lean.el @@ -2,7 +2,8 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) +(require 'icejam-lsp) (use-package lean4-mode :straight (lean4-mode diff --git a/lang/markdown.el b/lang/markdown.el index 4dc1877..b3117ca 100644 --- a/lang/markdown.el +++ b/lang/markdown.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package markdown-mode :straight t diff --git a/lang/php.el b/lang/php.el index d1e4040..10eda5e 100644 --- a/lang/php.el +++ b/lang/php.el @@ -10,7 +10,7 @@ ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-flycheck) (require 'icejam-transient) diff --git a/lang/python.el b/lang/python.el index e4bc731..5187ab4 100644 --- a/lang/python.el +++ b/lang/python.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-transient) (transient-define-prefix +custom-lang-python/transient-context-menu () diff --git a/lang/ruby.el b/lang/ruby.el index 99a9682..663067e 100644 --- a/lang/ruby.el +++ b/lang/ruby.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-projectile) (use-package rspec-mode :straight t :defer t) diff --git a/lang/rust.el b/lang/rust.el index 97f2ec4..61026de 100644 --- a/lang/rust.el +++ b/lang/rust.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package rust-mode :straight t diff --git a/lang/ziglang.el b/lang/ziglang.el index ba4d06b..272f348 100644 --- a/lang/ziglang.el +++ b/lang/ziglang.el @@ -9,7 +9,7 @@ ;; ziglang does a thing. ;;; Code: -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (use-package zig-mode :straight t :defer t :requires (lsp)) diff --git a/lisp/icejam-init.el b/lisp/icejam-custom-init.el similarity index 95% rename from lisp/icejam-init.el rename to lisp/icejam-custom-init.el index f8a5460..97986db 100644 --- a/lisp/icejam-init.el +++ b/lisp/icejam-custom-init.el @@ -1,4 +1,4 @@ -;;; +custom-init.el --- summary +;;; icejam-custom-init.el --- summary ;; Author: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk @@ -39,7 +39,7 @@ (require 'icejam-ivy) (require 'icejam-avy) (require 'icejam-transient) -(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'icejam-prog-mode) (require 'icejam-company-yasnippet) (require 'icejam-flycheck) (require 'icejam-projectile) @@ -90,5 +90,5 @@ (setq gc-cons-threshold 100000000) (setq gc-cons-percentage 0.1) -(provide 'icejam-init) -;;; icejam-init.el ends here +(provide 'icejam-custom-init) +;;; icejam-custom-init.el ends here diff --git a/pkg/prog-mode.el b/lisp/icejam-prog-mode.el similarity index 94% rename from pkg/prog-mode.el rename to lisp/icejam-prog-mode.el index f8dd04a..2b2528d 100644 --- a/pkg/prog-mode.el +++ b/lisp/icejam-prog-mode.el @@ -1,4 +1,4 @@ -;;; pkg/prog-mode -- summary -*- lexical-binding: t; -*- +;;; icejam-prog-mode.el -- summary -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -77,5 +77,5 @@ ;; Vim-like regex replace with preview in buffer. (use-package visual-regexp :straight t :defer t) -(provide '+custom-pkg-prog-mode) -;;; prog-mode ends here +(provide 'icejam-prog-mode) +;;; icejam-prog-mode ends here diff --git a/lisp/icejam-projectile.el b/lisp/icejam-projectile.el index a60d176..56f1777 100644 --- a/lisp/icejam-projectile.el +++ b/lisp/icejam-projectile.el @@ -1,4 +1,4 @@ -;;; pkg/projectile -- summary -*- lexical-binding: t; -*- +;;; icejam-projectile.el -- summary -*- lexical-binding: t; -*- ;;; Commentary: ;;; Project management based on git repos ;;; Code: