From ff0abe9f2edcfa661ec603ade510586d3374578b Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sun, 28 Jun 2026 11:23:09 +0300 Subject: [PATCH] Set font differently --- user-lisp/icejam-custom-init.el | 3 --- user-lisp/icejam-fonts.el | 4 +++- user-lisp/icejam-themes.el | 2 +- user-lisp/langs/icejam-lang-clojure.el | 5 +++-- user-lisp/langs/icejam-lang-java.el | 28 ++++++++++++++++++++++++-- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/user-lisp/icejam-custom-init.el b/user-lisp/icejam-custom-init.el index 0c6278d..205b566 100644 --- a/user-lisp/icejam-custom-init.el +++ b/user-lisp/icejam-custom-init.el @@ -164,8 +164,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-fonts.el b/user-lisp/icejam-fonts.el index 55418d0..42656e0 100644 --- a/user-lisp/icejam-fonts.el +++ b/user-lisp/icejam-fonts.el @@ -80,7 +80,9 @@ two points smaller." (dolist (face '(default)) (set-face-attribute face nil :family family - :height (-> height (* 10)))) + :height (-> height (* 10)) + :width 'medium + :weight 'semi-light)) ;; Set variable-pitch font (dolist (face '(variable-pitch)) diff --git a/user-lisp/icejam-themes.el b/user-lisp/icejam-themes.el index 385e5a9..5476ea5 100644 --- a/user-lisp/icejam-themes.el +++ b/user-lisp/icejam-themes.el @@ -30,7 +30,7 @@ (require 'icejam-base16-catppuccin-frappe) (if (memq window-system '(x mac ns)) - (enable-theme 'icejam-base16-catppuccin-frappe) + (enable-theme 'icejam-base16-zenburn) (enable-theme 'icejam-base16-zenburn))) (provide 'icejam-themes) diff --git a/user-lisp/langs/icejam-lang-clojure.el b/user-lisp/langs/icejam-lang-clojure.el index 0e8063d..dc5c84c 100644 --- a/user-lisp/langs/icejam-lang-clojure.el +++ b/user-lisp/langs/icejam-lang-clojure.el @@ -43,8 +43,9 @@ ["" ("q" "Quit" keyboard-quit)]) -(add-to-list - 'icejam-language-transient-alist '(clojure-mode . icejam-clojure-lang-menu)) +(dolist (mode '(clojure-mode edn-mode)) + (add-to-list 'icejam-language-transient-alist + `(,mode . icejam-clojure-lang-menu))) (defun icejam-lang-activate-clojure-mode () "Goodies for clojure files." diff --git a/user-lisp/langs/icejam-lang-java.el b/user-lisp/langs/icejam-lang-java.el index 856c59f..5205b8b 100644 --- a/user-lisp/langs/icejam-lang-java.el +++ b/user-lisp/langs/icejam-lang-java.el @@ -5,15 +5,39 @@ (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)) + (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)) ;; (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 () "Java mode overrides." - (icejam-set-indent 2) + + ;; Set indentation to two spaces + (icejam-set-indent 2) + (setq-local java-ts-mode-indent-offset tab-width) + (eglot-ensure) (column-enforce-n 80) (icejam-set-eglot-capfs))