From e0f39800999dfef7cd64114fb37b91b8f3ea5977 Mon Sep 17 00:00:00 2001
From: xqtc <xqtc@tutanota.com>
Date: Sat, 19 Oct 2024 14:33:28 +0200
Subject: [PATCH] gpg stuff; resolve stash conflict

---
 home/modules/git.nix                    |  2 +-
 home/modules/home-pkgs.nix              |  2 +-
 hosts/x86_64-linux/asmodeus/default.nix | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home/modules/git.nix b/home/modules/git.nix
index 92abffc..f901f6b 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -8,7 +8,7 @@
     enable = true;
     userName = "xqtc";
     userEmail = "xqtc@tutanota.com";
-    signing ={
+    signing = {
       key = "655F2C328563DC87FB2077CC2C064D095926D9D1";
       signByDefault = true;
     };
diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix
index 1411d17..e0eacc0 100644
--- a/home/modules/home-pkgs.nix
+++ b/home/modules/home-pkgs.nix
@@ -115,7 +115,7 @@ in {
       ripgrep
 
       sayonara
-      # mpv
+      mpv
       feishin
 
       nix-tree
diff --git a/hosts/x86_64-linux/asmodeus/default.nix b/hosts/x86_64-linux/asmodeus/default.nix
index 1bdf091..ed0ded5 100644
--- a/hosts/x86_64-linux/asmodeus/default.nix
+++ b/hosts/x86_64-linux/asmodeus/default.nix
@@ -201,11 +201,11 @@
 
   # 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.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
 
   # List services that you want to enable: