diff --git a/user-lisp/icejam-agent-shell.el b/lisp/icejam-agent-shell.el similarity index 100% rename from user-lisp/icejam-agent-shell.el rename to lisp/icejam-agent-shell.el diff --git a/user-lisp/icejam-avy.el b/lisp/icejam-avy.el similarity index 100% rename from user-lisp/icejam-avy.el rename to lisp/icejam-avy.el diff --git a/user-lisp/icejam-base.el b/lisp/icejam-base.el similarity index 100% rename from user-lisp/icejam-base.el rename to lisp/icejam-base.el diff --git a/user-lisp/icejam-complete-at-point.el b/lisp/icejam-complete-at-point.el similarity index 96% rename from user-lisp/icejam-complete-at-point.el rename to lisp/icejam-complete-at-point.el index b7a2acf..4616716 100644 --- a/user-lisp/icejam-complete-at-point.el +++ b/lisp/icejam-complete-at-point.el @@ -3,18 +3,16 @@ ;;; Completion framework configuration ;;; Code: (eval-when-compile - (declare-function cape-capf-prefix-length 'cape) - (declare-function cape-capf-super 'cape) + (defvar corfu-terminal-mode 'corfu-terminal) (declare-function cape-dabbrev 'cape) - (declare-function cape-elisp-symbol 'cape) (declare-function cape-file 'cape) (declare-function cape-keyword 'cape) - (declare-function eglot-completion-at-point 'eglot) - (declare-function nerd-icons-corfu-formatter 'nerd-icons-corfu) + (declare-function cape-elisp-symbol 'cape) + (declare-function cape-capf-prefix-length 'cape) + (declare-function cape-capf-super 'cape) (declare-function yasnippet-capf 'yasnippet) - (defvar corfu-margin-formatters) - (defvar corfu-terminal-mode 'corfu-terminal) - (defvar yas-minor-mode-map)) + (declare-function nerd-icons-corfu-formatter 'nerd-icons-corfu) + (declare-function eglot-completion-at-point 'eglot)) (use-package yasnippet :ensure t :defer t :hook ((elpaca-after-init . yas-global-mode)) diff --git a/user-lisp/icejam-completing-read.el b/lisp/icejam-completing-read.el similarity index 97% rename from user-lisp/icejam-completing-read.el rename to lisp/icejam-completing-read.el index 4a0dd24..8e802b2 100644 --- a/user-lisp/icejam-completing-read.el +++ b/lisp/icejam-completing-read.el @@ -33,9 +33,6 @@ (advice-add #'completing-read-multiple :filter-args #'crm-indicator) (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode) -;; Vertico relies on Emacs 31 compatibility -(use-package compat :ensure t) - ;; Actual orderless (use-package vertico :ensure t :defer t :hook ((elpaca-after-init . vertico-mode)) diff --git a/user-lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el similarity index 93% rename from user-lisp/icejam-custom-init.el rename to lisp/icejam-custom-init.el index 0c6278d..21b88f6 100644 --- a/user-lisp/icejam-custom-init.el +++ b/lisp/icejam-custom-init.el @@ -11,10 +11,10 @@ ;;; Code: (eval-when-compile (declare-function elpaca 'elpaca) - (declare-function elpaca-generate-autoloads 'elpaca) (declare-function elpaca-process-queues 'elpaca) - (declare-function elpaca-use-package-mode 'elpaca-use-package) - (declare-function elpaca-write-lock-file 'elpaca)) + (declare-function elpaca-generate-autoloads 'elpaca) + (declare-function elpaca-write-lock-file 'elpaca) + (declare-function elpaca-use-package-mode 'elpaca-use-package)) ;; Set GC at 500 MB for startup (setopt gc-cons-threshold 500000000) @@ -101,9 +101,9 @@ ;; I don't know why this needs to be here and with a lisp directory, but ;; normal subdirs.el file doesn't work. -(add-to-list 'load-path (concat user-emacs-directory "user-lisp")) -(add-to-list 'load-path (concat user-emacs-directory "user-lisp/themes")) -(add-to-list 'load-path (concat user-emacs-directory "user-lisp/langs")) +(add-to-list 'load-path (concat user-emacs-directory "lisp")) +(add-to-list 'load-path (concat user-emacs-directory "lisp/themes")) +(add-to-list 'load-path (concat user-emacs-directory "lisp/langs")) (defgroup icejam nil "My customisation group." @@ -146,7 +146,6 @@ (use-package icejam-lang-golang :ensure nil) (use-package icejam-lang-haskell :ensure nil) (use-package icejam-lang-javascript :ensure nil) -(use-package icejam-lang-java :ensure nil) (use-package icejam-lang-kotlin :ensure nil) (use-package icejam-lang-lua :ensure nil) (use-package icejam-lang-markdown :ensure nil) @@ -164,8 +163,5 @@ ;; Diminish modeline litter (use-package icejam-diminish :ensure nil) -;; This is a temporary workaround for elpaca not working properly: -(progn (elpaca-process-queues) (run-hooks 'elpaca-after-init-hook)) - (provide 'icejam-custom-init) ;;; icejam-custom-init.el ends here diff --git a/user-lisp/icejam-dashboard.el b/lisp/icejam-dashboard.el similarity index 100% rename from user-lisp/icejam-dashboard.el rename to lisp/icejam-dashboard.el diff --git a/user-lisp/icejam-deft.el b/lisp/icejam-deft.el similarity index 100% rename from user-lisp/icejam-deft.el rename to lisp/icejam-deft.el diff --git a/user-lisp/icejam-diminish.el b/lisp/icejam-diminish.el similarity index 100% rename from user-lisp/icejam-diminish.el rename to lisp/icejam-diminish.el diff --git a/user-lisp/icejam-eglot.el b/lisp/icejam-eglot.el similarity index 81% rename from user-lisp/icejam-eglot.el rename to lisp/icejam-eglot.el index ddeef65..cf4726a 100644 --- a/user-lisp/icejam-eglot.el +++ b/lisp/icejam-eglot.el @@ -12,35 +12,22 @@ ;; Use Ruby-Lsp instead of Solargraph (add-to-list 'eglot-server-programs '((ruby-mode ruby-ts-mode) "ruby-lsp")) - ;; Use gleam LSP - (add-to-list 'eglot-server-programs '((gleam-ts-mode) "gleam" "lsp")) - - ;; Use Kotlin-LSP provided by Jetbrains - (add-to-list 'eglot-server-programs - '((kotlin-mode kotlin-ts-mode) "kotlin-lsp" "--stdio")) - (setopt eglot-advertise-cancellation t) ;; Automatically kill eglot when last buffer associated with a project is ;; closed. (setopt eglot-autoshutdown t) - (setopt eglot-connect-timeout 60) - (setopt eglot-extend-to-xref t) - ;; Set up server specific switches globally (setq-default eglot-workspace-configuration ;; Elixir configuration - '( - :elixirLS ( + '(:elixirLS ( :autoBuild t :dialyzerEnabled t :incrementalDialyzer :json-false :autoInsertRequiredAlias :json-false :suggestSpecs t - ) - ) - ) + ))) ;; Eglot insists on adding itself to the completion-at-point-functions but ;; that means that it overrides our combined value of (eglot + yasnippet) diff --git a/user-lisp/icejam-flycheck.el b/lisp/icejam-flycheck.el similarity index 89% rename from user-lisp/icejam-flycheck.el rename to lisp/icejam-flycheck.el index 17e2fd2..be83a9c 100644 --- a/user-lisp/icejam-flycheck.el +++ b/lisp/icejam-flycheck.el @@ -3,30 +3,23 @@ ;;; Code: ;; Use flycheck checks with flymake. -(eval-when-compile - (declare-function cape-capf-super 'cape) - (declare-function cape-dabbrev 'cape) - (declare-function cape-file 'cape) - (declare-function cape-keyword 'cape) - (declare-function el-patch-defun 'el-patch) - (declare-function el-patch-feature 'el-patch) - (declare-function flymake--diagnostics-buffer-name 'flymake) - (declare-function flymake--project-diagnostics-buffer 'flymake) - (declare-function flymake-diagnostics-buffer-mode 'flymake) - (declare-function flymake-project-diagnostics-mode 'flymake) - (declare-function project-root 'project) - (declare-function yasnippet-capf 'yasnippet-capf) - (defvar flymake--diagnostics-buffer-source) - (defvar flymake-mode) - (defvar flymake-show-buffer-diagnostics) - (defvar flymake-show-project-diagnostics)) - (use-package flymake-flycheck :ensure t :defer t :config (setq-default flycheck-disabled-checkers (append (default-value 'flycheck-disabled-checkers) '(emacs-lisp emacs-lisp-checkdoc emacs-lisp-package sh-shellcheck)))) +(eval-when-compile + (declare-function flymake--project-diagnostics-buffer 'flymake) + (declare-function flymake--diagnostics-buffer-name 'flymake) + (declare-function flymake-project-diagnostics-mode 'flymake) + (declare-function flymake-diagnostics-buffer-mode 'flymake) + (declare-function cape-capf-super 'cape) + (declare-function cape-dabbrev 'cape) + (declare-function cape-file 'cape) + (declare-function cape-keyword 'cape) + (declare-function yasnippet-capf 'yasnippet-capf)) + (use-package el-patch :ensure t :defer t :config ;; Show the diagnostics from flymake in a second window (usually on the diff --git a/user-lisp/icejam-fonts.el b/lisp/icejam-fonts.el similarity index 100% rename from user-lisp/icejam-fonts.el rename to lisp/icejam-fonts.el diff --git a/user-lisp/icejam-ispell.el b/lisp/icejam-ispell.el similarity index 100% rename from user-lisp/icejam-ispell.el rename to lisp/icejam-ispell.el diff --git a/user-lisp/icejam-keys-mode.el b/lisp/icejam-keys-mode.el similarity index 100% rename from user-lisp/icejam-keys-mode.el rename to lisp/icejam-keys-mode.el diff --git a/user-lisp/icejam-magit.el b/lisp/icejam-magit.el similarity index 87% rename from user-lisp/icejam-magit.el rename to lisp/icejam-magit.el index 6f590e9..160ac5e 100644 --- a/user-lisp/icejam-magit.el +++ b/lisp/icejam-magit.el @@ -3,10 +3,10 @@ ;;; Code: (eval-when-compile - (declare-function git-commit-setup-capf 'git-commit) - (defvar git-commit-setup-hook) (defvar icejam-keys-mode-map) - (defvar magit-blame-mode-map)) + (defvar magit-blame-mode-map) + (defvar git-commit-setup-hook) + (declare-function git-commit-setup-capf 'git-commit)) (use-package magit :ensure t diff --git a/user-lisp/icejam-prog-mode.el b/lisp/icejam-prog-mode.el similarity index 100% rename from user-lisp/icejam-prog-mode.el rename to lisp/icejam-prog-mode.el diff --git a/user-lisp/icejam-speed-type.el b/lisp/icejam-speed-type.el similarity index 100% rename from user-lisp/icejam-speed-type.el rename to lisp/icejam-speed-type.el diff --git a/user-lisp/icejam-sys-specific.el b/lisp/icejam-sys-specific.el similarity index 100% rename from user-lisp/icejam-sys-specific.el rename to lisp/icejam-sys-specific.el diff --git a/user-lisp/icejam-testing.el b/lisp/icejam-testing.el similarity index 100% rename from user-lisp/icejam-testing.el rename to lisp/icejam-testing.el diff --git a/user-lisp/icejam-themes.el b/lisp/icejam-themes.el similarity index 100% rename from user-lisp/icejam-themes.el rename to lisp/icejam-themes.el diff --git a/user-lisp/icejam-transient.el b/lisp/icejam-transient.el similarity index 100% rename from user-lisp/icejam-transient.el rename to lisp/icejam-transient.el diff --git a/user-lisp/icejam-tree-sitter.el b/lisp/icejam-tree-sitter.el similarity index 100% rename from user-lisp/icejam-tree-sitter.el rename to lisp/icejam-tree-sitter.el diff --git a/user-lisp/icejam-vundo.el b/lisp/icejam-vundo.el similarity index 100% rename from user-lisp/icejam-vundo.el rename to lisp/icejam-vundo.el diff --git a/user-lisp/langs/icejam-lang-clang.el b/lisp/langs/icejam-lang-clang.el similarity index 100% rename from user-lisp/langs/icejam-lang-clang.el rename to lisp/langs/icejam-lang-clang.el diff --git a/user-lisp/langs/icejam-lang-clojure.el b/lisp/langs/icejam-lang-clojure.el similarity index 74% rename from user-lisp/langs/icejam-lang-clojure.el rename to lisp/langs/icejam-lang-clojure.el index 0e8063d..0e7eb24 100644 --- a/user-lisp/langs/icejam-lang-clojure.el +++ b/lisp/langs/icejam-lang-clojure.el @@ -3,16 +3,11 @@ ;;; Code: (eval-when-compile - (declare-function column-enforce-n "column-enforce-mode" (number)) - (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point) - (declare-function icejam-set-indent 'icejam-prog-mode) - (declare-function icejam-start-eglot 'icejam-eglot) - (declare-function lispy-mode 'lispy-mode) - (declare-function transient-define-prefix 'transient) - (defvar cider-annotate-completion-function) - (defvar cider-show-error-buffer) + (defvar icejam-language-transient-alist) (defvar icejam-clojure-lang-menu) - (defvar icejam-language-transient-alist)) + (declare-function column-enforce-n "column-enforce-mode" (number)) + (declare-function icejam-set-indent 'icejam-prog-mode) + (declare-function transient-define-prefix 'transient)) (use-package clojure-mode :defer t :ensure t) @@ -37,7 +32,7 @@ ("t" "Test" cider-test-run-loaded-tests)] ["Buffer" ("r" "Reload" icejam-revert-buffer-no-confirm) - ("f" "Format" eglot-format-buffer) + ("f" "Format" cider-format-buffer) ("l" "Load" cider-load-buffer) ("e" "Show Errors" flymake-show-buffer-diagnostics)]] ["" @@ -49,21 +44,15 @@ (defun icejam-lang-activate-clojure-mode () "Goodies for clojure files." (icejam-set-indent 2) ;; Default indentation of 2 characters - (column-enforce-n 100) + (column-enforce-n 80) (cider-mode 1) - ;; Use lispy mode in Clojure - (lispy-mode t) - - ;; Use LSP in clojure - (icejam-set-eglot-capfs) - (icejam-start-eglot) - + ;; Do not enable paredit for clojure + ;; (paredit-mode 1) ;; Do not show separate error window when in REPL (setq cider-show-error-buffer 'except-in-repl)) (add-hook 'clojure-mode-hook 'icejam-lang-activate-clojure-mode) -(add-hook 'edn-mode-hook 'icejam-lang-activate-clojure-mode) (defun icejam-lang-clojure-repl-config () "Do not show stacktrace when in REPL." diff --git a/user-lisp/langs/icejam-lang-dart.el b/lisp/langs/icejam-lang-dart.el similarity index 100% rename from user-lisp/langs/icejam-lang-dart.el rename to lisp/langs/icejam-lang-dart.el diff --git a/user-lisp/langs/icejam-lang-dhall.el b/lisp/langs/icejam-lang-dhall.el similarity index 100% rename from user-lisp/langs/icejam-lang-dhall.el rename to lisp/langs/icejam-lang-dhall.el diff --git a/user-lisp/langs/icejam-lang-elisp.el b/lisp/langs/icejam-lang-elisp.el similarity index 100% rename from user-lisp/langs/icejam-lang-elisp.el rename to lisp/langs/icejam-lang-elisp.el diff --git a/user-lisp/langs/icejam-lang-elixir.el b/lisp/langs/icejam-lang-elixir.el similarity index 97% rename from user-lisp/langs/icejam-lang-elixir.el rename to lisp/langs/icejam-lang-elixir.el index 523543c..57c59db 100644 --- a/user-lisp/langs/icejam-lang-elixir.el +++ b/lisp/langs/icejam-lang-elixir.el @@ -3,17 +3,17 @@ ;;; Code: (eval-when-compile - (declare-function -> 'dash) - (declare-function column-enforce-n 'column-enforce-mode (number)) - (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point) - (declare-function icejam-set-indent 'icejam-prog-mode) - (declare-function icejam-start-eglot 'icejam-eglot) (declare-function transient-define-prefix 'transient) - (declare-function yas--remove-template-by-uuid 'yasnippet) + (declare-function column-enforce-n 'column-enforce-mode (number)) + (declare-function -> 'dash) (declare-function yas--table-get-create 'yasnippet) - (defvar apheleia-mode-alist) + (declare-function yas--remove-template-by-uuid 'yasnippet) + (declare-function icejam-set-indent 'icejam-prog-mode) + (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point) + (declare-function icejam-start-eglot 'icejam-eglot) + (defvar icejam-language-transient-alist) (defvar icejam-elixir-lang-menu) - (defvar icejam-language-transient-alist)) + (defvar apheleia-mode-alist)) (use-package elixir-ts-mode :ensure t :defer t :after (apheleia) :config diff --git a/user-lisp/langs/icejam-lang-erlang.el b/lisp/langs/icejam-lang-erlang.el similarity index 100% rename from user-lisp/langs/icejam-lang-erlang.el rename to lisp/langs/icejam-lang-erlang.el diff --git a/user-lisp/langs/icejam-lang-fsharp.el b/lisp/langs/icejam-lang-fsharp.el similarity index 100% rename from user-lisp/langs/icejam-lang-fsharp.el rename to lisp/langs/icejam-lang-fsharp.el diff --git a/user-lisp/langs/icejam-lang-gleam.el b/lisp/langs/icejam-lang-gleam.el similarity index 88% rename from user-lisp/langs/icejam-lang-gleam.el rename to lisp/langs/icejam-lang-gleam.el index 3d78d1c..8cc1833 100644 --- a/user-lisp/langs/icejam-lang-gleam.el +++ b/lisp/langs/icejam-lang-gleam.el @@ -14,7 +14,8 @@ (declare-function icejam-set-indent 'icejam-prog-mode) (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)) -(use-package gleam-ts-mode :defer t :ensure t :mode (rx ".gleam" eos)) +(use-package gleam-ts-mode :defer t :ensure t + :mode (rx ".gleam" eos)) ;; (add-to-list 'auto-mode-alist '("\\.gleam\\'" . gleam-ts-mode)) @@ -22,7 +23,7 @@ "All things Gleam." (icejam-set-indent 2) (column-enforce-n 100) - (icejam-start-eglot) + (eglot-ensure) (icejam-set-eglot-capfs)) (add-hook 'gleam-ts-mode-hook 'icejam-lang-activate-gleam-mode) diff --git a/user-lisp/langs/icejam-lang-golang.el b/lisp/langs/icejam-lang-golang.el similarity index 100% rename from user-lisp/langs/icejam-lang-golang.el rename to lisp/langs/icejam-lang-golang.el diff --git a/user-lisp/langs/icejam-lang-haskell.el b/lisp/langs/icejam-lang-haskell.el similarity index 100% rename from user-lisp/langs/icejam-lang-haskell.el rename to lisp/langs/icejam-lang-haskell.el diff --git a/user-lisp/langs/icejam-lang-javascript.el b/lisp/langs/icejam-lang-javascript.el similarity index 100% rename from user-lisp/langs/icejam-lang-javascript.el rename to lisp/langs/icejam-lang-javascript.el diff --git a/user-lisp/langs/icejam-lang-kotlin.el b/lisp/langs/icejam-lang-kotlin.el similarity index 100% rename from user-lisp/langs/icejam-lang-kotlin.el rename to lisp/langs/icejam-lang-kotlin.el diff --git a/user-lisp/langs/icejam-lang-lua.el b/lisp/langs/icejam-lang-lua.el similarity index 100% rename from user-lisp/langs/icejam-lang-lua.el rename to lisp/langs/icejam-lang-lua.el diff --git a/user-lisp/langs/icejam-lang-markdown.el b/lisp/langs/icejam-lang-markdown.el similarity index 100% rename from user-lisp/langs/icejam-lang-markdown.el rename to lisp/langs/icejam-lang-markdown.el diff --git a/user-lisp/langs/icejam-lang-ocaml.el b/lisp/langs/icejam-lang-ocaml.el similarity index 100% rename from user-lisp/langs/icejam-lang-ocaml.el rename to lisp/langs/icejam-lang-ocaml.el diff --git a/user-lisp/langs/icejam-lang-other.el b/lisp/langs/icejam-lang-other.el similarity index 100% rename from user-lisp/langs/icejam-lang-other.el rename to lisp/langs/icejam-lang-other.el diff --git a/user-lisp/langs/icejam-lang-php.el b/lisp/langs/icejam-lang-php.el similarity index 100% rename from user-lisp/langs/icejam-lang-php.el rename to lisp/langs/icejam-lang-php.el diff --git a/user-lisp/langs/icejam-lang-purescript.el b/lisp/langs/icejam-lang-purescript.el similarity index 100% rename from user-lisp/langs/icejam-lang-purescript.el rename to lisp/langs/icejam-lang-purescript.el diff --git a/user-lisp/langs/icejam-lang-python.el b/lisp/langs/icejam-lang-python.el similarity index 100% rename from user-lisp/langs/icejam-lang-python.el rename to lisp/langs/icejam-lang-python.el diff --git a/user-lisp/langs/icejam-lang-ruby.el b/lisp/langs/icejam-lang-ruby.el similarity index 100% rename from user-lisp/langs/icejam-lang-ruby.el rename to lisp/langs/icejam-lang-ruby.el diff --git a/user-lisp/langs/icejam-lang-rust.el b/lisp/langs/icejam-lang-rust.el similarity index 100% rename from user-lisp/langs/icejam-lang-rust.el rename to lisp/langs/icejam-lang-rust.el diff --git a/user-lisp/langs/icejam-lang-sh.el b/lisp/langs/icejam-lang-sh.el similarity index 100% rename from user-lisp/langs/icejam-lang-sh.el rename to lisp/langs/icejam-lang-sh.el diff --git a/user-lisp/langs/icejam-lang-web.el b/lisp/langs/icejam-lang-web.el similarity index 100% rename from user-lisp/langs/icejam-lang-web.el rename to lisp/langs/icejam-lang-web.el diff --git a/user-lisp/langs/icejam-lang-ziglang.el b/lisp/langs/icejam-lang-ziglang.el similarity index 100% rename from user-lisp/langs/icejam-lang-ziglang.el rename to lisp/langs/icejam-lang-ziglang.el diff --git a/user-lisp/themes/icejam-base16-catppuccin-frappe.el b/lisp/themes/icejam-base16-catppuccin-frappe.el similarity index 100% rename from user-lisp/themes/icejam-base16-catppuccin-frappe.el rename to lisp/themes/icejam-base16-catppuccin-frappe.el diff --git a/user-lisp/themes/icejam-base16-catppuccin-latte.el b/lisp/themes/icejam-base16-catppuccin-latte.el similarity index 100% rename from user-lisp/themes/icejam-base16-catppuccin-latte.el rename to lisp/themes/icejam-base16-catppuccin-latte.el diff --git a/user-lisp/themes/icejam-base16-harmonic-light.el b/lisp/themes/icejam-base16-harmonic-light.el similarity index 100% rename from user-lisp/themes/icejam-base16-harmonic-light.el rename to lisp/themes/icejam-base16-harmonic-light.el diff --git a/user-lisp/themes/icejam-base16-modus-operandi-tinted.el b/lisp/themes/icejam-base16-modus-operandi-tinted.el similarity index 100% rename from user-lisp/themes/icejam-base16-modus-operandi-tinted.el rename to lisp/themes/icejam-base16-modus-operandi-tinted.el diff --git a/user-lisp/themes/icejam-base16-not-harmonic.el b/lisp/themes/icejam-base16-not-harmonic.el similarity index 100% rename from user-lisp/themes/icejam-base16-not-harmonic.el rename to lisp/themes/icejam-base16-not-harmonic.el diff --git a/user-lisp/themes/icejam-base16-summerfruit-light.el b/lisp/themes/icejam-base16-summerfruit-light.el similarity index 100% rename from user-lisp/themes/icejam-base16-summerfruit-light.el rename to lisp/themes/icejam-base16-summerfruit-light.el diff --git a/user-lisp/themes/icejam-base16-zenburn.el b/lisp/themes/icejam-base16-zenburn.el similarity index 100% rename from user-lisp/themes/icejam-base16-zenburn.el rename to lisp/themes/icejam-base16-zenburn.el diff --git a/user-lisp/themes/icejam-tronesque.el b/lisp/themes/icejam-tronesque.el similarity index 100% rename from user-lisp/themes/icejam-tronesque.el rename to lisp/themes/icejam-tronesque.el diff --git a/user-lisp/langs/icejam-lang-java.el b/user-lisp/langs/icejam-lang-java.el deleted file mode 100644 index 856c59f..0000000 --- a/user-lisp/langs/icejam-lang-java.el +++ /dev/null @@ -1,25 +0,0 @@ -;;; java -- summary -*- lexical-binding: t; -*- -;;; Commentary: -;;; Code: - -(eval-when-compile - (declare-function column-enforce-n 'column-enforce-mode (number)) - (declare-function icejam-set-indent 'icejam-prog-mode) - (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)) - -(add-to-list 'auto-mode-alist '("\\.java\\'" . java-ts-mode)) - -;; (use-package eglot-java :ensure t) - -(defun icejam-activate-java-mode () - "Java mode overrides." - (icejam-set-indent 2) - (eglot-ensure) - (column-enforce-n 80) - (icejam-set-eglot-capfs)) - -;; (add-hook 'java-ts-mode-hook 'eglot-java-mode) -(add-hook 'java-ts-mode-hook 'icejam-activate-java-mode) - -(provide 'icejam-lang-java) -;;; icejam-lang-java.el ends here