diff --git a/home/home.nix b/home/home.nix
index ab43070..1c273ea 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -43,10 +43,12 @@ let
     olifant
     subsurface
     yate
-    unstable.linphone
     # split and merge PDFs in a GUI
     pdfarranger
     transmission-qt
+    #(pkgs.pidgin-with-plugins.override {
+    #    plugins = [ pkgs.pidginotr ];})
+
 
     # for Hibiscus banking software
     jameica
@@ -240,7 +242,7 @@ let
     twemoji-color-font
     opensans-ttf
     (iosevka.override { privateBuildPlan = { design = [ "slab" "sp-term" ]; family = "Iosevka Serif"; }; set = "serif"; })
-    # TODO: vollkorn
+    myNur.vollkorn
     # TODO: humor-sans
   ];
 
@@ -319,4 +321,54 @@ in
   services.lorri.enable = true;
 
   fonts.fontconfig.enable = true;
+
+  programs.git =
+    let contacts = import ./secrets/contacts.nix;
+    in
+    {
+      enable = true;
+      includes = [
+        {
+          condition = "gitdir:~/Seafile/Studium/";
+          contents = {
+            user.name = contacts.realName;
+            user.email = contacts.uniMail;
+          };
+        }
+        {
+          condition = "gitdir:~/src/nixpkgs/";
+          contents = {
+            user.name = "Trolli Schmittlauch";
+            user.email = contacts.nixosMail;
+          };
+        }
+      ]
+      # set default name for several other common locations
+      ++ map
+        (dir: {
+          condition = "gitdir:${dir}";
+          contents = {
+            user.name = "Trolli Schmittlauch";
+            user.email = contacts.mainMail;
+          };
+        }) [ "~/src/" "~/bin/" "~/tmp/" "~/nixconfigs/" ];
+      extraConfig = {
+        credential.helper = "cache";
+        push.default = "simple";
+        diff.tool = "vimdiff";
+        merge.tool = "vimdiff";
+        core.excludesfile = toString (pkgs.writeText ".gitignore_global" ''
+          # Direnv stuff
+          .direnv
+          .envrc
+          # Editor files #
+          ################
+          *~
+          *.swp
+          *.swo
+        '');
+      };
+      lfs.enable = true;
+
+    };
 }
diff --git a/home/secrets b/home/secrets
index de07de8..068a475 160000
--- a/home/secrets
+++ b/home/secrets
@@ -1 +1 @@
-Subproject commit de07de8b76dac718ceef1258738ba2dd8fc3d3c2
+Subproject commit 068a4759e72948284c3de85d20a780723278f8b8
diff --git a/nixos/133dbc2.diff b/nixos/133dbc2.diff
deleted file mode 100644
index 59eeaae..0000000
--- a/nixos/133dbc2.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From 133dbc21785ebcdf571063ee1c4bcf273733c97b Mon Sep 17 00:00:00 2001
-From: Anders Broman <anders.broman@ericsson.com>
-Date: Wed, 01 Jul 2020 08:40:03 +0200
-Subject: [PATCH] BER: Add the posibillity to do "decode as" on an UDP port.
-
-Change-Id: I2897b32b58f154c9998316b16d24bf97ef544153
-Reviewed-on: https://code.wireshark.org/review/37628
-Petri-Dish: Anders Broman <a.broman58@gmail.com>
-Tested-by: Petri Dish Buildbot
-Reviewed-by: Anders Broman <a.broman58@gmail.com>
----
-
-diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
-index 15c2bb8..16bbf4f 100644
---- a/epan/dissectors/packet-ber.c
-+++ b/epan/dissectors/packet-ber.c
-@@ -4654,9 +4654,10 @@
-     syntax_names[i].value = 0;
-     syntax_names[i].strptr = NULL;
- 
--    /* allow the dissection of BER/DER carried over a TCP transport
-+    /* allow the dissection of BER/DER carried over a TCP/UDP transport
-        by using "Decode As..." */
-     dissector_add_for_decode_as_with_preference("tcp.port", ber_handle);
-+    dissector_add_for_decode_as_with_preference("udp.port", ber_handle);
- 
-     ber_update_oids();
- }