Added Lazer and improved Python config

5 files changed, 38 insertions, 12 deletions

diff --git a/.config/doom/config.el b/.config/doom/config.el
index ecd058a6..11eb6571 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -79,7 +79,7 @@
           ("j" "Journal entry")
           ("jP" "Journal entry private" entry (file+olp+datetree "~/org/journal-private.org") "** %U - %^{Heading}")
           ("jX" "Journal entry X-Team" entry (file+olp+datetree "~/org/journal-xteam.org") "** %U - %^{Heading}")
-          ("jX" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}")
+          ("jL" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}")
           )))
   ;; Custom agenda views
   (setq org-agenda-custom-commands
@@ -256,12 +256,12 @@ text and copying to the killring."
   (setq lsp-headerline-breadcrumb-enable t)
   (setq lsp-headerline-breadcrumb-icons-enable t))
 
-(require 'auto-virtualenv)
+;; (require 'auto-virtualenv)
 (after! python
   :init
-  (add-hook 'python-mode-hook 'auto-virtualenv-set-virtualenv)
   (add-hook 'python-mode-hook #'poetry-tracking-mode)
-  (setq enable-local-variables :all))
+  (setq enable-local-variables :all)
+  (setq poetry-tracking-strategy 'projectile))
 
 (after! groovy-mode
   (define-key groovy-mode-map (kbd "<f4>") 'my/jenkins-verify))
diff --git a/.config/doom/config.org b/.config/doom/config.org
index 032bc804..bef6bce4 100644
--- a/.config/doom/config.org
+++ b/.config/doom/config.org
@@ -147,7 +147,7 @@ TODO: Breakup later
           ("j" "Journal entry")
           ("jP" "Journal entry private" entry (file+olp+datetree "~/org/journal-private.org") "** %U - %^{Heading}")
           ("jX" "Journal entry X-Team" entry (file+olp+datetree "~/org/journal-xteam.org") "** %U - %^{Heading}")
-          ("jX" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}")
+          ("jL" "Journal entry Lazer" entry (file+olp+datetree "~/org/journal-lazer.org") "** %U - %^{Heading}")
           )))
   ;; Custom agenda views
   (setq org-agenda-custom-commands
@@ -343,12 +343,12 @@ text and copying to the killring."
 :END:
 
 #+begin_src emacs-lisp
-(require 'auto-virtualenv)
+;; (require 'auto-virtualenv)
 (after! python
   :init
-  (add-hook 'python-mode-hook 'auto-virtualenv-set-virtualenv)
   (add-hook 'python-mode-hook #'poetry-tracking-mode)
-  (setq enable-local-variables :all))
+  (setq enable-local-variables :all)
+  (setq poetry-tracking-strategy 'projectile))
 #+end_src
 ** Groovy
 :PROPERTIES:
diff --git a/.config/doom/custom.el b/.config/doom/custom.el
new file mode 100644
index 00000000..a31fff73
--- /dev/null
+++ b/.config/doom/custom.el
@@ -0,0 +1,25 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'")
+ '(safe-local-variable-values
+   '((poetry-tracking-strategy . "projectile")
+     (poetry-tracking-mode quote projectile)
+     (poetry-tracking-strategy quote projectile)
+     (projectile-project-compilation-cmd . "npm run python:lint")
+     (projectile-project-run-cmd . "npm start")
+     (projectile-project-test-cmd . "npm run python:unit")
+     (lsp-pylsp-plugins-pydocstyle-enabled)
+     (projectile-project-run-cmd . "make up")
+     (python-pytest-executable . "docker-compose run --rm -e CI=True app python -m pytest")
+     (projectile-project-test-cmd . "make test")
+     (lsp-pylsp-plugins-flake8-enabled))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(font-lock-comment-face ((t (:slant italic))))
+ '(font-lock-keyword-face ((t (:slant italic)))))
diff --git a/.config/doom/init.el b/.config/doom/init.el
index 6ae1f4c4..9dc03c7d 100644
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -81,7 +81,7 @@
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
-       ;;(spell +flyspell) ; tasing you for misspelling mispelling
+       (spell +flyspell +everywhere) ; tasing you for misspelling mispelling
        ;;grammar           ; tasing grammar mistake every you make
 
        :tools
@@ -160,7 +160,9 @@
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       (python +lsp)            ; beautiful is better than ugly
+       (python
+        +lsp
+        +poetry)            ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index 14a57bc6..14e44121 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -49,7 +49,6 @@
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;(unpin! t)
 
-(package! auto-virtualenv)
 (package! org-bullets)
 (package! idle-highlight-mode)
 (package! symbol-overlay)
@@ -73,4 +72,4 @@
 (package! deferred)
 (package! ox-slack)
 (package! org-auto-tangle)
-(package! poetry)
+;; (package! poetry)