mirror of
https://github.com/ksyasuda/rice.git
synced 2024-10-28 09:04:10 -07:00
update doom config
This commit is contained in:
parent
1b3ba3ae02
commit
4e83569c46
@ -22,7 +22,7 @@
|
|||||||
;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
|
;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
|
||||||
;; doom-variable-pitch-font (font-spec :family "sans" :size 13))
|
;; doom-variable-pitch-font (font-spec :family "sans" :size 13))
|
||||||
;; (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 14))
|
;; (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 14))
|
||||||
(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 18))
|
(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 14))
|
||||||
|
|
||||||
;; There are two ways to load a theme. Both assume the theme is installed and
|
;; There are two ways to load a theme. Both assume the theme is installed and
|
||||||
;; available. You can either set `doom-theme' or manually load a theme with the
|
;; available. You can either set `doom-theme' or manually load a theme with the
|
||||||
@ -92,6 +92,13 @@
|
|||||||
|
|
||||||
(lsp-ui-mode)
|
(lsp-ui-mode)
|
||||||
|
|
||||||
|
(use-package lsp-python-ms
|
||||||
|
:ensure t
|
||||||
|
:init (setq lsp-python-ms-auto-install-server t)
|
||||||
|
:hook (python-mode . (lambda ()
|
||||||
|
(require 'lsp-python-ms)
|
||||||
|
(lsp)))) ; or lsp-deferred
|
||||||
|
|
||||||
|
|
||||||
(use-package! lsp-mode
|
(use-package! lsp-mode
|
||||||
:commands lsp
|
:commands lsp
|
||||||
@ -108,8 +115,8 @@
|
|||||||
;; (setq python-shell-interpreter "ipython"
|
;; (setq python-shell-interpreter "ipython"
|
||||||
;; python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True")
|
;; python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True")
|
||||||
|
|
||||||
(setf (lsp-session-folders-blacklist (lsp-session)) nil)
|
; (setf (lsp-session-folders-blacklist (lsp-session)) nil)
|
||||||
(lsp--persist-session (lsp-session))
|
; (lsp--persist-session (lsp-session))
|
||||||
|
|
||||||
(advice-add 'lsp :before (lambda (&rest _args) (eval '(setf (lsp-session-server-id->folders (lsp-session)) (ht)))))
|
(advice-add 'lsp :before (lambda (&rest _args) (eval '(setf (lsp-session-server-id->folders (lsp-session)) (ht)))))
|
||||||
|
|
||||||
@ -135,37 +142,6 @@
|
|||||||
(all-the-icons-dired-mode 1)))
|
(all-the-icons-dired-mode 1)))
|
||||||
(add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
|
(add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
|
||||||
|
|
||||||
;;; peep dired
|
|
||||||
(use-package! peep-dired
|
|
||||||
:ensure t
|
|
||||||
:defer t ; don't access `dired-mode-map' until `peep-dired' is loaded
|
|
||||||
:bind (:map dired-mode-map
|
|
||||||
("P" . peep-dired)))
|
|
||||||
|
|
||||||
|
|
||||||
;;; company tabnine
|
|
||||||
(use-package! company-tabnine)
|
|
||||||
|
|
||||||
(after! company
|
|
||||||
(setq +lsp-company-backends '(company-tabnine :separate company-capf company-yasnippet company-shell))
|
|
||||||
(setq company-show-quick-access t)
|
|
||||||
(setq company-idle-delay 0)
|
|
||||||
(define-key company-active-map (kbd "C-c h") #'company-quickhelp-manual-begin)
|
|
||||||
)
|
|
||||||
|
|
||||||
(require 'company-tabnine)
|
|
||||||
|
|
||||||
;;; lsp jedi
|
|
||||||
|
|
||||||
(use-package! lsp-jedi)
|
|
||||||
; :config
|
|
||||||
; (with-eval-after-load "lsp-mode"
|
|
||||||
; ;; (add-to-list 'lsp-disabled-clients 'pyls)
|
|
||||||
; (add-to-list 'lsp-enabled-clients 'jedi)
|
|
||||||
; (add-to-list 'lsp-enabled-clients 'lsp)))
|
|
||||||
|
|
||||||
;; (defun my/python-mode-hook ()
|
|
||||||
;; (add-to-list 'company-backends 'company-jedi))
|
|
||||||
|
|
||||||
;;; enacs application framework
|
;;; enacs application framework
|
||||||
(use-package eaf
|
(use-package eaf
|
||||||
@ -226,16 +202,9 @@
|
|||||||
;;; HOOKS
|
;;; HOOKS
|
||||||
|
|
||||||
|
|
||||||
(add-hook 'python-mode 'python-pylint)
|
|
||||||
; (add-hook 'sh-mode-hook 'flycheck-mode)
|
|
||||||
|
|
||||||
; enable bash language server
|
|
||||||
;(setq lsp-auto-configure nil)
|
|
||||||
|
|
||||||
(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)
|
||||||
|
|
||||||
|
|
||||||
;;; SQL MODE
|
;;; SQL MODE
|
||||||
|
|
||||||
|
|
||||||
@ -268,10 +237,6 @@
|
|||||||
|
|
||||||
; (add-hook 'sql-interactive-mode-hook 'my-sql-save-history-hook 'upercase-sql-keywords')
|
; (add-hook 'sql-interactive-mode-hook 'my-sql-save-history-hook 'upercase-sql-keywords')
|
||||||
|
|
||||||
;;; mozc for emacs
|
|
||||||
(require 'mozc)
|
|
||||||
(setq default-input-method "japanese-mozc")
|
|
||||||
|
|
||||||
(after! flyspell
|
(after! flyspell
|
||||||
(setq flyspell-lazy-idle-seconds 2))
|
(setq flyspell-lazy-idle-seconds 2))
|
||||||
|
|
||||||
@ -286,13 +251,6 @@
|
|||||||
(setq browse-url-browser-function 'browse-url-firefox)
|
(setq browse-url-browser-function 'browse-url-firefox)
|
||||||
|
|
||||||
|
|
||||||
(setq jedi:setup-keys t)
|
|
||||||
(setq jedi:complete-on-dot t)
|
|
||||||
(setq jedi:environment-virtualenv ["source", "./env/bin/activate"])
|
|
||||||
(setq jedi:key-complete ["Tab"])
|
|
||||||
(setq format-all-debug nil)
|
|
||||||
(setq projectile-project-search-path '("~/Projects/" "~/Work/Projects/"))
|
|
||||||
|
|
||||||
(setq lsp-ui-doc-position 'bottom)
|
(setq lsp-ui-doc-position 'bottom)
|
||||||
(setq lsp-ui-doc-alignment 'window)
|
(setq lsp-ui-doc-alignment 'window)
|
||||||
(setq lsp-ui-doc-max-height 25)
|
(setq lsp-ui-doc-max-height 25)
|
||||||
@ -301,12 +259,13 @@
|
|||||||
(setq lsp-ui-peek-mode t)
|
(setq lsp-ui-peek-mode t)
|
||||||
(setq lsp-ui-peek-enable t)
|
(setq lsp-ui-peek-enable t)
|
||||||
(setq lsp-ui-doc-delay 0.25)
|
(setq lsp-ui-doc-delay 0.25)
|
||||||
(setq company-quickhelp-delay 0.5)
|
|
||||||
(setq lsp-jedi-python-library-directories '(/usr .env/lib/))
|
|
||||||
|
|
||||||
(setq eaf-terminal-font-size 12)
|
(setq eaf-terminal-font-size 12)
|
||||||
(setq lsp-treemacs-sync-mode 1)
|
(setq lsp-treemacs-sync-mode 1)
|
||||||
|
|
||||||
|
(setq lsp-python-ms-auto-install-server t)
|
||||||
|
(add-hook 'python-mode-hook #'lsp) ; or lsp-deferred
|
||||||
|
|
||||||
|
|
||||||
(after! 'treemacs
|
(after! 'treemacs
|
||||||
(define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action))
|
(define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action))
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
;;layout ; auie,ctsrnm is the superior home row
|
;;layout ; auie,ctsrnm is the superior home row
|
||||||
|
|
||||||
:completion
|
:completion
|
||||||
(company +childframe) ; the ultimate code completion backend
|
|
||||||
;;helm ; the *other* search engine for love and life
|
;;helm ; the *other* search engine for love and life
|
||||||
;;ido ; the other *other* search engine...
|
;;ido ; the other *other* search engine...
|
||||||
;;ivy ; a search engine for love and life
|
;;ivy ; a search engine for love and life
|
||||||
|
@ -49,31 +49,19 @@
|
|||||||
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
|
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
|
||||||
;(unpin! t)
|
;(unpin! t)
|
||||||
|
|
||||||
(package! pyenv-mode)
|
|
||||||
(package! company-mode)
|
|
||||||
(package! lsp-jedi)
|
(package! lsp-jedi)
|
||||||
(package! company-jedi)
|
|
||||||
(package! flycheck)
|
(package! flycheck)
|
||||||
(package! company-tabnine :recipe (:host github :repo "TommyX12/company-tabnine"))
|
|
||||||
|
|
||||||
(package! org-bullets)
|
(package! org-bullets)
|
||||||
|
|
||||||
(package! wakatime-mode)
|
(package! wakatime-mode)
|
||||||
|
|
||||||
(package! py-isort)
|
(package! py-isort)
|
||||||
(package! python-pytest)
|
(package! python-pytest)
|
||||||
(package! python-docstring)
|
(package! python-docstring)
|
||||||
(package! py-autopep8)
|
(package! py-autopep8)
|
||||||
|
|
||||||
(package! diredfl)
|
|
||||||
(package! peep-dired)
|
|
||||||
|
|
||||||
(package! fira-code-mode)
|
(package! fira-code-mode)
|
||||||
(package! lsp-ui)
|
(package! lsp-ui)
|
||||||
(package! company-quickhelp)
|
|
||||||
(package! gif-screencast)
|
(package! gif-screencast)
|
||||||
(package! helm-pass)
|
|
||||||
(package! treemacs-icons-dired)
|
(package! treemacs-icons-dired)
|
||||||
(package! howdoi)
|
(package! howdoi)
|
||||||
(package! persist)
|
(package! persist)
|
||||||
(package! mozc)
|
(package! pipenv)
|
||||||
|
(package! lsp-python-ms)
|
||||||
|
Loading…
Reference in New Issue
Block a user