fix merge conflicts

This commit is contained in:
Don Harper 2022-12-28 13:54:19 -06:00
commit def2e7f6fa
4 changed files with 20 additions and 3 deletions

View file

@ -10,6 +10,7 @@
home.packages = [
pkgs.aspell
pkgs.authy
pkgs.bc
pkgs.bitwarden
pkgs.bitwarden-cli
@ -85,6 +86,7 @@
#programs.home-manager.enable = true;
programs.go.enable = true;
programs.light.enable = true;
programs.keychain = {
enable = true;
enableBashIntegration = true;