mirror of
https://github.com/ksyasuda/rice.git
synced 2024-11-22 03:19:58 -08:00
update doom config
This commit is contained in:
parent
264238ba59
commit
24568ddd60
@ -80,9 +80,12 @@
|
|||||||
(setq lsp-pyls-plugins-pyflakes-enabled t)
|
(setq lsp-pyls-plugins-pyflakes-enabled t)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
(after! lsp-python-ms
|
(after! lsp-python-ms
|
||||||
(set-lsp-priority! 'mspyls 1))
|
(set-lsp-priority! 'mspyls 1))
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> dfea492 (updates)
|
||||||
(add-hook 'org-mode-hook #'org-bullets-mode)
|
(add-hook 'org-mode-hook #'org-bullets-mode)
|
||||||
|
|
||||||
(add-hook 'before-save-hook 'py-isort-before-save)
|
(add-hook 'before-save-hook 'py-isort-before-save)
|
||||||
@ -117,6 +120,7 @@ was updated after pytest was run then nothing is reported.
|
|||||||
'org-babel-load-languages
|
'org-babel-load-languages
|
||||||
'((python . t)))
|
'((python . t)))
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
(setq projectile-project-search-path '("~/Projects/" "~/Work/Projects/"))
|
(setq projectile-project-search-path '("~/Projects/" "~/Work/Projects/"))
|
||||||
|
|
||||||
@ -135,3 +139,5 @@ was updated after pytest was run then nothing is reported.
|
|||||||
:defer t ; don't access `dired-mode-map' until `peep-dired' is loaded
|
:defer t ; don't access `dired-mode-map' until `peep-dired' is loaded
|
||||||
:bind (:map dired-mode-map
|
:bind (:map dired-mode-map
|
||||||
("P" . peep-dired)))
|
("P" . peep-dired)))
|
||||||
|
=======
|
||||||
|
>>>>>>> dfea492 (updates)
|
||||||
|
@ -152,7 +152,11 @@
|
|||||||
;;php ; perl's insecure younger brother
|
;;php ; perl's insecure younger brother
|
||||||
;;plantuml ; diagrams for confusing people more
|
;;plantuml ; diagrams for confusing people more
|
||||||
;;purescript ; javascript, but functional
|
;;purescript ; javascript, but functional
|
||||||
|
<<<<<<< HEAD
|
||||||
(python +lsp +pyenv) ; beautiful is better than ugly
|
(python +lsp +pyenv) ; beautiful is better than ugly
|
||||||
|
=======
|
||||||
|
(python +lsp) ; beautiful is better than ugly
|
||||||
|
>>>>>>> dfea492 (updates)
|
||||||
;;qt ; the 'cutest' gui framework ever
|
;;qt ; the 'cutest' gui framework ever
|
||||||
;;racket ; a DSL for DSLs
|
;;racket ; a DSL for DSLs
|
||||||
;;raku ; the artist formerly known as perl6
|
;;raku ; the artist formerly known as perl6
|
||||||
|
@ -58,5 +58,8 @@
|
|||||||
(package! ein)
|
(package! ein)
|
||||||
(package! python-docstring)
|
(package! python-docstring)
|
||||||
(package! py-autopep8)
|
(package! py-autopep8)
|
||||||
|
<<<<<<< HEAD
|
||||||
(package! diredfl)
|
(package! diredfl)
|
||||||
(package! peep-dired)
|
(package! peep-dired)
|
||||||
|
=======
|
||||||
|
>>>>>>> dfea492 (updates)
|
||||||
|
Loading…
Reference in New Issue
Block a user