From aaa0a5016fbca155401a7464dde58d262879ad6b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Fri, 12 Jan 2024 14:22:59 +0100
Subject: [PATCH 1/2] feat: add git-delete-merged-branches

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
---
 modules/home/tools/git/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 4392d50..b50044e 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -18,6 +18,9 @@ in
   };
 
   config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+            git-delete-merged-branches
+    ];
     programs.git = {
       enable = true;
       inherit (cfg) userName userEmail;

From 8ab6f726bdfe3bd53a004882fb99d473abb7cb0b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Fri, 12 Jan 2024 14:23:32 +0100
Subject: [PATCH 2/2] chore(sgx-nixos): cleanup

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
---
 systems/x86_64-linux/sgx-nixos/default.nix | 24 ++++------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/systems/x86_64-linux/sgx-nixos/default.nix b/systems/x86_64-linux/sgx-nixos/default.nix
index c8324d6..5503f41 100644
--- a/systems/x86_64-linux/sgx-nixos/default.nix
+++ b/systems/x86_64-linux/sgx-nixos/default.nix
@@ -63,12 +63,6 @@ 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"
@@ -106,20 +100,10 @@ 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
@@ -132,10 +116,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: