diff options
author | Alan Pearce | 2017-09-13 15:57:39 +0200 |
---|---|---|
committer | Alan Pearce | 2017-09-13 15:57:39 +0200 |
commit | 3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67 (patch) | |
tree | ef0532759f60efbfdb71bfe30ba5f8273b54b021 /marvin.nix | |
parent | 7db05c60364d3d6be69b243e0c43272b36e6ffa0 (diff) | |
parent | 38fce4627d3c2f8ba79049f571fd16bc5037d008 (diff) | |
download | nixos-configuration-3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67.tar.lz nixos-configuration-3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67.tar.zst nixos-configuration-3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'marvin.nix')
-rw-r--r-- | marvin.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/marvin.nix b/marvin.nix index ca080fa..7d6e798 100644 --- a/marvin.nix +++ b/marvin.nix @@ -22,7 +22,9 @@ ./modules/user.nix ./modules/user-interface.nix ./modules/dev.nix + ./modules/lisp.nix ./modules/javascript.nix + ./modules/infrastructure.nix ./modules/accounting.nix ./modules/passwords.nix ./modules/network-manager.nix |