From 1f20dd7bc12814e30d590aa5aa9c1fe03d54d75d Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sat, 27 Jul 2024 10:52:59 +0300 Subject: [PATCH] Move lang files --- lisp/icejam-custom-init.el | 59 +++++++++---------- .../langs/icejam-lang-clang.el | 4 +- .../langs/icejam-lang-clojure.el | 4 +- .../langs/icejam-lang-common-lisp.el | 4 +- .../dart.el => lisp/langs/icejam-lang-dart.el | 4 +- .../langs/icejam-lang-dhall.el | 4 +- .../langs/icejam-lang-elisp.el | 4 +- .../langs/icejam-lang-elixir.el | 4 +- .../langs/icejam-lang-erlang.el | 4 +- .../langs/icejam-lang-fsharp.el | 4 +- .../langs/icejam-lang-gleam.el | 4 +- .../langs/icejam-lang-golang.el | 4 +- .../langs/icejam-lang-haskell.el | 4 +- .../langs/icejam-lang-javascript.el | 4 +- .../langs/icejam-lang-kotlin.el | 4 +- .../lean.el => lisp/langs/icejam-lang-lean.el | 4 +- .../langs/icejam-lang-markdown.el | 4 +- .../langs/icejam-lang-ocaml.el | 4 +- .../langs/icejam-lang-other.el | 4 +- lang/php.el => lisp/langs/icejam-lang-php.el | 4 +- .../langs/icejam-lang-purescript.el | 4 +- .../langs/icejam-lang-python.el | 4 +- .../ruby.el => lisp/langs/icejam-lang-ruby.el | 4 +- .../rust.el => lisp/langs/icejam-lang-rust.el | 4 +- lang/sh.el => lisp/langs/icejam-lang-sh.el | 4 +- lang/web.el => lisp/langs/icejam-lang-web.el | 4 +- .../langs/icejam-lang-ziglang.el | 4 +- 27 files changed, 81 insertions(+), 82 deletions(-) rename lang/clang.el => lisp/langs/icejam-lang-clang.el (91%) rename lang/clojure.el => lisp/langs/icejam-lang-clojure.el (96%) rename lang/common-lisp.el => lisp/langs/icejam-lang-common-lisp.el (85%) rename lang/dart.el => lisp/langs/icejam-lang-dart.el (86%) rename lang/dhall.el => lisp/langs/icejam-lang-dhall.el (86%) rename lang/elisp.el => lisp/langs/icejam-lang-elisp.el (93%) rename lang/elixir.el => lisp/langs/icejam-lang-elixir.el (96%) rename lang/erlang.el => lisp/langs/icejam-lang-erlang.el (98%) rename lang/fsharp.el => lisp/langs/icejam-lang-fsharp.el (90%) rename lang/gleam.el => lisp/langs/icejam-lang-gleam.el (91%) rename lang/golang.el => lisp/langs/icejam-lang-golang.el (86%) rename lang/haskell.el => lisp/langs/icejam-lang-haskell.el (91%) rename lang/javascript.el => lisp/langs/icejam-lang-javascript.el (94%) rename lang/kotlin.el => lisp/langs/icejam-lang-kotlin.el (89%) rename lang/lean.el => lisp/langs/icejam-lang-lean.el (90%) rename lang/markdown.el => lisp/langs/icejam-lang-markdown.el (92%) rename lang/ocaml.el => lisp/langs/icejam-lang-ocaml.el (97%) rename lang/other.el => lisp/langs/icejam-lang-other.el (94%) rename lang/php.el => lisp/langs/icejam-lang-php.el (94%) rename lang/purescript.el => lisp/langs/icejam-lang-purescript.el (89%) rename lang/python.el => lisp/langs/icejam-lang-python.el (93%) rename lang/ruby.el => lisp/langs/icejam-lang-ruby.el (94%) rename lang/rust.el => lisp/langs/icejam-lang-rust.el (90%) rename lang/sh.el => lisp/langs/icejam-lang-sh.el (85%) rename lang/web.el => lisp/langs/icejam-lang-web.el (95%) rename lang/ziglang.el => lisp/langs/icejam-lang-ziglang.el (87%) diff --git a/lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el index be9f261..7c4bc6d 100644 --- a/lisp/icejam-custom-init.el +++ b/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 "pkg")) +(add-to-list 'load-path (concat user-emacs-directory "lisp/themes")) +(add-to-list 'load-path (concat user-emacs-directory "lisp/langs")) ;; 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 '+custom-lang-clojure "$HOME/.emacs.d/lang/clojure.el") -(require '+custom-lang-common-lisp "$HOME/.emacs.d/lang/common-lisp.el") -(require '+custom-lang-dart "$HOME/.emacs.d/lang/dart.el") -(require '+custom-lang-dhall "$HOME/.emacs.d/lang/dhall.el") -(require '+custom-lang-elisp "$HOME/.emacs.d/lang/elisp.el") -(require '+custom-lang-elixir "$HOME/.emacs.d/lang/elixir.el") -(require '+custom-lang-erlang "$HOME/.emacs.d/lang/erlang.el") -(require '+custom-lang-fsharp "$HOME/.emacs.d/lang/fsharp.el") -(require '+custom-lang-gleam "$HOME/.emacs.d/lang/gleam.el") -(require '+custom-lang-golang "$HOME/.emacs.d/lang/golang.el") -(require '+custom-lang-haskell "$HOME/.emacs.d/lang/haskell.el") -(require '+custom-lang-javascript "$HOME/.emacs.d/lang/javascript.el") -(require '+custom-lang-kotlin "$HOME/.emacs.d/lang/kotlin.el") -(require '+custom-lang-lean "$HOME/.emacs.d/lang/lean.el") -(require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el") -(require '+custom-lang-ocaml "$HOME/.emacs.d/lang/ocaml.el") -(require '+custom-lang-other "$HOME/.emacs.d/lang/other.el") -(require '+custom-lang-php "$HOME/.emacs.d/lang/php.el") -(require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el") -(require '+custom-lang-python "$HOME/.emacs.d/lang/python.el") -(require '+custom-lang-ruby "$HOME/.emacs.d/lang/ruby.el") -(require '+custom-lang-rust "$HOME/.emacs.d/lang/rust.el") -(require '+custom-lang-sh "$HOME/.emacs.d/lang/sh.el") -(require '+custom-lang-web "$HOME/.emacs.d/lang/web.el") -(require '+custom-lang-ziglang "$HOME/.emacs.d/lang/ziglang.el") +(require 'icejam-lang-clang) +(require 'icejam-lang-clojure) +(require 'icejam-lang-common-lisp) +(require 'icejam-lang-dart) +(require 'icejam-lang-dhall) +(require 'icejam-lang-elisp) +(require 'icejam-lang-elixir) +(require 'icejam-lang-erlang) +(require 'icejam-lang-fsharp) +(require 'icejam-lang-gleam) +(require 'icejam-lang-golang) +(require 'icejam-lang-haskell) +(require 'icejam-lang-javascript) +(require 'icejam-lang-kotlin) +(require 'icejam-lang-lean) +(require 'icejam-lang-markdown) +(require 'icejam-lang-ocaml) +(require 'icejam-lang-other) +(require 'icejam-lang-php) +(require 'icejam-lang-purescript) +(require 'icejam-lang-python) +(require 'icejam-lang-ruby) +(require 'icejam-lang-rust) +(require 'icejam-lang-sh) +(require 'icejam-lang-web) +(require 'icejam-lang-ziglang) ;; Diminish modeline litter (require 'icejam-diminish) diff --git a/lang/clang.el b/lisp/langs/icejam-lang-clang.el similarity index 91% rename from lang/clang.el rename to lisp/langs/icejam-lang-clang.el index 8335569..781b942 100644 --- a/lang/clang.el +++ b/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) -;;; clang.el ends here +(provide 'icejam-lang-clang) +;;; icejam-lang-clang.el ends here diff --git a/lang/clojure.el b/lisp/langs/icejam-lang-clojure.el similarity index 96% rename from lang/clojure.el rename to lisp/langs/icejam-lang-clojure.el index 64a3e3e..52418de 100644 --- a/lang/clojure.el +++ b/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) -;;; clojure.el ends here +(provide 'icejam-lang-clojure) +;;; icejam-lang-clojure.el ends here diff --git a/lang/common-lisp.el b/lisp/langs/icejam-lang-common-lisp.el similarity index 85% rename from lang/common-lisp.el rename to lisp/langs/icejam-lang-common-lisp.el index 1ad5a2f..ae737e9 100644 --- a/lang/common-lisp.el +++ b/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) -;;; common-lisp.el ends here +(provide 'icejam-lang-common-lisp) +;;; icejam-lang-common-lisp.el ends here diff --git a/lang/dart.el b/lisp/langs/icejam-lang-dart.el similarity index 86% rename from lang/dart.el rename to lisp/langs/icejam-lang-dart.el index ae8de6e..e4b3f46 100644 --- a/lang/dart.el +++ b/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) -;;; dart.el ends here +(provide 'icejam-lang-dart) +;;; icejam-lang-dart.el ends here diff --git a/lang/dhall.el b/lisp/langs/icejam-lang-dhall.el similarity index 86% rename from lang/dhall.el rename to lisp/langs/icejam-lang-dhall.el index e70a604..3f19c22 100644 --- a/lang/dhall.el +++ b/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) -;;; dhall.el ends here +(provide 'icejam-lang-dhall) +;;; icejam-lang-dhall.el ends here diff --git a/lang/elisp.el b/lisp/langs/icejam-lang-elisp.el similarity index 93% rename from lang/elisp.el rename to lisp/langs/icejam-lang-elisp.el index 975aae2..b17fd55 100644 --- a/lang/elisp.el +++ b/lisp/langs/icejam-lang-elisp.el @@ -29,5 +29,5 @@ (add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode) -(provide '+custom-lang-elisp) -;;; elisp.el ends here +(provide 'icejam-lang-elisp) +;;; icejam-lang-elisp.el ends here diff --git a/lang/elixir.el b/lisp/langs/icejam-lang-elixir.el similarity index 96% rename from lang/elixir.el rename to lisp/langs/icejam-lang-elixir.el index e28d472..a163a62 100644 --- a/lang/elixir.el +++ b/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) -;;; elixir.el ends here +(provide 'icejam-lang-elixir) +;;; icejam-lang-elixir.el ends here diff --git a/lang/erlang.el b/lisp/langs/icejam-lang-erlang.el similarity index 98% rename from lang/erlang.el rename to lisp/langs/icejam-lang-erlang.el index 9cb35bb..fae1e92 100644 --- a/lang/erlang.el +++ b/lisp/langs/icejam-lang-erlang.el @@ -99,5 +99,5 @@ (add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode) -(provide '+custom-lang-erlang) -;;; erlang.el ends here +(provide 'icejam-lang-erlang) +;;; icejam-lang-erlang.el ends here diff --git a/lang/fsharp.el b/lisp/langs/icejam-lang-fsharp.el similarity index 90% rename from lang/fsharp.el rename to lisp/langs/icejam-lang-fsharp.el index db023aa..646b41b 100644 --- a/lang/fsharp.el +++ b/lisp/langs/icejam-lang-fsharp.el @@ -30,5 +30,5 @@ (add-hook 'fsharp-mode-hook 'activate-fsharp-mode) -(provide '+custom-lang-fsharp) -;;; fsharp.el ends here +(provide 'icejam-lang-fsharp) +;;; icejam-lang-fsharp.el ends here diff --git a/lang/gleam.el b/lisp/langs/icejam-lang-gleam.el similarity index 91% rename from lang/gleam.el rename to lisp/langs/icejam-lang-gleam.el index bff82cd..4f177b7 100644 --- a/lang/gleam.el +++ b/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) -;;; gleam.el ends here +(provide 'icejam-lang-gleam) +;;; icejam-lang-gleam.el ends here diff --git a/lang/golang.el b/lisp/langs/icejam-lang-golang.el similarity index 86% rename from lang/golang.el rename to lisp/langs/icejam-lang-golang.el index dc322f6..23c67f6 100644 --- a/lang/golang.el +++ b/lisp/langs/icejam-lang-golang.el @@ -24,5 +24,5 @@ (add-hook 'go-mode-hook 'activate-golang-mode) -(provide '+custom-lang-golang) -;;; golang.el ends here +(provide 'icejam-lang-golang) +;;; icejam-lang-golang.el ends here diff --git a/lang/haskell.el b/lisp/langs/icejam-lang-haskell.el similarity index 91% rename from lang/haskell.el rename to lisp/langs/icejam-lang-haskell.el index 1b376db..ffc9e08 100644 --- a/lang/haskell.el +++ b/lisp/langs/icejam-lang-haskell.el @@ -33,5 +33,5 @@ (add-hook 'haskell-mode-hook 'activate-haskell-mode) -(provide '+custom-lang-haskell) -;;; haskell.el ends here +(provide 'icejam-lang-haskell) +;;; icejam-lang-haskell.el ends here diff --git a/lang/javascript.el b/lisp/langs/icejam-lang-javascript.el similarity index 94% rename from lang/javascript.el rename to lisp/langs/icejam-lang-javascript.el index 3df2dae..bdaf086 100644 --- a/lang/javascript.el +++ b/lisp/langs/icejam-lang-javascript.el @@ -43,5 +43,5 @@ (add-hook 'js2-mode-hook 'activate-js2-mode) -(provide '+custom-lang-javascript) -;;; javascript.el ends here +(provide 'icejam-lang-javascript) +;;; icejam-lang-javascript.el ends here diff --git a/lang/kotlin.el b/lisp/langs/icejam-lang-kotlin.el similarity index 89% rename from lang/kotlin.el rename to lisp/langs/icejam-lang-kotlin.el index 731b862..408c1a5 100644 --- a/lang/kotlin.el +++ b/lisp/langs/icejam-lang-kotlin.el @@ -30,5 +30,5 @@ (add-hook 'kotlin-mode-hook 'activate-kotlin-mode) -(provide '+custom-lang-kotlin) -;;; kotlin.el ends here +(provide 'icejam-lang-kotlin) +;;; icejam-lang-kotlin.el ends here diff --git a/lang/lean.el b/lisp/langs/icejam-lang-lean.el similarity index 90% rename from lang/lean.el rename to lisp/langs/icejam-lang-lean.el index 1fb0cff..055b764 100644 --- a/lang/lean.el +++ b/lisp/langs/icejam-lang-lean.el @@ -27,5 +27,5 @@ (add-hook 'lean4-mode-hook 'activate-lean-mode) -(provide '+custom-lang-lean) -;;; lean.el ends here +(provide 'icejam-lang-lean) +;;; icejam-lang-lean.el ends here diff --git a/lang/markdown.el b/lisp/langs/icejam-lang-markdown.el similarity index 92% rename from lang/markdown.el rename to lisp/langs/icejam-lang-markdown.el index b3117ca..c4edfd2 100644 --- a/lang/markdown.el +++ b/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) -;;; markdown.el ends here +(provide 'icejam-lang-markdown) +;;; icejam-lang-markdown.el ends here diff --git a/lang/ocaml.el b/lisp/langs/icejam-lang-ocaml.el similarity index 97% rename from lang/ocaml.el rename to lisp/langs/icejam-lang-ocaml.el index 54cba44..9f32e66 100644 --- a/lang/ocaml.el +++ b/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) -;;; ocaml.el ends here +(provide 'icejam-lang-ocaml) +;;; icejam-lang-ocaml.el ends here diff --git a/lang/other.el b/lisp/langs/icejam-lang-other.el similarity index 94% rename from lang/other.el rename to lisp/langs/icejam-lang-other.el index b20f12a..81b3f34 100644 --- a/lang/other.el +++ b/lisp/langs/icejam-lang-other.el @@ -38,5 +38,5 @@ :hook ((gitignore-mode . whitespace-mode) (before-save . whitespace-cleanup))) -(provide '+custom-lang-other) -;;; other.el ends here +(provide 'icejam-lang-other) +;;; icejam-lang-other.el ends here diff --git a/lang/php.el b/lisp/langs/icejam-lang-php.el similarity index 94% rename from lang/php.el rename to lisp/langs/icejam-lang-php.el index 10eda5e..e1a38fc 100644 --- a/lang/php.el +++ b/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) -;;; php.el ends here +(provide 'icejam-lang-php) +;;; icejam-lang-php.el ends here diff --git a/lang/purescript.el b/lisp/langs/icejam-lang-purescript.el similarity index 89% rename from lang/purescript.el rename to lisp/langs/icejam-lang-purescript.el index 10451cf..60b7305 100644 --- a/lang/purescript.el +++ b/lisp/langs/icejam-lang-purescript.el @@ -27,5 +27,5 @@ (add-hook 'purescript-mode-hook 'activate-purescript-mode) -(provide '+custom-lang-purescript) -;;; purescript.el ends here +(provide 'icejam-lang-purescript) +;;; icejam-lang-purescript.el ends here diff --git a/lang/python.el b/lisp/langs/icejam-lang-python.el similarity index 93% rename from lang/python.el rename to lisp/langs/icejam-lang-python.el index 5187ab4..5546c3e 100644 --- a/lang/python.el +++ b/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) -;;; python.el ends here +(provide 'icejam-lang-python) +;;; icejam-lang-python.el ends here diff --git a/lang/ruby.el b/lisp/langs/icejam-lang-ruby.el similarity index 94% rename from lang/ruby.el rename to lisp/langs/icejam-lang-ruby.el index 663067e..15fa6fb 100644 --- a/lang/ruby.el +++ b/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) -;;; ruby.el ends here +(provide 'icejam-lang-ruby) +;;; icejam-lang-ruby.el ends here diff --git a/lang/rust.el b/lisp/langs/icejam-lang-rust.el similarity index 90% rename from lang/rust.el rename to lisp/langs/icejam-lang-rust.el index 61026de..7f7e524 100644 --- a/lang/rust.el +++ b/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) -;;; rust.el ends here +(provide 'icejam-lang-rust) +;;; icejam-lang-rust.el ends here diff --git a/lang/sh.el b/lisp/langs/icejam-lang-sh.el similarity index 85% rename from lang/sh.el rename to lisp/langs/icejam-lang-sh.el index 3f239f3..e43033a 100644 --- a/lang/sh.el +++ b/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) -;;; sh.el ends here +(provide 'icejam-lang-sh) +;;; icejam-lang-sh.el ends here diff --git a/lang/web.el b/lisp/langs/icejam-lang-web.el similarity index 95% rename from lang/web.el rename to lisp/langs/icejam-lang-web.el index ae0b4b1..0469a2d 100644 --- a/lang/web.el +++ b/lisp/langs/icejam-lang-web.el @@ -46,5 +46,5 @@ (add-hook 'web-mode-hook 'activate-web-mode) -(provide '+custom-lang-web) -;;; web.el ends here +(provide 'icejam-lang-web) +;;; icejam-lang-web.el ends here diff --git a/lang/ziglang.el b/lisp/langs/icejam-lang-ziglang.el similarity index 87% rename from lang/ziglang.el rename to lisp/langs/icejam-lang-ziglang.el index 272f348..d28db07 100644 --- a/lang/ziglang.el +++ b/lisp/langs/icejam-lang-ziglang.el @@ -25,5 +25,5 @@ (add-hook 'zig-mode-hook 'activate-zig-mode) -(provide '+custom-lang-ziglang) -;;; ziglang.el ends here +(provide 'icejam-lang-ziglang) +;;; icejam-lang-ziglang.el ends here