Merge branch 'master' into feat/modern-completion

seagle0128 · Jul 31, 2023 · f3f4a21 · f3f4a21
2 parents aef7f75 + 8555419
commit f3f4a21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lisp/init-flymake.el b/lisp/init-flymake.el
@@ -32,8 +32,8 @@
 
 (use-package flymake
   :hook (prog-mode . flymake-mode)
-  :init (setq flymake-fringe-indicator-position 'right-fringe)
-  :config (add-to-list 'elisp-flymake-byte-compile-load-path load-path))
+  :init (setq flymake-fringe-indicator-position 'right-fringe
+              elisp-flymake-byte-compile-load-path load-path))
 
 (provide 'init-flymake)
 

diff --git a/lisp/init-lsp.el b/lisp/init-lsp.el
@@ -167,7 +167,7 @@
      :custom-face
      (lsp-ui-sideline-code-action ((t (:inherit warning))))
      :pretty-hydra
-     ((:title (pretty-hydra-title "LSP UI" 'faicon "nf-oct-rocket" :face 'nerd-icons-green)
+     ((:title (pretty-hydra-title "LSP UI" 'faicon "nf-fa-rocket" :face 'nerd-icons-green)
        :color amaranth :quit-key ("q" "C-g"))
       ("Doc"
        (("d e" (progn