From 76b9a837b3d8d33fc0780033ba4cae7a89c98676 Mon Sep 17 00:00:00 2001
From: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
Date: Fri, 28 Oct 2022 17:03:36 +0200
Subject: [PATCH] repairs golang mode

---
 .emacs | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/.emacs b/.emacs
index 0f5944b..1d3fed4 100644
--- a/.emacs
+++ b/.emacs
@@ -189,6 +189,8 @@
 	)
   (custom-set-faces
    '(lsp-ui-doc-background ((t (:background "#373B41")))))
+  (add-to-list 'lsp-disabled-clients 'pyls)
+  (add-to-list 'lsp-enabled-clients 'jedi)
   :bind (
 		 ("C-c C-d" . lsp-ui-doc-toggle)
 		 )
@@ -235,9 +237,9 @@
   (python-mode . (lambda () (setq-local company-prescient-sort-length-enable nil)))
   (python-mode . (lambda () (setq-local fill-column 88)))
   (python-mode . lsp-deferred)
-  ;; (lsp-managed-mode . (lambda ()
-  ;; 						(when (derived-mode-p 'python-mode)
-  ;; 						  (setq atu/flycheck-local-cache '((lsp . ((next-checkers . (python-flake8)))))))))
+  (lsp-managed-mode . (lambda ()
+						(when (derived-mode-p 'python-mode)
+						  (setq atu/flycheck-local-cache '((lsp . ((next-checkers . (python-flake8)))))))))
 
   )
 
@@ -248,6 +250,7 @@
 	"Gets .direnv from project root python venv if any"
 	(when-let* ((root-dir (projectile-project-root))
 				(direnv (concat (file-name-as-directory root-dir) ".direnv"))
+				(direnv-exists (file-directory-p direnv))
 				(venvs (directory-files direnv t "python-.*")))
 	  (car (last venvs)))
 	)
@@ -322,26 +325,20 @@
   )
 
 
-(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)
-	)
+(use-package lsp-jedi )
+
+
+(use-package blacken
+  :commands blacken-mode blacken-buffer
+  :hook
+  (python-mode . blacken-mode)
   )
 
-
-;; (use-package blacken
-;;   :commands blacken-mode blacken-buffer
-;;   :hook
-;;   (python-mode . blacken-mode)
-;;   )
-
-;; (use-package py-isort
-;;   :commands py-isort-buffer
-;;   :hook
-;;   (before-save-hook . py-isort-before-save)
-;;   )
+(use-package py-isort
+  :commands py-isort-buffer
+  :hook
+  (before-save-hook . py-isort-before-save)
+  )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; C/C++
@@ -445,9 +442,7 @@
 (use-package go-mode
   :after (projectile)
   :config
-  (setq gofmt-command "goimports")
   (unbind-key "C-c C-d" go-mode-map)
-  (add-hook 'before-save-hook 'gofmt-before-save)
   ;;(setq compile-command "go build && go test -coverprofile=cover.out && go tool cover -html cover.out -o /tmp/cover.html")
   (defun go-compile-command ()
 	"returns a string to compile a go project"
@@ -460,7 +455,13 @@
   (projectile-update-project-type
    'go
    :compile 'go-compile-command)
+  :hook
+  (go-mode . lsp-deferred)
+  (go-mode . (lambda ()
+			   (add-hook 'before-save-hook #'lsp-format-buffer t t)
+			   (add-hook 'before-save-hook #'lsp-organize-imports t t)))
   )
+
 (use-package glsl-mode)
 (use-package opencl-mode)