This commit is contained in:
parent
377b95bd7f
commit
ff0abe9f2e
5 changed files with 33 additions and 9 deletions
|
|
@ -164,8 +164,5 @@
|
||||||
;; Diminish modeline litter
|
;; Diminish modeline litter
|
||||||
(use-package icejam-diminish :ensure nil)
|
(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)
|
(provide 'icejam-custom-init)
|
||||||
;;; icejam-custom-init.el ends here
|
;;; icejam-custom-init.el ends here
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,9 @@ two points smaller."
|
||||||
(dolist (face '(default))
|
(dolist (face '(default))
|
||||||
(set-face-attribute face nil
|
(set-face-attribute face nil
|
||||||
:family family
|
:family family
|
||||||
:height (-> height (* 10))))
|
:height (-> height (* 10))
|
||||||
|
:width 'medium
|
||||||
|
:weight 'semi-light))
|
||||||
|
|
||||||
;; Set variable-pitch font
|
;; Set variable-pitch font
|
||||||
(dolist (face '(variable-pitch))
|
(dolist (face '(variable-pitch))
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
(require 'icejam-base16-catppuccin-frappe)
|
(require 'icejam-base16-catppuccin-frappe)
|
||||||
|
|
||||||
(if (memq window-system '(x mac ns))
|
(if (memq window-system '(x mac ns))
|
||||||
(enable-theme 'icejam-base16-catppuccin-frappe)
|
(enable-theme 'icejam-base16-zenburn)
|
||||||
(enable-theme 'icejam-base16-zenburn)))
|
(enable-theme 'icejam-base16-zenburn)))
|
||||||
|
|
||||||
(provide 'icejam-themes)
|
(provide 'icejam-themes)
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,9 @@
|
||||||
[""
|
[""
|
||||||
("q" "Quit" keyboard-quit)])
|
("q" "Quit" keyboard-quit)])
|
||||||
|
|
||||||
(add-to-list
|
(dolist (mode '(clojure-mode edn-mode))
|
||||||
'icejam-language-transient-alist '(clojure-mode . icejam-clojure-lang-menu))
|
(add-to-list 'icejam-language-transient-alist
|
||||||
|
`(,mode . icejam-clojure-lang-menu)))
|
||||||
|
|
||||||
(defun icejam-lang-activate-clojure-mode ()
|
(defun icejam-lang-activate-clojure-mode ()
|
||||||
"Goodies for clojure files."
|
"Goodies for clojure files."
|
||||||
|
|
|
||||||
|
|
@ -5,15 +5,39 @@
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(declare-function column-enforce-n 'column-enforce-mode (number))
|
(declare-function column-enforce-n 'column-enforce-mode (number))
|
||||||
(declare-function icejam-set-indent 'icejam-prog-mode)
|
(declare-function icejam-set-indent 'icejam-prog-mode)
|
||||||
(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
|
(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
|
||||||
|
(declare-function transient-define-prefix 'transient)
|
||||||
|
(defvar icejam-java-lang-menu)
|
||||||
|
(defvar icejam-language-transient-alist))
|
||||||
|
|
||||||
(add-to-list 'auto-mode-alist '("\\.java\\'" . java-ts-mode))
|
(add-to-list 'auto-mode-alist '("\\.java\\'" . java-ts-mode))
|
||||||
|
|
||||||
;; (use-package eglot-java :ensure t)
|
;; (use-package eglot-java :ensure t)
|
||||||
|
|
||||||
|
(transient-define-prefix icejam-java-lang-menu ()
|
||||||
|
[[:description
|
||||||
|
(lambda ()
|
||||||
|
(concat (propertize "Code actions for " 'face 'transient-heading)
|
||||||
|
(propertize (format "%s" major-mode) 'face 'transient-key)
|
||||||
|
(propertize ":\n" 'face 'transient-heading)))
|
||||||
|
("m" "iMenu" consult-imenu)
|
||||||
|
("r" "Reload buffer" icejam-revert-buffer-no-confirm)
|
||||||
|
("e" "Show errors" flymake-show-buffer-diagnostics)
|
||||||
|
("f" "Format" eglot-format-buffer)
|
||||||
|
|
||||||
|
("q" "Quit" keyboard-quit)]])
|
||||||
|
|
||||||
|
(dolist (mode '(java-ts-mode))
|
||||||
|
(add-to-list 'icejam-language-transient-alist
|
||||||
|
`(,mode . icejam-java-lang-menu)))
|
||||||
|
|
||||||
(defun icejam-activate-java-mode ()
|
(defun icejam-activate-java-mode ()
|
||||||
"Java mode overrides."
|
"Java mode overrides."
|
||||||
|
|
||||||
|
;; Set indentation to two spaces
|
||||||
(icejam-set-indent 2)
|
(icejam-set-indent 2)
|
||||||
|
(setq-local java-ts-mode-indent-offset tab-width)
|
||||||
|
|
||||||
(eglot-ensure)
|
(eglot-ensure)
|
||||||
(column-enforce-n 80)
|
(column-enforce-n 80)
|
||||||
(icejam-set-eglot-capfs))
|
(icejam-set-eglot-capfs))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue