diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix index 6ab1269b..348afe2d 100644 --- a/machines/lasting-integrity/default.nix +++ b/machines/lasting-integrity/default.nix @@ -130,7 +130,6 @@ } ]; nextcloud.enable = true; - syncthing.enable = true; }; }; programs.msmtp.enable = false; diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 3f0fbb65..71056fa1 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -8,7 +8,6 @@ ./mail ./pass ./sound - ./syncthing ./terminal ./theme ./xdg @@ -35,7 +34,6 @@ mail.enable = lib.mkDefault true; pass.enable = lib.mkDefault true; sound.enable = lib.mkDefault true; - syncthing.enable = lib.mkDefault true; terminal.enable = lib.mkDefault true; theme.enable = lib.mkDefault true; xdg.enable = lib.mkDefault true; diff --git a/modules/graphical/syncthing/default.nix b/modules/graphical/syncthing/default.nix deleted file mode 100644 index e71fa284..00000000 --- a/modules/graphical/syncthing/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.chvp.graphical.syncthing.enable = lib.mkOption { - default = false; - example = true; - }; - - config = lib.mkIf config.chvp.graphical.syncthing.enable { - chvp.base.zfs.homeLinks = [ - { path = ".config/syncthing"; type = "data"; } - { path = "sync"; type = "cache"; } - ]; - home-manager.users.charlotte = { pkgs, ... }: { - services.syncthing.enable = true; - }; - }; -} diff --git a/modules/services/default.nix b/modules/services/default.nix index b19b001a..d060a2bc 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -13,7 +13,6 @@ ./matrix ./nextcloud ./nginx - ./syncthing ./torrents ]; diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix deleted file mode 100644 index f4e583ff..00000000 --- a/modules/services/syncthing/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, ... }: - -{ - options.chvp.services.syncthing.enable = lib.mkOption { - default = false; - example = true; - }; - - config = lib.mkIf config.chvp.services.syncthing.enable { - services.syncthing = { - enable = true; - dataDir = "${config.chvp.dataPrefix}/var/lib/syncthing"; - configDir = "${config.chvp.dataPrefix}/var/lib/syncthing/.config"; - openDefaultPorts = true; - guiAddress = "127.0.0.1:8384"; - }; - - chvp.services.nginx.hosts = [ - { - fqdn = "syncthing.vanpetegem.me"; - basicProxy = "http://localhost:8384"; - options.basicAuthFile = config.age.secrets."passwords/services/syncthing-basic-auth".path; - } - ]; - - age.secrets."passwords/services/syncthing-basic-auth" = { - file = ../../../secrets/passwords/services/syncthing-basic-auth.age; - owner = "nginx"; - }; - }; -} diff --git a/secrets.nix b/secrets.nix index a2b2187a..a95f1571 100644 --- a/secrets.nix +++ b/secrets.nix @@ -76,8 +76,6 @@ in "secrets/passwords/services/nextcloud-admin.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/syncthing-basic-auth.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/files/services/tunnel/key.age".publicKeys = [ lasting-integrity ] ++ users; "secrets/files/services/tunnel/env.age".publicKeys = [ lasting-integrity ] ++ users; diff --git a/secrets/passwords/services/syncthing-basic-auth.age b/secrets/passwords/services/syncthing-basic-auth.age deleted file mode 100644 index 658b3443..00000000 --- a/secrets/passwords/services/syncthing-basic-auth.age +++ /dev/null @@ -1,12 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 hKAFvQ lX7RqP5IorH8pVueb0IDEQa2UqnU7BGgkOLwe05xEzU -oI7DJS0kM7rfyeMDQ3Z0OsOFBEipuw0IaGcDksF5vI0 --> ssh-ed25519 s9rb8g Ywh0QPDEglxZdgeM20Z4UCgVDvacgyFmTIWseUsk7AI -BQDX9kmZEIUyrsv2v8SJrLFopxmnprVxeWU9/Ocpy/I --> ssh-ed25519 yad4VQ 2mbXybsjJoHjaiY+sBVJ5rn2whLcPEbfbkzq2zcOeyg -i3d212DHtEPW10Qzb3Qsxdl6cNV5EFFuXnGEzQFrupM --> /:K?LT`-grease -30hCW6py1CDnrYj+XtwSNv2GAusXfCz7MCOsf2o8WnUV7QuLEBZ4UFUAovPV6LC8 -CA ---- M61hEEUB3q9nR8rhZZe4cyRtsQVcDliKZiF/qukb13s -ÃÚŸ ŽÄÚÓšˆXÍ‘±ä¶ŒŽIÁ4Äèò»E2À0ÒÚ[OÌäÇ—‘GÞ¤ |~à•¡Tnæ0™rxøy·Ør²_ λ\æ;«KÜ \ No newline at end of file