diff options
Diffstat (limited to 'hosts/work')
| -rw-r--r-- | hosts/work/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 97777e5..bad369a 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -29,7 +29,11 @@ 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) } |