diff --git a/Emacs/.emacs b/Emacs/.emacs index 2b57ffb..b0d4aa7 100644 --- a/Emacs/.emacs +++ b/Emacs/.emacs @@ -18,4 +18,5 @@ (require 'setup-org) (require 'setup-appearance) (require 'setup-c) +(require 'setup-python) (require 'setup-web) diff --git a/Emacs/custom/setup-appearance.el b/Emacs/custom/setup-appearance.el index 5189adf..edfe820 100644 --- a/Emacs/custom/setup-appearance.el +++ b/Emacs/custom/setup-appearance.el @@ -3,14 +3,9 @@ :hook (prog-mode . rainbow-delimiters-mode)) ;; theme -(use-package doom-themes - :ensure t - :config - (setq doom-themes-enable-bold t - doom-themes-enable-italic t) - (load-theme 'doom-one-light t) - - (doom-themes-org-config)) +(use-package kanagawa-themes + :init + (load-theme 'kanagawa-dragon t)) ;; moody (use-package moody @@ -68,4 +63,19 @@ (setq-default fill-column 80) (display-fill-column-indicator-mode 1) +;; font +(set-frame-font "Jetbrains Mono 12" nil t) +(setq frame-title-format nil) + +;; olivetti +(use-package olivetti + :config + (setq olivetti-body-width 94) + :init + (add-hook 'text-mode-hook 'olivetti-mode)) + +;; transparency +(set-frame-parameter nil 'alpha-background 70) +(add-to-list 'default-frame-alist '(alpha-background . 70)) + (provide 'setup-appearance) diff --git a/Emacs/custom/setup-general.el b/Emacs/custom/setup-general.el index 0224a1f..8c949ca 100644 --- a/Emacs/custom/setup-general.el +++ b/Emacs/custom/setup-general.el @@ -98,7 +98,8 @@ (use-package lsp-mode :ensure t :hook ((c-mode . lsp) - (php-mode . lsp)) + (php-mode . lsp) + (python-mode . lsp)) :commands lsp) (use-package lsp-ui diff --git a/Emacs/custom/setup-python.el b/Emacs/custom/setup-python.el new file mode 100644 index 0000000..a36d8c7 --- /dev/null +++ b/Emacs/custom/setup-python.el @@ -0,0 +1,16 @@ +(use-package elpy + :init + (elpy-enable) + :config + (setq elpy-modules (delq 'elpy-module-flymake elpy-modules)) + (add-hook 'elpy-mode-hook 'flycheck-mode)) + +(use-package py-autopep8 + :after elpy + :config + (add-hook 'elpy-mode-hook 'py-autopep8-mode)) + +(use-package blacken + :after elpy) + +(provide 'setup-python) diff --git a/Emacs/custom/setup-web.el b/Emacs/custom/setup-web.el index b28ec32..11c5b8c 100644 --- a/Emacs/custom/setup-web.el +++ b/Emacs/custom/setup-web.el @@ -3,13 +3,4 @@ :ensure t :hook (sgml-mode . emmet-mode)) -;; for laravel -(use-package php-mode - :ensure t - :mode ("\\.php\\'" . php-mode)) -(add-to-list 'auto-mode-alist '("\\.php$" . php-mode)) - -(use-package phpunit - :ensure t) - (provide 'setup-web)