From 264e4cb43a2ebd2dcfb538f013527e609af8ab4b Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Fri, 4 Oct 2024 10:05:02 -0400
Subject: [PATCH] Users: add 'safe directory' git setting for aires; Desktops:
 install journalctl frontend

---
 modules/ui/desktops/common.nix  | 3 +++
 modules/users/aires/default.nix | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/ui/desktops/common.nix b/modules/ui/desktops/common.nix
index 5e8ecf7..165bc0d 100644
--- a/modules/ui/desktops/common.nix
+++ b/modules/ui/desktops/common.nix
@@ -27,6 +27,9 @@ in
   config = lib.mkIf cfg.enable {
     aux.system = {
       bluetooth.enable = true;
+      packages = with pkgs; [
+        qjournalctl # Journalctl frontend
+      ];
       ui.audio.enable = true;
     };
 
diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix
index 346697a..c0b1463 100644
--- a/modules/users/aires/default.nix
+++ b/modules/users/aires/default.nix
@@ -75,7 +75,10 @@ in
               enable = true;
               userName = config.secrets.users.aires.firstName;
               userEmail = config.secrets.users.aires.email;
-              extraConfig.push.autoSetupRemote = "true";
+              extraConfig = {
+                safe.directory = "${config.secrets.nixConfigFolder}/.git";
+                push.autoSetupRemote = "true";
+              };
             };
 
             # Set up SSH