Merge remote-tracking branch 'ni/master' into 18.09

This commit is contained in:
lassulus 2018-10-07 17:12:40 +02:00
commit 578c375f4c

View File

@ -143,6 +143,7 @@ with import <stockholm/lib>;
environment.systemPackages = [
pkgs.get
pkgs.git
pkgs.git-crypt
pkgs.git-preview
pkgs.hashPassword
pkgs.htop