2 files changed, 20 insertions, 10 deletions
diff --git a/modules/workstation/devel/.gitconfig b/modules/workstation/devel/.gitconfig
new file mode 100644
index 00000000000..473e166c016
--- /dev/null
+++ b/modules/workstation/devel/.gitconfig
@@ -0,0 +1,19 @@
+[user]
+    email = kookie@spacekookie.de
+    name = Katharina Fey
+    signingKey = 555F2E4B6F87F91A4110669E90734A9E619C8A6C
+[gpg]
+    program = gpg2
+[commit]
+    gpgsign = false
+[alias]
+    prettylog = log --pretty=format:'%Cred%h%Creset - %Cgreen(%cr)%Creset%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit --graph
+    update = pull --rebase --autostash
+    nmam = "!f() { git am -; }; f"
+    nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
+[help]
+    autocorrect = 1
+[sendemail]
+    smtpServer = /home/.nix-profile/bin/msmtp
+[merge]
+    renamelimit = 9999999
diff --git a/modules/workstation/devel/lorri/default.nix b/modules/workstation/devel/lorri/default.nix
index 74b0801e6b8..ab72c9b25ed 100644
--- a/modules/workstation/devel/lorri/default.nix
+++ b/modules/workstation/devel/lorri/default.nix
@@ -1,14 +1,5 @@
 { lib, pkgs, ... }:
 
-let
-  rev = "f20a3230bf7e93c4b5b41dff85740763d7ce02c8";
-  lorriSrc = fetchTarball {
-    url = "https://github.com/target/lorri/archive/${rev}.tar.gz";
-    sha256 = "1lp77rms6zlx04kz7nxar8ksay8xcl8bmi7nijgwyapzjy5q5cmq";
-  };
-in
 {
-  home.packages = [
-    (import lorriSrc { inherit pkgs; })
-  ];
+  services.lorri.enable = true; 
 }