diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
| commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
| tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a /nixos/modules/module-list.nix | |
| parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
| parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
| download | nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixlib-0aa59a08d65461149552f68c638655ed2b474510.zip | |
Merge master into staging
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a8b1014553c..2f9b1083ef1d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -86,6 +86,7 @@ ./programs/freetds.nix ./programs/gnupg.nix ./programs/gphoto2.nix + ./programs/iftop.nix ./programs/java.nix ./programs/kbdlight.nix ./programs/less.nix @@ -159,6 +160,7 @@ ./services/audio/ympd.nix ./services/backup/bacula.nix ./services/backup/borgbackup.nix + ./services/backup/duplicati.nix ./services/backup/crashplan.nix ./services/backup/crashplan-small-business.nix ./services/backup/mysql-backup.nix |