Move lang files

lisp/icejam-custom-init.el

@@ -30,11 +30,10 @@
 
 (straight-use-package 'use-package)
 
-;; I don't know why this needs to be here and with a lisp specifier, but
+;; I don't know why this needs to be here and with a lisp directory, but
 ;; normal subdirs.el file doesn't work.
-(normal-top-level-add-to-load-path '("lisp/themes" "lisp/langs"))
+(add-to-list 'load-path (concat user-emacs-directory "lisp/themes"))
-
+(add-to-list 'load-path (concat user-emacs-directory "lisp/langs"))
-;; (add-to-list 'load-path (concat user-emacs-directory "pkg"))
 
 ;; General configuration files.
 (require 'icejam-keys-mode)
@@ -60,32 +59,32 @@
 (require 'icejam-fonts)
 
 ;; Actual supported languages and file syntax.
-(require '+custom-lang-clang "$HOME/.emacs.d/lang/clang.el")
+(require 'icejam-lang-clang)
-(require '+custom-lang-clojure "$HOME/.emacs.d/lang/clojure.el")
+(require 'icejam-lang-clojure)
-(require '+custom-lang-common-lisp "$HOME/.emacs.d/lang/common-lisp.el")
+(require 'icejam-lang-common-lisp)
-(require '+custom-lang-dart "$HOME/.emacs.d/lang/dart.el")
+(require 'icejam-lang-dart)
-(require '+custom-lang-dhall "$HOME/.emacs.d/lang/dhall.el")
+(require 'icejam-lang-dhall)
-(require '+custom-lang-elisp "$HOME/.emacs.d/lang/elisp.el")
+(require 'icejam-lang-elisp)
-(require '+custom-lang-elixir "$HOME/.emacs.d/lang/elixir.el")
+(require 'icejam-lang-elixir)
-(require '+custom-lang-erlang "$HOME/.emacs.d/lang/erlang.el")
+(require 'icejam-lang-erlang)
-(require '+custom-lang-fsharp "$HOME/.emacs.d/lang/fsharp.el")
+(require 'icejam-lang-fsharp)
-(require '+custom-lang-gleam "$HOME/.emacs.d/lang/gleam.el")
+(require 'icejam-lang-gleam)
-(require '+custom-lang-golang "$HOME/.emacs.d/lang/golang.el")
+(require 'icejam-lang-golang)
-(require '+custom-lang-haskell "$HOME/.emacs.d/lang/haskell.el")
+(require 'icejam-lang-haskell)
-(require '+custom-lang-javascript "$HOME/.emacs.d/lang/javascript.el")
+(require 'icejam-lang-javascript)
-(require '+custom-lang-kotlin "$HOME/.emacs.d/lang/kotlin.el")
+(require 'icejam-lang-kotlin)
-(require '+custom-lang-lean "$HOME/.emacs.d/lang/lean.el")
+(require 'icejam-lang-lean)
-(require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el")
+(require 'icejam-lang-markdown)
-(require '+custom-lang-ocaml "$HOME/.emacs.d/lang/ocaml.el")
+(require 'icejam-lang-ocaml)
-(require '+custom-lang-other "$HOME/.emacs.d/lang/other.el")
+(require 'icejam-lang-other)
-(require '+custom-lang-php "$HOME/.emacs.d/lang/php.el")
+(require 'icejam-lang-php)
-(require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el")
+(require 'icejam-lang-purescript)
-(require '+custom-lang-python "$HOME/.emacs.d/lang/python.el")
+(require 'icejam-lang-python)
-(require '+custom-lang-ruby "$HOME/.emacs.d/lang/ruby.el")
+(require 'icejam-lang-ruby)
-(require '+custom-lang-rust "$HOME/.emacs.d/lang/rust.el")
+(require 'icejam-lang-rust)
-(require '+custom-lang-sh "$HOME/.emacs.d/lang/sh.el")
+(require 'icejam-lang-sh)
-(require '+custom-lang-web "$HOME/.emacs.d/lang/web.el")
+(require 'icejam-lang-web)
-(require '+custom-lang-ziglang "$HOME/.emacs.d/lang/ziglang.el")
+(require 'icejam-lang-ziglang)
 
 ;; Diminish modeline litter
 (require 'icejam-diminish)

lisp/langs/icejam-lang-clang.el

@@ -24,5 +24,5 @@
 
 (add-hook 'c-mode-hook '+custom-lang-clang/activate-clang-mode)
 
-(provide '+custom-lang-clang)
+(provide 'icejam-lang-clang)
-;;; clang.el ends here
+;;; icejam-lang-clang.el ends here

lisp/langs/icejam-lang-clojure.el

@@ -59,5 +59,5 @@
 (add-hook 'cider-repl-mode-hook '+custom-lang-clojure/clj-repl-config)
 (add-hook 'cider-mode-hook #'cider-company-enable-fuzzy-completion)
 
-(provide '+custom-lang-clojure)
+(provide 'icejam-lang-clojure)
-;;; clojure.el ends here
+;;; icejam-lang-clojure.el ends here

lisp/langs/icejam-lang-common-lisp.el

@@ -19,5 +19,5 @@
 (setq inferior-lisp-program "sbcl")
 (slime-setup '(slime-fancy slime-company slime-quicklisp slime-asdf))
 
-(provide '+custom-lang-common-lisp)
+(provide 'icejam-lang-common-lisp)
-;;; common-lisp.el ends here
+;;; icejam-lang-common-lisp.el ends here

lisp/langs/icejam-lang-dart.el

@@ -13,5 +13,5 @@
 
 (add-hook 'dart-mode-hook '+custom-lang-dart/activate-dart-mode)
 
-(provide '+custom-lang-dart)
+(provide 'icejam-lang-dart)
-;;; dart.el ends here
+;;; icejam-lang-dart.el ends here

lisp/langs/icejam-lang-dhall.el

@@ -13,5 +13,5 @@
 (add-hook 'dhall-mode-hook '+custom-lang-dhall/activate-dhall-mode)
 (add-hook 'dhall-mode-hook 'display-line-numbers-mode)
 
-(provide '+custom-lang-dhall)
+(provide 'icejam-lang-dhall)
-;;; dhall.el ends here
+;;; icejam-lang-dhall.el ends here

lisp/langs/icejam-lang-elisp.el

@@ -29,5 +29,5 @@
 
 (add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode)
 
-(provide '+custom-lang-elisp)
+(provide 'icejam-lang-elisp)
-;;; elisp.el ends here
+;;; icejam-lang-elisp.el ends here

lisp/langs/icejam-lang-elixir.el

@@ -46,5 +46,5 @@
 
 (add-hook 'elixir-ts-mode-hook '+custom-lang-elixir/activate-elixir-ts-mode)
 
-(provide '+custom-lang-elixir)
+(provide 'icejam-lang-elixir)
-;;; elixir.el ends here
+;;; icejam-lang-elixir.el ends here

lisp/langs/icejam-lang-erlang.el

@@ -99,5 +99,5 @@
 
 (add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode)
 
-(provide '+custom-lang-erlang)
+(provide 'icejam-lang-erlang)
-;;; erlang.el ends here
+;;; icejam-lang-erlang.el ends here

lisp/langs/icejam-lang-fsharp.el

@@ -30,5 +30,5 @@
 
 (add-hook 'fsharp-mode-hook 'activate-fsharp-mode)
 
-(provide '+custom-lang-fsharp)
+(provide 'icejam-lang-fsharp)
-;;; fsharp.el ends here
+;;; icejam-lang-fsharp.el ends here

lisp/langs/icejam-lang-gleam.el

@@ -27,5 +27,5 @@
 
 (add-hook 'gleam-mode-hook '+custom-lang-gleam/activate-gleam-mode)
 
-(provide '+custom-lang-gleam)
+(provide 'icejam-lang-gleam)
-;;; gleam.el ends here
+;;; icejam-lang-gleam.el ends here

lisp/langs/icejam-lang-golang.el

@@ -24,5 +24,5 @@
 
 (add-hook 'go-mode-hook 'activate-golang-mode)
 
-(provide '+custom-lang-golang)
+(provide 'icejam-lang-golang)
-;;; golang.el ends here
+;;; icejam-lang-golang.el ends here

lisp/langs/icejam-lang-haskell.el

@@ -33,5 +33,5 @@
 
 (add-hook 'haskell-mode-hook 'activate-haskell-mode)
 
-(provide '+custom-lang-haskell)
+(provide 'icejam-lang-haskell)
-;;; haskell.el ends here
+;;; icejam-lang-haskell.el ends here

lisp/langs/icejam-lang-javascript.el

@@ -43,5 +43,5 @@
 
 (add-hook 'js2-mode-hook 'activate-js2-mode)
 
-(provide '+custom-lang-javascript)
+(provide 'icejam-lang-javascript)
-;;; javascript.el ends here
+;;; icejam-lang-javascript.el ends here

lisp/langs/icejam-lang-kotlin.el

@@ -30,5 +30,5 @@
 
 (add-hook 'kotlin-mode-hook 'activate-kotlin-mode)
 
-(provide '+custom-lang-kotlin)
+(provide 'icejam-lang-kotlin)
-;;; kotlin.el ends here
+;;; icejam-lang-kotlin.el ends here

lisp/langs/icejam-lang-lean.el

@@ -27,5 +27,5 @@
 
 (add-hook 'lean4-mode-hook 'activate-lean-mode)
 
-(provide '+custom-lang-lean)
+(provide 'icejam-lang-lean)
-;;; lean.el ends here
+;;; icejam-lang-lean.el ends here

lisp/langs/icejam-lang-markdown.el

@@ -24,5 +24,5 @@
 (add-hook 'markdown-mode-hook '+custom-lang-markdown/activate-markdown-mode)
 (add-hook 'markdown-mode-hook 'display-line-numbers-mode)
 
-(provide '+custom-lang-markdown)
+(provide 'icejam-lang-markdown)
-;;; markdown.el ends here
+;;; icejam-lang-markdown.el ends here

lisp/langs/icejam-lang-ocaml.el

@@ -91,5 +91,5 @@
 (add-hook 'reason-mode-hook 'custom-lang-ocaml/activate-reason-mode)
 (add-hook 'reason-mode-hook 'merlin-mode)
 
-(provide '+custom-lang-ocaml)
+(provide 'icejam-lang-ocaml)
-;;; ocaml.el ends here
+;;; icejam-lang-ocaml.el ends here

lisp/langs/icejam-lang-other.el

@@ -38,5 +38,5 @@
   :hook ((gitignore-mode . whitespace-mode)
          (before-save . whitespace-cleanup)))
 
-(provide '+custom-lang-other)
+(provide 'icejam-lang-other)
-;;; other.el ends here
+;;; icejam-lang-other.el ends here

lisp/langs/icejam-lang-php.el

@@ -45,5 +45,5 @@
 
 (add-hook 'php-mode-hook '+custom-lang-php/activate-php-mode)
 
-(provide '+custom-lang-php)
+(provide 'icejam-lang-php)
-;;; php.el ends here
+;;; icejam-lang-php.el ends here

lisp/langs/icejam-lang-purescript.el

@@ -27,5 +27,5 @@
 
 (add-hook 'purescript-mode-hook 'activate-purescript-mode)
 
-(provide '+custom-lang-purescript)
+(provide 'icejam-lang-purescript)
-;;; purescript.el ends here
+;;; icejam-lang-purescript.el ends here

lisp/langs/icejam-lang-python.el

@@ -32,5 +32,5 @@
 
 (add-hook 'python-mode-hook '+custom-lang-python/activate-python-mode)
 
-(provide '+custom-lang-python)
+(provide 'icejam-lang-python)
-;;; python.el ends here
+;;; icejam-lang-python.el ends here

lisp/langs/icejam-lang-ruby.el

@@ -36,5 +36,5 @@
 (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
 ;; (add-hook 'enh-ruby-mode-hook 'lsp-deferred)
 
-(provide '+custom-lang-ruby)
+(provide 'icejam-lang-ruby)
-;;; ruby.el ends here
+;;; icejam-lang-ruby.el ends here

lisp/langs/icejam-lang-rust.el

@@ -29,5 +29,5 @@
 (add-hook 'rust-mode-hook 'activate-rust-mode)
 (add-hook 'rust-mode-hook 'flycheck-rust-setup)
 
-(provide '+custom-lang-rust)
+(provide 'icejam-lang-rust)
-;;; rust.el ends here
+;;; icejam-lang-rust.el ends here

lisp/langs/icejam-lang-sh.el

@@ -9,5 +9,5 @@
 (add-to-list 'auto-mode-alist '("\\.zshrc\\'" . sh-mode))
 (add-to-list 'auto-mode-alist '("\\.envrc\\'" . sh-mode))
 
-(provide '+custom-lang-sh)
+(provide 'icejam-lang-sh)
-;;; sh.el ends here
+;;; icejam-lang-sh.el ends here

lisp/langs/icejam-lang-web.el

@@ -46,5 +46,5 @@
 
 (add-hook 'web-mode-hook 'activate-web-mode)
 
-(provide '+custom-lang-web)
+(provide 'icejam-lang-web)
-;;; web.el ends here
+;;; icejam-lang-web.el ends here

lisp/langs/icejam-lang-ziglang.el

@@ -25,5 +25,5 @@
 
 (add-hook 'zig-mode-hook 'activate-zig-mode)
 
-(provide '+custom-lang-ziglang)
+(provide 'icejam-lang-ziglang)
-;;; ziglang.el ends here
+;;; icejam-lang-ziglang.el ends here