diff options
| author | Franck Cuny <franck@fcuny.net> | 2024-03-07 10:13:43 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2024-03-07 10:13:43 -0800 |
| commit | 1954068f59c8553dc2fd45c0383399270c3a18f5 (patch) | |
| tree | e5229adb190a3d79973764f85cb8efaf983b0bb6 /hosts/work/default.nix | |
| parent | share configuration for shell utils (diff) | |
| download | infra-1954068f59c8553dc2fd45c0383399270c3a18f5.tar.gz | |
fix conflict
Diffstat (limited to 'hosts/work/default.nix')
| -rw-r--r-- | hosts/work/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
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) } |