diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index b50044e..4392d50 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -18,9 +18,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-            git-delete-merged-branches
-    ];
     programs.git = {
       enable = true;
       inherit (cfg) userName userEmail;
diff --git a/systems/x86_64-linux/sgx-nixos/default.nix b/systems/x86_64-linux/sgx-nixos/default.nix
index 5503f41..c8324d6 100644
--- a/systems/x86_64-linux/sgx-nixos/default.nix
+++ b/systems/x86_64-linux/sgx-nixos/default.nix
@@ -63,6 +63,12 @@ with lib.plusultra;
     LC_TIME = "de_DE.UTF-8";
   };
 
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "";
+  };
+
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box"
     "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz"
@@ -100,10 +106,20 @@ with lib.plusultra;
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     age
+    delta
+    gcc
+    git
+    git-delete-merged-branches
+    gnumake
+    htop
     mdadm
+    mosh
+    nixpkgs-fmt
     openssl
     rustup
     sops
+    strace
+    tmux
     tpm2-pkcs11
     tpm2-pkcs11.out
     tpm2-tools
@@ -116,10 +132,10 @@ with lib.plusultra;
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
-  programs.gnupg.agent = {
-     enable = true;
-     enableSSHSupport = true;
-  };
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
 
   # List services that you want to enable: