diff --git a/home/R.nix b/home/R.nix
index bfb624e..155ad26 100644
--- a/home/R.nix
+++ b/home/R.nix
@@ -37,31 +37,34 @@
         };
       in [
         bookdown
-        jsonlite
         DAAG
-        extrafont
-        revealjs
-        ggplot2
+        devtools
         dplyr
-        rlist
-        rvest
-        rmarkdown
+        extrafont
+        ggplot2
+        jsonlite
+        kableExtra
         knitr
+        languageserver
+        magrittr
+        mapproj
         openxlsx
+        purrr
+        qrcode
+        readODS
+        revealjs
+        rlist
+        rmarkdown
         rnaturalearth
         rnaturalearthdata
-        qrcode
-        mapproj
+        roxygen2
+        rvest
         sf
+        stringr
+        testthat
+        tidyr
         tidyverse
         tmap
-        languageserver
-        purrr
-        magrittr
-        knitr
-        kableExtra
-        tidyr
-        stringr
         yaml
         lectuR
         publishR
diff --git a/home/default.nix b/home/default.nix
index 24d4d1d..31ec2c5 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -20,6 +20,8 @@
 
   programs.home-manager.enable = true;
 
+  services.syncthing.enable = true;
+
   home.packages = with pkgs; [
 
     # commandline
@@ -69,8 +71,10 @@
     nyxt
 
     # deveolopment
+    bundix
     nodejs
     ruby
+    android-studio
 
     # secrets
     libsecret
diff --git a/home/foot.nix b/home/foot.nix
index de879a5..cc64ba0 100644
--- a/home/foot.nix
+++ b/home/foot.nix
@@ -4,16 +4,18 @@
   programs.foot = {
     enable = true;
     settings =  {
-      shell = "/home/till/.nix-profile/bin/fish -c 'tmux attach || tmux'";
-      pad = "20x20";
-      font = "JetBrains Mono:size=9";
-      initial-window-mode = "maximized";
-      line-height = "11.3";
-      dpi-aware = "yes";
+      main = {
+        shell = "/home/till/.nix-profile/bin/fish -c 'tmux attach || tmux'";
+        pad = "20x20";
+        font = "JetBrains Mono:size=9";
+        initial-window-mode = "maximized";
+        line-height = "11.3";
+        dpi-aware = true;
+      };
       mouse.hide-when-typing = "yes";
       cursor = {
         style = "beam";
-        blink = "yes";
+        blink = true;
         color = "eeeeee 1c1c1c";
       };
       csd.size = "0";
@@ -42,5 +44,6 @@
         show-urls-launch = "Control+Shift+g";
         show-urls-copy = "Control+Shift+y";
       };
+    };
   };
 }
diff --git a/home/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc
index 6ec0d01..a35ff00 100644
--- a/home/mail/bindings.neomuttrc
+++ b/home/mail/bindings.neomuttrc
@@ -65,9 +65,7 @@ macro index,pager L "<limit>all\n" "Show all messages (undo limit)"
 
 macro index,pager go "<shell-escape>mbsync $my_mbsync_acct && notmuch new<enter>" \
 
-macro index,pager g/ \
-   "<vfolder-from-query-readonly>" \
-   "mu find"
+macro index,pager g/ "<vfolder-from-query-readonly>" "find in nm"
 
 macro index,pager A \
   "<pipe-message>khard add-email --vcard-version=4.0<return>" \
diff --git a/home/mail/config.neomuttrc b/home/mail/config.neomuttrc
index 335587c..9b6dcaa 100644
--- a/home/mail/config.neomuttrc
+++ b/home/mail/config.neomuttrc
@@ -3,7 +3,7 @@ source $alias_file
 
 set mailcap_path = ~/.config/neomutt/mailcap
 
-source ./smime.neomuttrc
+# source ./smime.neomuttrc
 
 set my_download_folder = ~/tmp
 
diff --git a/home/mail/default.nix b/home/mail/default.nix
index 3553878..c333caf 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -29,14 +29,18 @@
         imap.host = "imap.server.uni-frankfurt.de";
         smtp.host = "smtpauth.rz.uni-frankfurt.de";
         smtp.tls.useStartTls = true;
-        passwordCommand = "secret-tool lookup server uni-frankfurt.de account tstraube";
         userName = "tstraube";
+        passwordCommand = "secret-tool lookup server uni-frankfurt.de account tstraube";
         signature = {
           text = ''
-            Till Straube
+            Dr. Till Straube (he, him, his)
+            Dept. of Human Geography
+            Goethe University Frankfurt
           '';
           showSignature = "append";
         };
+        mbsync.enable = true;
+        msmtp.enable = true;
         neomutt = {
           enable = true;
           sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
@@ -48,13 +52,15 @@
             set crypt_auto_smime
             unset crypt_auto_pgp
 
-            # set crypt_autosign
-            # set crypt_replyencrypt
-            # set crypt_replysign
-            # set crypt_replysignencrypted
+            set crypt_autosign
+            set crypt_replyencrypt
+            set crypt_replysign
+            set crypt_replysignencrypted
             set crypt_verify_sig
-            set smime_default_key = "f1355556.0"
-            set pgp_default_key   = ""
+            # set smime_default_key = "f1355556.0"
+            set smime_sign_as = "f1355556.0"
+            set pgp_default_key = ""
+            # unset crypt_use_gpgme
 
             unalternates *
             alternates ^straube@em.uni-frankfurt.de$ \
@@ -62,12 +68,14 @@
                        ^tstraube@rz.uni-frankfurt.de$ \
                        ^tstraube@uni-frankfurt.de$
             unset reverse_name
-            # set my_signature = {signature}
+            set my_signature = ${
+              pkgs.writeText
+                "signature.txt"
+                config.accounts.email.accounts.gu.signature.text
+            }
             color status blue default
           '';
         };
-        mbsync.enable = true;
-        msmtp.enable = true;
       };
 
       ktiu = {
@@ -78,7 +86,8 @@
         smtp.tls.useStartTls = true;
         userName = "till";
         signature.text = ''
-          Till Straube
+          Till Straube (he, him, his)
+          PGP: https://keys.openpgp.org/search?q=till@ktiu.net
         '';
         signature.showSignature = "append";
         gpg = {
@@ -97,7 +106,11 @@
             unalternates *
             alternates @ktiu.net$
             set reverse_name
-            # set my_signature = {signature}
+            set my_signature = ${
+              pkgs.writeText
+                "signature.txt"
+                config.accounts.email.accounts.gu.signature.text
+            }
             color status yellow default
           '';
         };
diff --git a/system/default.nix b/system/default.nix
index 160e604..7d00f39 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -8,10 +8,16 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
+  zramSwap.enable = true;
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.networkmanager.enable = true;
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 4000 ];
+  };
 
   time.timeZone = "Europe/Berlin";
 
@@ -56,6 +62,8 @@
     git
     firefox
     foot
+    htop
+    killall
   ];
 
   fonts.fonts = with pkgs; [