From 70ca58225148762287b348fdb47e68be1eb4757d Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com>
Date: Fri, 1 Jan 2021 11:37:51 +0100
Subject: [PATCH] Update Package configuration

---
 bundle/bundle--hooks.el   |  6 ------
 bundle/bundle--keys.el    |  2 ++
 bundle/bundle--package.el | 20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bundle/bundle--hooks.el b/bundle/bundle--hooks.el
index 31b61b60..6ccde35b 100644
--- a/bundle/bundle--hooks.el
+++ b/bundle/bundle--hooks.el
@@ -3,12 +3,6 @@
 (add-hook 'write-file-hooks 'delete-trailing-whitespace)
 (add-hook 'diary-list-entries-hook 'diary-include-other-diary-files)
 (add-hook 'diary-mark-entries-hook 'diary-mark-included-diary-files)
-(defun me/org-mode ()
-  "My custom configuration for 'org-mode'."
-  ;(olivetti-mode)
-  (require 'olivetti)
-  (olivetti-set-width 82))
-(add-hook 'nov-mode-hook 'me/org-mode)
 (add-hook 'org-mode-hook 'turn-on-auto-fill)
 (add-hook 'rst-mode-hook 'turn-on-orgstruct)
 (add-hook 'newsticker-mode-hook 'imenu-add-menubar-index)
diff --git a/bundle/bundle--keys.el b/bundle/bundle--keys.el
index c9467f97..2a037a58 100644
--- a/bundle/bundle--keys.el
+++ b/bundle/bundle--keys.el
@@ -9,3 +9,5 @@
 (global-set-key (kbd "M-i") 'imenu)
 (global-set-key (kbd "C-c n") 'newsticker-start)
 (global-set-key (kbd "M-o") 'ace-window)
+(global-set-key (kbd "M-[") 'tab-bar-history-back)
+(global-set-key (kbd "M-]") 'tab-bar-history-forward)
diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el
index 5cf59d9e..e2250667 100644
--- a/bundle/bundle--package.el
+++ b/bundle/bundle--package.el
@@ -34,9 +34,12 @@ There are two things you can do about this warning:
   :init
   (ivy-mode 1))
 
+(use-package olivetti
+  :custom (olivetti-body-width 82))
+
 (use-package nov
-  :config
-  (setq nov-text-width 80))
+  :config (setq nov-text-width nil nov-variable-pitch nil)
+  :hook (nov-mode . olivetti-mode))
 
 (use-package projectile
   :init
@@ -47,7 +50,15 @@ There are two things you can do about this warning:
 (define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
 (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
 
-(use-package elpy)
+(use-package elpy
+  :config (setq elpy-modules
+                '(elpy-module-autodoc
+                  elpy-module-company
+                  elpy-module-eldoc
+                  elpy-module-pyvenv
+                  elpy-module-yasnippet)
+                elpy-test-pytest-runner-command '("pytest")))
+
 (use-package pyvenv
   :init (pyvenv-mode 1))
 
@@ -92,8 +103,6 @@ There are two things you can do about this warning:
 (use-package slime
   :config (setq inferior-lisp-program (executable-find "sbcl")))
 
-
-
 (use-package org
   :config
   (setq org-agenda-dim-blocked-tasks nil
@@ -126,6 +135,7 @@ There are two things you can do about this warning:
                              ("screen" . shell-script)
                              ("shell" . sh)
                              ("C" . c)
+                             ("sqlite" . sql)
                              ("plantuml" . plantuml)))
         org-use-property-inheritance nil
         org-export-with-sub-superscripts nil