Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
2 changed files with 6 additions and 1 deletions
Showing only changes of commit 431c44e335 - Show all commits

View file

@ -4,4 +4,9 @@
{ {
home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.txt; home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.txt;
services.syncthing = {
enable = true;
openDefaultPorts = true;
};
} }

View file

@ -10,7 +10,7 @@ in {
# TASK: new device # TASK: new device
networking.hostName = "CFB4ED74"; # Define your hostname. networking.hostName = "CFB4ED74"; # Define your hostname.
networking.firewall.enable = lib.mkForce false; networking.firewall.enable = true;
# Kubernetes # Kubernetes
# services.kubernetes.roles = ["master" "node"]; # services.kubernetes.roles = ["master" "node"];