Jaculabilis
/
nixos-configs
1
1
Fork 0
Code Releases Activity

beatific: refactor tvb-syncthing to module

This commit is contained in:
Tim Van Baak 2023-12-23 13:01:26 -08:00
parent e381001f0a
commit 6b5dcb6e1d
7 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
machine/backyard/default.nix
View File

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

1
machine/catacomb/default.nix
View File

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

1
machine/empyrean/default.nix
View File

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

11
machine/imperium/default.nix
View File

@ -62,17 +62,6 @@
enable = false; 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 # This value governs how some stateful data, like databases, are handled
# across different versions of NixOS. This should not be changed to a new # across different versions of NixOS. This should not be changed to a new
# release unless the sysadmin has determined that no services would be # release unless the sysadmin has determined that no services would be

1
machine/stagirite/default.nix
View File

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

1
machine/unfolder/default.nix
View File

@ -7,6 +7,7 @@
]; ];
beatific.hostName = "unfolder"; beatific.hostName = "unfolder";
beatific.defaults.tvbSync = false;
# Bootloader. # Bootloader.
boot.loader.grub = { boot.loader.grub = {

15
modules/beatific.nix
View File

@ -36,6 +36,7 @@ in {
ssh = mkFlag "Default sshd settings"; ssh = mkFlag "Default sshd settings";
nebula = mkFlag "Default beatific nebula settings"; nebula = mkFlag "Default beatific nebula settings";
tvb = mkFlag "Default tvb account"; tvb = mkFlag "Default tvb account";
tvbSync = mkFlag "Configure system syncthing for tvb";
hosts = mkFlag "Default 10.22.20.* DNS host entries"; hosts = mkFlag "Default 10.22.20.* DNS host entries";
}; };
}; };
@ -163,6 +164,20 @@ 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 { (mkIf cfg.defaults.hosts {
# Create *.home host entries for all the beatific members # Create *.home host entries for all the beatific members
networking.hosts = { networking.hosts = {