From f5d5a7e404d7784a1257f563429375546ef0033d Mon Sep 17 00:00:00 2001
From: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
Date: Thu, 22 Sep 2022 11:43:48 +0200
Subject: [PATCH] Updates .emacs

---
 .config/git/ignore |  1 +
 .emacs             | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.config/git/ignore b/.config/git/ignore
index ee4c8a8..c2d15ee 100644
--- a/.config/git/ignore
+++ b/.config/git/ignore
@@ -1,3 +1,4 @@
 *~
 .dir-locals.el
 .envrc
+.direnv
diff --git a/.emacs b/.emacs
index 8143df4..018f802 100644
--- a/.emacs
+++ b/.emacs
@@ -7,38 +7,35 @@
  ;; If there is more than one, they won't work right.
  '(c-basic-offset 4)
  '(c-default-style
-   (quote
-	((c++-mode . "tuleu-c++")
+   '((c++-mode . "tuleu-c++")
 	 (java-mode . "java")
 	 (awk-mode . "awk")
-	 (other . "gnu"))))
+	 (other . "gnu")))
  '(company-idle-delay 20.0)
  '(display-line-numbers-type t)
+ '(elpy-formatter 'black)
+ '(elpy-test-runner 'elpy-test-pytest-runner)
  '(global-auto-revert-mode t)
  '(global-display-line-numbers-mode t)
  '(gofmt-command "goimports")
  '(inhibit-startup-screen t)
- '(org-agenda-files (quote ("~/org/1.TODO.org")))
+ '(org-agenda-files '("~/org/1.TODO.org"))
  '(package-archives
-   (quote
-	(("gnu" . "https://elpa.gnu.org/packages/")
-	 ("melpa" . "https://melpa.org/packages/"))))
+   '(("gnu" . "https://elpa.gnu.org/packages/")
+	 ("melpa" . "https://melpa.org/packages/")))
  '(package-enable-at-startup nil)
  '(package-selected-packages
-   (quote
-	(zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode elpy markdown-mode yasnippet srefactor irony cmake-mode company magit use-package)))
+   '(zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode elpy markdown-mode yasnippet srefactor irony cmake-mode company magit use-package))
  '(safe-local-variable-values
-   (quote
-	((vc-follow-symlinks . t)
+   '((vc-follow-symlinks . t)
 	 (TeX-master . t)
-	 (TeX-parse-self . t))))
+	 (TeX-parse-self . t)))
  '(srefactor--getter-prefix "Get")
  '(srefactor--getter-setter-capitalize-p t)
  '(srefactor--setter-prefix "Set")
  '(tab-width 4)
  '(whitespace-style
-   (quote
-	(face trailing tabs lines-tail newline space-before-tab::tab space-before-tab::space space-before-tab tab-mark))))
+   '(face trailing tabs lines-tail newline space-before-tab::tab space-before-tab::space space-before-tab tab-mark)))
 
 
 (if (fboundp 'toggle-scroll-bar)
@@ -307,7 +304,6 @@ header"
 (use-package elpy
   :init
   (elpy-enable)
-  (setenv "WORKON_HOME" (concat (getenv "HOME") "/miniconda3/envs"))
   :config
   (add-hook 'elpy-mode-hook (lambda ()
 							  (add-hook 'before-save-hook