fix conflict

2 files changed, 3 insertions, 9 deletions

diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix
index 772cf8a..6e59f7b 100644
--- a/hosts/mba/default.nix
+++ b/hosts/mba/default.nix
@@ -13,6 +13,7 @@
     };
 
     settings = {
+      trusted-users = [ "@admin" "fcuny" ];
       experimental-features = [ "nix-command" "flakes" ];
     };
   };
diff --git a/hosts/work/default.nix b/hosts/work/default.nix
index bad369a..120f0c8 100644
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -1,5 +1,4 @@
-{ pkgs, self, ... }:
-let user = "fcuny"; in
+{ pkgs, ... }:
 {
   services.nix-daemon.enable = true;
 
@@ -14,7 +13,7 @@ let user = "fcuny"; in
     };
 
     settings = {
-      trusted-users = [ "@admin" "${user}" ];
+      trusted-users = [ "@admin" "fcuny" ];
       experimental-features = [ "nix-command" "flakes" ];
     };
   };
@@ -29,11 +28,5 @@ let user = "fcuny"; in
   # Touch ID for sudo auth
   security.pam.enableSudoTouchIdAuth = true;
 
-<<<<<<< HEAD
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.fcuny = import ../../nix/profiles/home-manager/work.nix { inherit pkgs self; };
-=======
   home-manager.users.fcuny = import ../../nix/profiles/home-manager/work.nix;
->>>>>>> 3a08a78 (share configuration for shell utils)
 }