From 4df44fa4deeffaf7e713be27f2d345c52a5c4ea3 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Tue, 15 Apr 2025 21:14:17 +0000
Subject: [PATCH] :bug: Fix build errors on pi4, added configs to push

---
 hosts/pi4/default.nix              | 18 +++++++++++-------
 hosts/pi4/home-manager/default.nix | 17 +++++++++++++++++
 shared/home-manager/default.nix    |  6 +++---
 3 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 hosts/pi4/home-manager/default.nix

diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix
index ff19397..e482dc5 100644
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@@ -1,8 +1,6 @@
 {
   pkgs,
-  hostName,
-  user,
-  version,
+  systemConfig,
   ...
 }:
 
@@ -35,19 +33,25 @@
   hardware.enableRedistributableFirmware = true;
 
   networking = {
-    inherit hostName;
+    hostName = systemConfig.hostName;
     networkmanager.enable = true;
   };
 
   services.openssh.enable = true;
 
-  system.stateVersion = version;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+  services.pcscd.enable = true;
+
+  system.stateVersion = systemConfig.version;
 
   users = {
     mutableUsers = false;
-    users.${user.name} = {
+    users.${systemConfig.user.name} = {
       isNormalUser = true;
-      password = user.password;
+      password = systemConfig.user.password;
       extraGroups = [ "wheel" ];
     };
   };
diff --git a/hosts/pi4/home-manager/default.nix b/hosts/pi4/home-manager/default.nix
new file mode 100644
index 0000000..c28e613
--- /dev/null
+++ b/hosts/pi4/home-manager/default.nix
@@ -0,0 +1,17 @@
+{ pkgs, lib, systemConfig, ... }:
+
+{
+  imports = [
+    (lib.custom.relativeToRoot "shared/home-manager/development/git.nix")
+  ];
+
+  home.stateVersion = systemConfig.version;
+
+  programs.git.signing.key = "E3FA0E995C0D0E5E";
+
+  programs.gpg.enable = true;
+  services.gpg-agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+}
diff --git a/shared/home-manager/default.nix b/shared/home-manager/default.nix
index b555ebf..bfc7c39 100644
--- a/shared/home-manager/default.nix
+++ b/shared/home-manager/default.nix
@@ -2,10 +2,10 @@
   inputs,
   outputs,
   common,
+  systemConfig,
   ...
 }:
 let
-  username = common.username;
   dir = common.dir;
 in
 {
@@ -32,7 +32,7 @@ in
   ];
 
   home = {
-    username = username;
+    username = systemConfig.user.name;
     homeDirectory = dir.home;
 
     sessionVariables = {
@@ -42,7 +42,7 @@ in
     # You can update Home Manager without changing this value. See
     # the Home Manager release notes for a list of state version
     # changes in each release.
-    stateVersion = common.system.version;
+    stateVersion = systemConfig.version;
   };
 
   # Adds pkgs.unstable in order to fetch packages from unstable repositories