machine/backyard/default.nix

@@ -12,7 +12,6 @@
   };
 
   beatific.hostName = "backyard";
-  beatific.defaults.tvbSync = false;
 
   # Enable networking
   networking.networkmanager.enable = true;

machine/catacomb/default.nix

@@ -7,7 +7,6 @@
   ];
 
   beatific.hostName = "catacomb";
-  beatific.defaults.tvbSync = false;
 
   boot = {
     loader = {

machine/empyrean/default.nix

@@ -15,7 +15,6 @@
 
   beatific.hostName = "empyrean";
   beatific.isLighthouse = true;
-  beatific.defaults.tvbSync = false;
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub = {

machine/imperium/default.nix

@@ -62,6 +62,17 @@
     enable = false;
   };
 
+  # tvb monopolizes the system syncthing for now. User services are harder to get working
+  # and nobody else uses imperium right now. In the future, rewriting the syncthing module
+  # to allow multiple instances is probably the right move.
+  services.syncthing = {
+    enable = true;
+    dataDir = "/home/tvb";
+    openDefaultPorts = true;
+    user = "tvb";
+    group = "tvb";
+  };
+
   # This value governs how some stateful data, like databases, are handled
   # across different versions of NixOS. This should not be changed to a new
   # release unless the sysadmin has determined that no services would be

machine/stagirite/default.nix

@@ -19,7 +19,6 @@ in
   #system.stateVersion = "21.11";
 
   networking.hostName = "stagirite";
-  beatific.defaults.tvbSync = false;
 
   fileSystems.winssh = {
     device = "C:/Users/tvb/.ssh";

machine/unfolder/default.nix

@@ -75,6 +75,7 @@
     firefox
     libreoffice
     unzip
+    syncthing
     mpv
   ];
 

modules/beatific.nix

@@ -36,7 +36,6 @@ in {
         ssh = mkFlag "Default sshd settings";
         nebula = mkFlag "Default beatific nebula settings";
         tvb = mkFlag "Default tvb account";
-        tvbSync = mkFlag "Configure system syncthing for tvb";
         hosts = mkFlag "Default 10.22.20.* DNS host entries";
       };
     };
@@ -92,10 +91,7 @@ in {
         wget
       ];
       programs = {
-        git = {
+        git.enable = true;
-          enable = true;
-          config.init.defaultBranch = "master";
-        };
         htop.enable = true;
       };
       # The nixpkgs default is "nano", so we go one priority higher
@@ -167,20 +163,6 @@ in {
       };
     })
 
-    (mkIf cfg.defaults.tvbSync {
-      # I haven't gotten user services to work correctly yet,
-      # so for now, tvb monopolizes the system syncthing instance.
-      # Adding users in the future should probably involve multiple
-      # system services so as not to require login to sync.
-      services.syncthing = {
-        enable = true;
-        dataDir = "/home/tvb";
-        openDefaultPorts = true;
-        user = "tvb";
-        group = "tvb";
-      };
-    })
-
     (mkIf cfg.defaults.hosts {
       # Create *.home host entries for all the beatific members
       networking.hosts = {