From 1954068f59c8553dc2fd45c0383399270c3a18f5 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Thu, 7 Mar 2024 10:13:43 -0800 Subject: fix conflict --- hosts/work/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'hosts/work') 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) } -- cgit 1.4.1