diff --git a/hosts/juri/host.nix b/hosts/juri/host.nix index 6f5be9a..192639b 100644 --- a/hosts/juri/host.nix +++ b/hosts/juri/host.nix @@ -3,7 +3,8 @@ let email = "admin@woach.me"; in { imports = [ - ./hardware.nix ]; + ./hardware.nix + ]; system.stateVersion = "24.11"; system.timezone = "America/Los_Angeles"; system.users.bigWheels = [ "pan" ]; @@ -65,21 +66,6 @@ in { server.domain = "ginko.woach.me"; }; - syncthing = { - enable = true; - devices = { - "homura".id = "NEP24DB-DVXAHTZ-TCCNREQ-Q5TSC7K-ZXPWC4L-5ELGKQX-4I2P47O-2FT5QAU"; - }; - - folders = { - "wiki" = { - path = "/var/lib/wiki"; - devices = [ "homura" ]; - }; - }; - }; - systemd.tmpfiles.rules = [ "d /var/lib/wiki 0755 syncthing syncthing -" ]; - postgres.enable = true; shell.enabledShells = [ "fish" ]; diff --git a/hosts/juri/users/badtz/user.nix b/hosts/juri/users/badtz/user.nix deleted file mode 100644 index 5972fdb..0000000 --- a/hosts/juri/users/badtz/user.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: - -{ - fish.enable = true; - git = { - enable = true; - username = "Badtz"; - email = "may@badtz.dev"; - }; -} diff --git a/nixosModules/services/syncthing/service.nix b/nixosModules/services/syncthing/service.nix deleted file mode 100644 index 72fa7ac..0000000 --- a/nixosModules/services/syncthing/service.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ config, lib, ... }: - -{ - options.syncthing = { - enable = lib.mkEnableOption "Enables Syncthing service"; - - devices = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule { - options = { - id = lib.mkOption { - type = lib.types.str; - description = "Device ID"; - }; - addresses = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ "dynamic" ]; - description = "List of device addresses"; - }; - }; - }); - default = {}; - description = "Syncthing devices"; - }; - - folders = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule { - options = { - path = lib.mkOption { - type = lib.types.path; - description = "Path to folder"; - }; - devices = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = []; - description = "List of device names to share with"; - }; - }; - }); - default = {}; - description = "Syncthing folders"; - }; - }; - - config = lib.mkIf config.syncthing.enable { - services.syncthing = { - enable = true; - openDefaultPorts = true; - - settings = { - devices = lib.mapAttrs (name: device: { - id = device.id; - addresses = device.addresses; - }) config.syncthing.devices; - - folders = lib.mapAttrs (name: folder: { - path = folder.path; - devices = folder.devices; - }) config.syncthing.folders; - }; - }; - }; -}