From f3af7a84496a6c9d06066aac1e491dece577e99f Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 28 Feb 2022 13:08:04 +0200 Subject: [PATCH] Add company-box-mode --- .gitignore | 1 + init.el | 2 +- lang/ruby.el | 8 ++------ pkg/company-yasnippet.el | 6 ++++++ pkg/fonts.el | 5 +++-- pkg/ispell.el | 2 +- pkg/themes.el | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 29d25a4..620c6df 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ ac-comphist.dat /straight !straight/versions/default.el /speed-type +/tutorial diff --git a/init.el b/init.el index 9ec153f..5deb88f 100644 --- a/init.el +++ b/init.el @@ -99,7 +99,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(font-lock-constant-face ((((type graphic)) (:foreground "#dfaf8f")) (((min-colors 256)) (:foreground "brightred")) (t (:foreground "brightred")))) - '(markdown-code-face ((t (:inherit fixed-pitch :family "JuliaMono")))) + '(markdown-code-face ((t (:inherit fixed-pitch :family "Rec Mono Semicasual")))) '(mmm-default-submode-face ((t nil)))) ;; Restore GC to normal, but still high diff --git a/lang/ruby.el b/lang/ruby.el index 1a4c217..d0b3046 100644 --- a/lang/ruby.el +++ b/lang/ruby.el @@ -24,17 +24,13 @@ ;; Do not insert magic encoding comment at the begining of each file (setq ruby-insert-encoding-magic-comment nil) + (lsp) + ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet))) - ;; Set specific ctags command - (setq-local ctags/refresh-command - (format "ctags -e -R --languages=ruby -f %sTAGS %s. $(bundle list --paths)" - (projectile-project-root) (projectile-project-root))) - (add-hook 'ruby-mode-hook 'enh-ruby-mode) -(add-hook 'enh-ruby-mode-hook 'lsp-deferred) (add-hook 'enh-ruby-mode-hook 'rspec-mode) (add-hook 'enh-ruby-mode-hook 'ruby-end-mode) (eval-after-load 'rspec-mode diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el index 713c195..03ac21c 100644 --- a/pkg/company-yasnippet.el +++ b/pkg/company-yasnippet.el @@ -22,6 +22,12 @@ :straight t :defer t) +(use-package company-box + :straight t + :defer t + :after company + :hook (((company-mode) . company-box-mode))) + (global-company-mode t) (yas-global-mode t) diff --git a/pkg/fonts.el b/pkg/fonts.el index e983ec2..66603a5 100644 --- a/pkg/fonts.el +++ b/pkg/fonts.el @@ -42,10 +42,11 @@ ;; Call LSP-UI hook (+custom-set-lsp-ui-font-hook)) -(defvar +custom-font "Iosevka Term") +;; (defvar +custom-font "Iosevka Term") ;; (defvar +custom-font "JetBrains Mono") ;; (defvar +custom-font "JuliaMono") -;; (defvar +custom-font "Victor Mono") +(defvar +custom-font "Rec Mono Semicasual") +;;(defvar +custom-font "Victor Mono") ;; (defvar +custom-font "IBM Plex Mono") (defvar +custom-font-size 14) diff --git a/pkg/ispell.el b/pkg/ispell.el index 971855d..c988255 100644 --- a/pkg/ispell.el +++ b/pkg/ispell.el @@ -18,7 +18,7 @@ (unbind-key "C-M-i" flyspell-mode-map))) (use-package flyspell-correct :straight t :after flyspell :defer t) -(use-package flyspell-correct-ivy :after flyspell-correct) +(use-package flyspell-correct-ivy :straight :after flyspell-correct :defer t) (provide '+custom-pkg-ispell) ;;; ispell.el ends here diff --git a/pkg/themes.el b/pkg/themes.el index de5bcda..d641389 100644 --- a/pkg/themes.el +++ b/pkg/themes.el @@ -41,7 +41,7 @@ "$HOME/.emacs.d/themes/base16-harmonic-light-modified.el") (sml/apply-theme 'respectful) -(enable-theme 'base16-zenburn-modified) +(enable-theme 'base16-harmonic-light-modified) (provide '+custom-pkg-themes) ;;; themes.el ends here