diff --git a/hosts/x86_64-linux/helium.nix b/hosts/x86_64-linux/helium.nix index 57c570e..9c5c037 100644 --- a/hosts/x86_64-linux/helium.nix +++ b/hosts/x86_64-linux/helium.nix @@ -22,7 +22,6 @@ hardware.amdLaptop.enable = true; platform.hibernate.enable = true; services = { - syncthing.enable = true; nixCacheClient = { enable = true; remoteBuilds.additional = true; diff --git a/hosts/x86_64-linux/syncthing.nix b/hosts/x86_64-linux/syncthing.nix deleted file mode 100644 index add05b2..0000000 --- a/hosts/x86_64-linux/syncthing.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ ... }: -{ - custom = { - platform.vm.enable = true; - users.vili.enable = true; - services = { - syncthing.enable = true; - nixCacheClient = { - enable = true; - remoteBuilds.exclusive = true; - }; - }; - }; - system.stateVersion = "22.11"; - - swapDevices = [ - { - device = "/var/lib/swapfile"; - size = 2 * 1024; - } - ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/895d2004-3bd2-4bc5-bb46-62f94a0a68e3"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/38AD-EFDC"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; - - fileSystems."/home/vili" = { - device = "/dev/disk/by-uuid/d08136ed-7950-412c-bcf6-7c6e9f015e47"; - fsType = "ext4"; - }; -} diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix deleted file mode 100644 index f6b348d..0000000 --- a/modules/services/syncthing.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.custom.services.syncthing; -in -{ - options.custom.services.syncthing.enable = lib.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf cfg.enable { - boot.kernel.sysctl."fs.inotify.max_user_watches" = 204800; - - services.syncthing = { - enable = true; - user = "vili"; - dataDir = config.users.users.${config.services.syncthing.user}.home; - - settings = { - defaults.ignores = [ - "/Projects/Programming" - ]; - - options = { - urAccepted = -1; - localAnnounceEnabled = false; - globalAnnounceEnabled = false; - natEnabled = false; - relaysEnabled = false; - }; - - devices = lib.mkMerge [ - { - "syncthing" = { - id = "J6GNM4Z-2TWASPT-3P3EW4V-KZEQYFF-TXL22QX-4YTZ3WO-WLM7GQ7-NUP66A4"; - addresses = [ "tcp://syncthing.vsinerva.fi:22000" ]; - }; - } - (lib.mkIf (config.networking.hostName == "syncthing") { - "helium" = { - id = "2MRUBSY-NHXYMAW-SY22RHP-CNNMHKR-DPDKMM4-2XV5F6M-6KSNLQI-DD4EOAM"; - addresses = [ "tcp://helium.vsinerva.fi:22000" ]; - }; - }) - ]; - - folders = - let - default = { - devices = lib.mkMerge [ - [ "syncthing" ] - (lib.mkIf (config.networking.hostName == "syncthing") [ - "helium" - ]) - ]; - versioning = { - type = "trashcan"; - params.cleanoutDays = "30"; - }; - fsWatcherDelayS = 1; - }; - in - { - "~/Documents" = default; - "~/Music" = default; - "~/Pictures" = default; - "~/Projects" = default; - "~/School" = default; - "~/Videos" = default; - "~/Zotero" = default; - }; - }; - - #TCP/UDP 22000 for transfers and UDP 21027 for discovery - openDefaultPorts = true; - }; - }; -}