Merge remote-tracking branch 'origin/master'
1 file changed, 2 insertions(+), 0 deletions(-)
changed files
M marvin.nix → marvin.nix
@@ -22,7 +22,9 @@ ./modules/x250.nix ./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