From b83e55b79b2b25e28397748a4bf484c241f9505c Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 16 Aug 2024 11:42:31 +0300 Subject: [PATCH] Update --- lisp/icejam-fonts.el | 28 +++++++++++++++------------- lisp/icejam-lsp.el | 4 +++- lisp/icejam-themes.el | 6 +++++- lisp/icejam-transient.el | 2 +- lisp/icejam-tree-sitter.el | 2 +- lisp/langs/icejam-lang-elisp.el | 2 ++ lisp/langs/icejam-lang-ruby.el | 16 +++++----------- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/lisp/icejam-fonts.el b/lisp/icejam-fonts.el index c0b3f7c..2d6c36b 100644 --- a/lisp/icejam-fonts.el +++ b/lisp/icejam-fonts.el @@ -10,19 +10,21 @@ ;;; Code: -;; (defvar icejam-font "Monoid") -;; (defvar icejam-font "Fira Mono") -;; (defvar icejam-font "Fira Code") -;; (defvar icejam-font "Red Hat Mono") -;; (defvar icejam-font "Agave Nerd Font Mono") -;; (defvar icejam-font "Input Mono Condensed") -;; (defvar icejam-font "SF Mono") -;; (defvar icejam-font "Monaco") -;; (defvar icejam-font "JetBrains Mono") -;; (defvar icejam-font "JuliaMono") -;; (defvar icejam-font "Rec Mono Semicasual") -;; (defvar icejam-font "Victor Mono") -;; (defvar icejam-font "IBM Plex Mono") +;; (defconst icejam-font "Monoid" +;; (defconst icejam-font "Fira Mono" +;; (defconst icejam-font "Fira Code" +;; (defconst icejam-font "Red Hat Mono" +;; (defconst icejam-font "Agave Nerd Font Mono" +;; (defconst icejam-font "Input Mono Condensed" +;; (defconst icejam-font "SF Mono" +;; (defconst icejam-font "Monaco" +;; (defconst icejam-font "JetBrains Mono" +;; (defconst icejam-font "JuliaMono" +;; (defconst icejam-font "Rec Mono Semicasual" +;; (defconst icejam-font "Victor Mono" +;; (defconst icejam-font "IBM Plex Mono" +;; (defconst icejam-font "Berkeley Mono Trial" +;; (defconst icejam-font "Inconsolata" (defconst icejam-font "Iosevka Term" "Default font.") diff --git a/lisp/icejam-lsp.el b/lisp/icejam-lsp.el index 4a05034..2df795c 100644 --- a/lisp/icejam-lsp.el +++ b/lisp/icejam-lsp.el @@ -22,7 +22,9 @@ ;; It would be okay, but it also doesn't work 99% of the time. ;; When needed, enable this hot garbage in dir-locals.el - lsp-disabled-clients '(vue-semantic-server) + lsp-disabled-clients '(vue-semantic-server + ;; Ruby LSP servers, none of which actually work. + ruby-ls rubocop-ls typeprof-ls) lsp-log-io nil lsp-enable-file-watchers nil) (unbind-key "s-l =" lsp-mode-map) diff --git a/lisp/icejam-themes.el b/lisp/icejam-themes.el index 013f94a..17c9182 100644 --- a/lisp/icejam-themes.el +++ b/lisp/icejam-themes.el @@ -15,6 +15,8 @@ (use-package modus-themes :straight t :defer t) (use-package darktooth-theme :straight t :defer t) (use-package cyberpunk-theme :straight t :defer t) +(use-package catppuccin-theme :straight t :defer t + :config (setq catppuccin-flavor 'frappe)) (use-package color-theme-sanityinc-tomorrow :straight t :defer t) ;; Disable cursor blinking @@ -28,6 +30,7 @@ (load-theme 'base16-horizon-light t t) (load-theme 'base16-humanoid-light t t) (load-theme 'sanityinc-tomorrow-day t t) +(load-theme 'catppuccin t t) ;; Dark themes (load-theme 'cyberpunk t t) @@ -52,7 +55,8 @@ (declare-function spaceline-emacs-theme nil) (spaceline-emacs-theme) -(enable-theme 'icejam-base16-zenburn) +(enable-theme 'catppuccin) +;; (enable-theme 'icejam-base16-zenburn) (provide 'icejam-themes) ;;; icejam-themes.el ends here diff --git a/lisp/icejam-transient.el b/lisp/icejam-transient.el index e9b3ac6..f999dbc 100644 --- a/lisp/icejam-transient.el +++ b/lisp/icejam-transient.el @@ -123,7 +123,7 @@ (defun icejam-language-transient-for-mode (&optional maybe-mode) "Get transient for major mode. You can pass MAYBE-MODE to find mode explicitly." - (let* ((mode (if maybe-mode maybe-mode major-mode))) + (let* ((mode (if maybe-mode maybe-mode major-mode))) (alist-get mode icejam-language-transient-alist 'icejam/language-menu))) (defun icejam-transient-for-lang () diff --git a/lisp/icejam-tree-sitter.el b/lisp/icejam-tree-sitter.el index e594641..686d2f5 100644 --- a/lisp/icejam-tree-sitter.el +++ b/lisp/icejam-tree-sitter.el @@ -30,4 +30,4 @@ (add-hook 'tree-sitter-after-on-hook 'tree-sitter-hl-mode) (provide 'icejam-tree-sitter) -;;; icejam-treesitter.el ends here +;;; icejam-tree-sitter.el ends here diff --git a/lisp/langs/icejam-lang-elisp.el b/lisp/langs/icejam-lang-elisp.el index 6466c6c..12fee8c 100644 --- a/lisp/langs/icejam-lang-elisp.el +++ b/lisp/langs/icejam-lang-elisp.el @@ -7,6 +7,8 @@ (declare-function column-enforce-n "column-enforce-mode" (number)) +(add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode)) + (transient-define-prefix icejam/elisp-lang-menu () "Elisp Buffer Commands." ["" diff --git a/lisp/langs/icejam-lang-ruby.el b/lisp/langs/icejam-lang-ruby.el index 24cbc0e..43dfb59 100644 --- a/lisp/langs/icejam-lang-ruby.el +++ b/lisp/langs/icejam-lang-ruby.el @@ -9,10 +9,7 @@ (use-package ruby-end :straight t :defer t) (use-package rbs-mode :straight t :defer t) -(use-package enh-ruby-mode - :requires (rspec-mode ruby-end lsp) - :straight t - :defer t) +(add-to-list 'auto-mode-alist '("\\.rb\\'" . ruby-ts-mode)) (defun icejam/activate-ruby-mode () "All things for ruby mode." @@ -31,13 +28,10 @@ (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet))) -(add-hook 'ruby-mode-hook 'enh-ruby-mode) -(add-hook 'enh-ruby-mode-hook 'rspec-mode) -(add-hook 'enh-ruby-mode-hook 'ruby-end-mode) -(eval-after-load 'rspec-mode - '(rspec-install-snippets)) -(add-hook 'enh-ruby-mode-hook 'icejam/activate-ruby-mode) -;; (add-hook 'enh-ruby-mode-hook 'lsp-deferred) +(add-hook 'ruby-ts-mode-hook 'rspec-mode) +(add-hook 'ruby-ts-mode-hook 'ruby-end-mode) +(eval-after-load 'rspec-mode '(rspec-install-snippets)) +(add-hook 'ruby-ts-mode-hook 'icejam/activate-ruby-mode) (provide 'icejam-lang-ruby) ;;; icejam-lang-ruby.el ends here