diff --git a/homeConfig/modules/git/default.nix b/homeConfig/modules/git/default.nix
index e4ae735..c98f20d 100644
--- a/homeConfig/modules/git/default.nix
+++ b/homeConfig/modules/git/default.nix
@@ -2,12 +2,13 @@
 
 with lib;
   let cfg = config.modules.git;
+  isBryan = config.user.name == "bryan";
 
 in
 { options.modules.git = { enable = mkEnableOption "git"; };
   config = mkIf cfg.enable {
     programs = {
-      git = import ./config/git.nix;
+      git = if isBryan then import ./config/git.nix else { enable = true; };
       gh = {
         enable = true;
         settings.git_protocol = "ssh";
diff --git a/homeConfig/modules/gpg/default.nix b/homeConfig/modules/gpg/default.nix
index a441700..1318c72 100644
--- a/homeConfig/modules/gpg/default.nix
+++ b/homeConfig/modules/gpg/default.nix
@@ -1,19 +1,21 @@
 { lib, config, ... }:
 
 with lib;
-let cfg = config.modules.gpg;
+let
+  cfg = config.modules.gpg;
+  isBryan = config.user.name == "bryan";
 
-in 
+in
 { options.modules.gpg = { enable = mkEnableOption "gpg"; };
   config = mkIf cfg.enable {
     programs.gpg = {
       enable = true;
-      publicKeys = [
+      publicKeys = if isBryan then [
         {
           text = import ./config/pubKey.nix;
           trust = 5;
         }
-      ];
+      ] else [];
     };
 
     services.gpg-agent = {
diff --git a/homeConfig/modules/neovim/default.nix b/homeConfig/modules/neovim/default.nix
index edfbacc..2b4df8f 100644
--- a/homeConfig/modules/neovim/default.nix
+++ b/homeConfig/modules/neovim/default.nix
@@ -1,10 +1,10 @@
 { pkgs, lib, config, ... }:
 
 with lib;
-let 
+let
   cfg = config.modules.neovim;
 
-in 
+in
 { options.modules.neovim = { enable = mkEnableOption "neovim"; };
   config = mkIf cfg.enable {
     programs.neovim = {
diff --git a/sysConfig/desktop/system.nix b/sysConfig/desktop/system.nix
index 2fb38d8..6f10f2a 100644
--- a/sysConfig/desktop/system.nix
+++ b/sysConfig/desktop/system.nix
@@ -8,7 +8,7 @@
     extraOptions = "experimental-features = nix-command flakes";
     settings = {
       auto-optimise-store = true;
-      trusted-users = [ "bryan" ];
+      trusted-users = [ "${config.user.name}" ];
     };
     gc = {
       automatic = true;