about summary refs log tree commit diff
path: root/hosts/work
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2024-03-07 10:07:49 -0800
committerFranck Cuny <franck@fcuny.net>2024-03-07 10:10:55 -0800
commit318978655894aaa82fdf4c5de1eb9c58cb351a91 (patch)
treec96d22c7f116fcf9c9ee56dd2c222f432540b0f5 /hosts/work
parentinstall seqstat on the work profile (diff)
downloadworld-318978655894aaa82fdf4c5de1eb9c58cb351a91.tar.gz
share configuration for shell utils
Diffstat (limited to 'hosts/work')
-rw-r--r--hosts/work/default.nix4
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)
 }