From 7d087eb0c298ff285a56bc2e24a63bb2a9696847 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 23 Oct 2024 08:53:27 -0700 Subject: [PATCH] default not enabled syncthing and change module location --- provision/hosts/bulwark/configuration.nix | 6 +++--- provision/hosts/kestrel/configuration.nix | 10 +++++----- provision/modules/programs/default.nix | 1 + provision/modules/{services => programs}/syncthing.nix | 2 +- provision/modules/services/default.nix | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) rename provision/modules/{services => programs}/syncthing.nix (98%) diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix index 33c4b0e4..5707a185 100644 --- a/provision/hosts/bulwark/configuration.nix +++ b/provision/hosts/bulwark/configuration.nix @@ -31,9 +31,6 @@ programs = { chezmoi.apply = true; kitty.enable = true; - }; - services = { - samba-client.enable = true; syncthing = { enable = true; keyPath = ../../secrets/syncthing/bulwark/key.pem.age; @@ -43,6 +40,9 @@ }; }; }; + services = { + samba-client.enable = true; + }; system = { ssh.enable = true; terminal.enable = true; diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index f7a48fd3..c0dbc4f4 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -51,11 +51,6 @@ programs = { chezmoi.apply = true; kitty.enable = true; - }; - services = { - peripherals.enable = true; - samba-client.enable = true; - virt-manager.enable = true; syncthing = { enable = true; keyPath = ../../secrets/syncthing/kestrel/key.pem.age; @@ -65,6 +60,11 @@ }; }; }; + services = { + peripherals.enable = true; + samba-client.enable = true; + virt-manager.enable = true; + }; system = { backup.enable = true; ssh.enable = true; diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix index a66df83e..fea9275e 100644 --- a/provision/modules/programs/default.nix +++ b/provision/modules/programs/default.nix @@ -4,6 +4,7 @@ ./git.nix ./chezmoi.nix ./kitty.nix + ./syncthing.nix ./yt-dlp.nix ]; } diff --git a/provision/modules/services/syncthing.nix b/provision/modules/programs/syncthing.nix similarity index 98% rename from provision/modules/services/syncthing.nix rename to provision/modules/programs/syncthing.nix index c38e1c5d..ccbf4f49 100644 --- a/provision/modules/services/syncthing.nix +++ b/provision/modules/programs/syncthing.nix @@ -5,7 +5,7 @@ in { options.modules.services.syncthing = with lib; { enable = lib.mkOption { type = types.bool; - default = true; + default = false; }; keyPath = mkOption { type = types.path; diff --git a/provision/modules/services/default.nix b/provision/modules/services/default.nix index c65c93f4..95f8f298 100644 --- a/provision/modules/services/default.nix +++ b/provision/modules/services/default.nix @@ -1,4 +1,4 @@ { ... }: { - imports = [ ./peripherals.nix ./samba-client.nix ./syncthing.nix ./virt-manager.nix ]; + imports = [ ./peripherals.nix ./samba-client.nix ./virt-manager.nix ]; }