diff --git a/home/R.nix b/home/R.nix
index 6714493..1708111 100644
--- a/home/R.nix
+++ b/home/R.nix
@@ -35,12 +35,23 @@
           propagatedBuildInputs = [];
           nativeBuildInputs = [];
         };
+        readODS = pkgs.rPackages.buildRPackage {
+          name = "goethR";
+          src = builtins.fetchGit {
+            url = "https://git@github.com/ktiu/readODS/";
+            ref = "v1.8";
+            rev = "03a194bac87b050c42d0e70c8cc638be79c6443d";
+          };
+          propagatedBuildInputs = [xml2 cellranger readr stringi purrr zip];
+          nativeBuildInputs = [];
+        };
       in [
         bookdown
         catmaply
         DAAG
         devtools
         dplyr
+        eurostat
         extrafont
         ggplot2
         jsonlite
@@ -54,6 +65,7 @@
         progress
         purrr
         qrcode
+        RColorBrewer
         readODS
         revealjs
         rlist
diff --git a/home/mail/config.neomuttrc b/home/mail/config.neomuttrc
index 9b6dcaa..222d069 100644
--- a/home/mail/config.neomuttrc
+++ b/home/mail/config.neomuttrc
@@ -28,7 +28,7 @@ set use_envelope_from
 unset reverse_realname
 
 # Searching
-# set nm_default_url = "notmuch:///home/till/.local/share/neomutt/mail/"
+set nm_default_url = "notmuch:///home/till/.local/share/mail/"
 
 # Multi-account setup
 # source ~/.config/neomutt/accounts/dkg.neomuttrc
diff --git a/home/mail/default.nix b/home/mail/default.nix
index 5c91b59..c1cd6ff 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -15,13 +15,14 @@
     vimKeys = true;
     extraConfig = builtins.readFile ./config.neomuttrc;
   };
+  programs.notmuch.enable = true;
+  # xdg.configFile."notmuch/default/config".source = ./notmuch.config;
   xdg.configFile."neomutt/bindings.neomuttrc".source = ./bindings.neomuttrc;
   xdg.configFile."neomutt/smime.neomuttrc".source = ./smime.neomuttrc;
   xdg.configFile."neomutt/mailcap".source = ./neomutt_mailcap;
   accounts.email = {
-    maildirBasePath = "${config.xdg.dataHome}/mail/imap";
+    maildirBasePath = "${config.xdg.dataHome}/mail/";
     accounts = {
-
       gu = {
         primary = true;
         address = "straube@geo.uni-frankfurt.de";
@@ -30,6 +31,7 @@
         smtp.host = "smtpauth.rz.uni-frankfurt.de";
         smtp.tls.useStartTls = true;
         userName = "tstraube";
+        notmuch.enable = true;
         passwordCommand = "secret-tool lookup server uni-frankfurt.de account tstraube";
         signature = {
           text = ''
@@ -77,13 +79,13 @@
           '';
         };
       };
-
       ktiu = {
         address = "till@ktiu.net";
         realName = "Till Straube";
         imap.host = "shorbut.ktiu.net";
         smtp.host = "shorbut.ktiu.net";
         smtp.tls.useStartTls = true;
+        notmuch.enable = true;
         userName = "till";
         signature.text = ''
           Till Straube (he, him, his)
@@ -112,7 +114,7 @@
             set my_signature = ${
               pkgs.writeText
                 "signature.txt"
-                config.accounts.email.accounts.gu.signature.text
+                config.accounts.email.accounts.ktiu.signature.text
             }
             color status yellow default
           '';
diff --git a/home/nvim/ftplugin/markdown.vim b/home/nvim/ftplugin/markdown.vim
index b33dbd1..15f0a58 100644
--- a/home/nvim/ftplugin/markdown.vim
+++ b/home/nvim/ftplugin/markdown.vim
@@ -1,5 +1,6 @@
 setlocal spell
 setlocal textwidth=0
+setlocal shiftwidth=2
 setlocal syntax=rmd
 setlocal breakat-=@
 
diff --git a/home/tex.nix b/home/tex.nix
index 855a5cb..d55566b 100644
--- a/home/tex.nix
+++ b/home/tex.nix
@@ -10,6 +10,7 @@ let
       enotez
       enumitem
       environ
+      framed
       gensymb
       lastpage
       ly1