diff --git a/home.nix b/home.nix
index f8719bc..e69dddd 100644
--- a/home.nix
+++ b/home.nix
@@ -14,7 +14,7 @@ rec {
       experimental-features = nix-command flakes
     '';
   };
-  
+
   nixpkgs.config = {
     allowUnfree = true;
     packageOverrides = pkgs: {
@@ -41,7 +41,7 @@ rec {
     source = pkgs.writeTextFile {
       name = "gpg-agent-conf";
       text = ''
-        pinentry-program ${pkgs.pinentry_mac.out}/${pkgs.pinentry_mac.binaryPath}
+        pinentry-program pinentry-mac
       '';
     };
   };
diff --git a/packages.nix b/packages.nix
index d3081e9..4517514 100644
--- a/packages.nix
+++ b/packages.nix
@@ -39,6 +39,8 @@ let
     plantuml
     rnix-lsp
     clang-tools
+    graphviz
+    nixfmt
     texlive.combined.scheme-full
   ];
   
diff --git a/programs.nix b/programs.nix
index 81b14c5..06115d2 100644
--- a/programs.nix
+++ b/programs.nix
@@ -17,6 +17,11 @@
     };
   };
 
+  java = {
+    enable = true;
+    package = pkgs.jdk;
+  };
+
   home-manager.enable = true;
 
   git = {
@@ -35,7 +40,7 @@
     userEmail = "willem@leit.so";
   };
 
-  emacs.enable = true;
+  #emacs = import ./emacs.nix { inherit lib config pkgs isDarwin homeDir; };
 
   zoxide = {
     enable = true;
@@ -54,6 +59,7 @@
     enableVteIntegration = true;
     autocd = true;
     defaultKeymap = "emacs";
+    envExtra = "export PATH=${pkgs.pinentry_mac.out}/Applications/pinentry-mac.app/Contents/MacOS:$PATH";
     dirHashes = {
       docs = "$HOME/Documents";
       appsup = "$HOME/Library/Application Support";
@@ -66,6 +72,12 @@
       extended = true;
       ignoreDups = true;
     };
+    shellAliases = {
+      em = "emacsclient -c";
+      emt = "emacsclient -c -nw";
+      np = "nix-shell -p";
+      hms = "home-manager switch";
+    };
     plugins = with pkgs; [
       {
         name = "powerlevel10k";