diff --git a/common/base-hardware.nix b/common/base-hardware.nix
index 4283273..19d2cda 100644
--- a/common/base-hardware.nix
+++ b/common/base-hardware.nix
@@ -1,14 +1,12 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.luks.devices = [
-    {
-      name = "root";
+  boot.initrd.luks.devices = {
+    root = {
       device = "/dev/disk/by-partlabel/nixos";
-      preLVM = true;
       allowDiscards = true;
-    }
-  ];
+    };
+  };
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/home/felschr.nix b/home/felschr.nix
index 587a122..51a8dc5 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -27,11 +27,39 @@ with pkgs;
       night = "0.9";
     };
   };
+   
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+  };
+
+  programs.ssh = {
+    enable = true;
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    extraConfig = ''
+      pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
+    '';
+  };
+
+  programs.gpg.enable = true;
 
   programs.git = {
     enable = true;
     userName = "Felix Tenley";
     userEmail = "dev@felschr.com";
+    ignores = [".direnv"];
+    signing = {
+      key = "22A6 DD21 EE66 E73D D4B9  3F20 A12D 7C9D 2FD3 4458";
+      signByDefault = true;
+    };
+    extraConfig = {
+      pull = { rebase = true; };
+      rebase = { autoStash = true; };
+    };
   };
 
   home.packages = with pkgs; [