diff options
| -rw-r--r-- | config.el | 83 | ||||
| -rw-r--r-- | packages.el | 16 |
2 files changed, 83 insertions, 16 deletions
diff --git a/config.el b/config.el index 9e862ae68795..0c70b4420423 100644 --- a/config.el +++ b/config.el @@ -900,28 +900,43 @@ (use-package! pyimport :after (python)) -(use-package! yapfify +(use-package! blacken :after (python) :init - (add-hook! python-mode #'yapf-mode)) - -(use-package! w3m + (add-hook #'python-mode-hook #'blacken-mode) :config - (setq browse-url-browser-function - `(("^https://app.clubhouse.io.*" . browse-url-firefox) - ("^https://github.com.*" . browse-url-firefox) - (".*" . browse-url-firefox)))) + (setq blacken-only-if-project-is-blackened t + blacken-allow-py36 t + blacken-line-length 100)) + +(after! python + (defun +python-setup () + (setq-local fill-column 100 + whitespace-line-column 100 + flycheck-disabled-checkers '(python-flake8) + flycheck-checker 'python-pylint)) + + (add-hook #'python-mode-hook #'+python-setup) + (add-hook #'python-mode-hook #'lsp) + (remove-hook #'python-mode-hook #'pipenv-mode)) + +; (use-package! w3m +; :config +; (setq browse-url-browser-function +; `(("^https://app.clubhouse.io.*" . browse-url-firefox) +; ("^https://github.com.*" . browse-url-firefox) +; (".*" . browse-url-firefox)))) (use-package! ob-http :config (add-to-list 'org-babel-load-languages '(http . t))) -(use-package! ob-ipython - :after (pyimport) - :config - (add-to-list 'org-babel-load-languages '(ipython . t)) - (setq ob-ipython-command - "/home/griffin/code/urb/ciml-video-classifier/bin/jupyter")) +;; (use-package! ob-ipython +;; :after (pyimport) +;; :config +;; (add-to-list 'org-babel-load-languages '(ipython . t)) +;; (setq ob-ipython-command + ;; "/home/griffin/code/urb/ciml-video-classifier/bin/jupyter")) (use-package! counsel-spotify) @@ -1045,7 +1060,8 @@ (use-package! string-inflection) (after! anaconda-mode - (set-company-backend! 'anaconda-mode #'company-yasnippet)) + ;; (set-company-backend! 'anaconda-mode #'company-yasnippet) + ) ;; (add-hook! python-mode ;; (capf)) @@ -1213,3 +1229,40 @@ SCHEDULED: <%s>" (use-package! metal-mercury-mode) (use-package! flycheck-mercury :after (metal-mercury-mode flycheck-mercury)) + +(use-package! direnv + :config (direnv-mode)) + +(after! notmuch + (setq notmuch-saved-searches + '((:name "inbox" :query "tag:inbox tag:important not tag:trash" :key "i") + (:name "flagged" :query "tag:flagged" :key "f") + (:name "sent" :query "tag:sent" :key "s") + (:name "drafts" :query "tag:draft" :key "d") + + (:name "work" :query "tag:inbox and tag:important and path:work/**" + :key "w") + (:name "personal" :query "tag:inbox and tag:important and path:personal/**" + :key "p")) + message-send-mail-function 'message-send-mail-with-sendmail) + + (add-hook! notmuch-message-mode-hook + #'notmuch-company-setup)) + +(after! erc + ;; (setq erc-autojoin-channels-alist '(("freenode.net" "#nixos" "#haskell" "##tvl"))) + ) + +(defun evil-disable-insert-state-bindings () + evil-disable-insert-state-bindings) + +;; (use-package! terraform-mode) +;; (use-package! company-terraform +;; :after terraform-mode +;; :config (company-terraform-init)) + +(use-package! znc + :config + (setq znc-servers + '(("znc.gws.fyi" 5000 t + ((freenode "glittershark" "Ompquy")))))) diff --git a/packages.el b/packages.el index 41e8e1490432..5a29c60ae9c3 100644 --- a/packages.el +++ b/packages.el @@ -107,7 +107,9 @@ ;;; Python (package! pyimport) -(package! yapfify) +;; (package! yapfify) +(package! blacken) + ;;; Desktop interaction (package! counsel-spotify) @@ -127,6 +129,10 @@ (package! nix-update :recipe (:host github :repo "glittershark/nix-update-el")) +(package! direnv) + +;;; Email +(package! mu4e) ;;; Sequence diagrams (package! wsd-mode @@ -138,3 +144,11 @@ :recipe (:host github :repo "ahungry/metal-mercury-mode")) (package! flycheck-mercury) + +(package! terraform-mode) +(package! company-terraform) + +;;; +(package! znc + :recipe (:host github + :repo "sshirokov/ZNC.el")) |