moved syncthing_base.nix

This commit is contained in:
Richie Cahill 2024-05-11 09:46:55 -04:00
parent 9c23dad021
commit 44bc4f1531
4 changed files with 7 additions and 20 deletions

View File

@ -1,5 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ../../users/richie/global/zerotier.nix ];
networking = { networking = {
hostId = "1beb3026"; hostId = "1beb3026";
@ -54,11 +55,6 @@
trim.enable = true; trim.enable = true;
autoScrub.enable = true; autoScrub.enable = true;
}; };
zerotierone = {
enable = true;
joinNetworks = [ "e4da7455b2ae64ca" ];
};
}; };
system.stateVersion = "23.05"; system.stateVersion = "23.05";

View File

@ -1,6 +1,9 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ../rhapsody-in-green/syncthing_base.nix ]; imports = [
../../users/richie/global/syncthing_base.nix
../../users/richie/global/zerotier.nix
];
networking = { networking = {
hostId = "1beb3027"; hostId = "1beb3027";
@ -110,14 +113,6 @@
trim.enable = true; trim.enable = true;
autoScrub.enable = true; autoScrub.enable = true;
}; };
zerotierone = {
enable = true;
joinNetworks = [
"e4da7455b2ae64ca"
"52b337794f23c1d4"
];
};
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";

View File

@ -1,7 +1,8 @@
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
./syncthing_base.nix ../../users/richie/global/syncthing_base.nix
../../users/richie/global/zerotier.nix
]; ];
boot = { boot = {
@ -85,11 +86,6 @@
fsWatcherEnabled = true; fsWatcherEnabled = true;
}; };
}; };
zerotierone = {
enable = true;
joinNetworks = [ "e4da7455b2ae64ca" ];
};
}; };
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;