diff --git a/machines/massicot/default.nix b/machines/massicot/default.nix
index 4513a2b..ef09ea5 100644
--- a/machines/massicot/default.nix
+++ b/machines/massicot/default.nix
@@ -11,7 +11,7 @@
     inputs.sops-nix.nixosModules.sops
     ./hardware-configuration.nix
     ./networking.nix
-    ./services.nix
+    ./services
   ];
 
   sops = {
diff --git a/machines/massicot/services.nix b/machines/massicot/services.nix
deleted file mode 100644
index 336a039..0000000
--- a/machines/massicot/services.nix
+++ /dev/null
@@ -1,322 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  kanidm_listen_port = 5324;
-in
-{
-  networking.firewall.allowedTCPPorts = [
-    80
-    443
-    2222
-    8448
-  ];
-  networking.firewall.allowedUDPPorts = [
-    80
-    443
-    8448
-  ];
-
-  custom.vaultwarden = {
-    enable = true;
-    domain = "vaultwarden.xinyang.life";
-  };
-
-  custom.hedgedoc = {
-    enable = true;
-    caddy = true;
-    domain = "docs.xinyang.life";
-    mediaPath = "/mnt/storage/hedgedoc";
-    oidc = {
-      enable = true;
-      baseURL = "https://auth.xinyang.life/oauth2/openid/hedgedoc";
-      authorizationURL = "https://auth.xinyang.life/ui/oauth2";
-      tokenURL = "https://auth.xinyang.life/oauth2/token";
-      userProfileURL = "https://auth.xinyang.life/oauth2/openid/hedgedoc/userinfo";
-    };
-    environmentFile = config.sops.secrets.hedgedoc_env.path;
-  };
-
-  custom.prometheus = {
-    enable = true;
-    exporters.blackbox.enable = true;
-    exporters.miniflux.enable = true;
-  };
-
-  systemd.mounts =
-    map
-      (share: {
-        what = "//u380335-sub1.your-storagebox.de/u380335-sub1/${share}";
-        where = "/mnt/storage/${share}";
-        type = "cifs";
-        options = "rw,uid=${share},gid=${share},credentials=${config.sops.secrets.storage_box_mount.path},_netdev,fsc";
-        before = [ "${share}.service" ];
-        after = [ "cachefilesd.service" ];
-        wantedBy = [ "${share}.service" ];
-      })
-      [
-        "forgejo"
-        "gotosocial"
-        "conduit"
-        "hedgedoc"
-      ];
-
-  services.cachefilesd.enable = true;
-
-  system.activationScripts = {
-    conduit-media-link.text = ''
-      mkdir -m 700 -p /var/lib/private/matrix-conduit/media
-      chown conduit:conduit /var/lib/private/matrix-conduit/media
-      mount --bind --verbose /mnt/storage/conduit/media /var/lib/private/matrix-conduit/media
-    '';
-  };
-  security.acme = {
-    acceptTerms = true;
-    certs."auth.xinyang.life" = {
-      email = "lixinyang411@gmail.com";
-      listenHTTP = "127.0.0.1:1360";
-      group = "kanidm";
-    };
-  };
-
-  services.ntfy-sh = {
-    enable = true;
-    group = "caddy";
-    settings = {
-      listen-unix = "/var/run/ntfy-sh/ntfy.sock";
-      listen-unix-mode = 432; # octal 0660
-      base-url = "https://ntfy.xinyang.life";
-    };
-  };
-
-  systemd.services.ntfy-sh.serviceConfig.RuntimeDirectory = "ntfy-sh";
-
-  services.kanidm = {
-    package = pkgs.kanidm.withSecretProvisioning;
-    enableServer = true;
-    serverSettings = {
-      domain = "auth.xinyang.life";
-      origin = "https://auth.xinyang.life";
-      bindaddress = "[::]:${toString kanidm_listen_port}";
-      tls_key = ''${config.security.acme.certs."auth.xinyang.life".directory}/key.pem'';
-      tls_chain = ''${config.security.acme.certs."auth.xinyang.life".directory}/fullchain.pem'';
-      online_backup.versions = 7;
-      # db_path = "/var/lib/kanidm/kanidm.db";
-    };
-    provision = import ./kanidm-provision.nix;
-  };
-
-  custom.miniflux = {
-    enable = true;
-    environment = {
-      LOG_LEVEL = "debug";
-      LISTEN_ADDR = "127.0.0.1:58173";
-      BASE_URL = "https://rss.xinyang.life/";
-      OAUTH2_PROVIDER = "oidc";
-      OAUTH2_CLIENT_ID = "miniflux";
-      OAUTH2_REDIRECT_URL = "https://rss.xinyang.life/oauth2/oidc/callback";
-      OAUTH2_OIDC_DISCOVERY_ENDPOINT = "https://auth.xinyang.life/oauth2/openid/miniflux";
-      OAUTH2_USER_CREATION = 1;
-    };
-    oauth2SecretFile = config.sops.secrets."miniflux/oauth2_secret".path;
-  };
-
-  services.matrix-conduit = {
-    enable = true;
-    # package = inputs.conduit.packages.${pkgs.system}.default;
-    package = pkgs.matrix-conduit;
-    settings.global = {
-      server_name = "xinyang.life";
-      port = 6167;
-      # database_path = "/var/lib/matrix-conduit/";
-      max_concurrent_requests = 100;
-      log = "info";
-      database_backend = "rocksdb";
-      allow_registration = false;
-
-      well_known = {
-        client = "https://msg.xinyang.life";
-        server = "msg.xinyang.life:443";
-      };
-    };
-  };
-
-  services.gotosocial = {
-    enable = true;
-    settings = {
-      log-level = "debug";
-      host = "xinyang.life";
-      letsencrypt-enabled = false;
-      bind-address = "localhost";
-      instance-expose-public-timeline = true;
-      oidc-enabled = true;
-      oidc-idp-name = "Kanidm";
-      oidc-issuer = "https://auth.xinyang.life/oauth2/openid/gts";
-      oidc-client-id = "gts";
-      oidc-link-existing = true;
-      storage-local-base-path = "/mnt/storage/gotosocial/storage";
-    };
-    environmentFile = config.sops.secrets.gts_env.path;
-  };
-
-  services.forgejo = {
-    enable = true;
-    # Use cutting edge instead of lts
-    package = pkgs.forgejo;
-    repositoryRoot = "/mnt/storage/forgejo/repositories";
-    lfs = {
-      enable = true;
-      contentDir = "/mnt/storage/forgejo/lfs";
-    };
-    settings = {
-      service.DISABLE_REGISTRATION = true;
-      server = {
-        ROOT_URL = "https://git.xinyang.life/";
-        START_SSH_SERVER = false;
-        SSH_USER = config.services.forgejo.user;
-        SSH_DOMAIN = "ssh.xinyang.life";
-        SSH_PORT = 22;
-        LFS_MAX_FILE_SIZE = 10737418240;
-        LANDING_PAGE = "/explore/repos";
-      };
-      repository = {
-        ENABLE_PUSH_CREATE_USER = true;
-      };
-      service = {
-        ENABLE_BASIC_AUTHENTICATION = false;
-      };
-      oauth2 = {
-        ENABLED = false; # Disable forgejo as oauth2 provider
-      };
-      oauth2_client = {
-        ACCOUNT_LINKING = "auto";
-        USERNAME = "email";
-        ENABLE_AUTO_REGISTRATION = true;
-        UPDATE_AVATAR = false;
-        OPENID_CONNECT_SCOPES = "openid profile email groups";
-      };
-      other = {
-        SHOW_FOOTER_VERSION = false;
-      };
-    };
-  };
-
-  systemd.services.forgejo = {
-    serviceConfig = {
-      EnvironmentFile = config.sops.secrets."forgejo/env".path;
-      ExecStartPost = ''
-        ${lib.getExe config.services.forgejo.package} admin auth update-oauth \
-            --id 1 \
-            --name kanidm \
-            --provider openidConnect \
-            --key forgejo \
-            --secret $CLIENT_SECRET \
-            --icon-url https://auth.xinyang.life/pkg/img/favicon.png \
-            --group-claim-name forgejo_role --admin-group Admin
-      '';
-    };
-  };
-
-  services.grafana = {
-    enable = true;
-    settings = {
-      server = {
-        http_addr = "127.0.0.1";
-        http_port = 3003;
-        root_url = "https://grafana.xinyang.life";
-        domain = "grafana.xinyang.life";
-      };
-      "auth.generic_oauth" = {
-        enabled = true;
-        name = "Kanidm";
-        client_id = "grafana";
-        scopes = "openid,profile,email,groups";
-        auth_url = "https://auth.xinyang.life/ui/oauth2";
-        token_url = "https://auth.xinyang.life/oauth2/token";
-        api_url = "https://auth.xinyang.life/oauth2/openid/grafana/userinfo";
-        use_pkce = true;
-        use_refresh_token = true;
-        allow_sign_up = true;
-        login_attribute_path = "preferred_username";
-        groups_attribute_path = "groups";
-        role_attribute_path = "contains(grafana_role[*], 'GrafanaAdmin') && 'GrafanaAdmin' || contains(grafana_role[*], 'Admin') && 'Admin' || contains(grafana_role[*], 'Editor') && 'Editor' || 'Viewer'";
-        allow_assign_grafana_admin = true;
-        auto_login = true;
-      };
-      "auth" = {
-        disable_login_form = true;
-      };
-    };
-  };
-
-  systemd.services.grafana.serviceConfig.EnvironmentFile =
-    config.sops.secrets.grafana_oauth_secret.path;
-
-  users.users.git = {
-    isSystemUser = true;
-    useDefaultShell = true;
-    group = "git";
-    extraGroups = [ "forgejo" ];
-  };
-  users.groups.git = { };
-
-  users.users = {
-    ${config.services.caddy.user}.extraGroups = [ config.services.ntfy-sh.group ];
-  };
-
-  services.caddy = {
-    enable = true;
-    virtualHosts."xinyang.life:443".extraConfig = ''
-      tls internal
-      encode zstd gzip
-      reverse_proxy /.well-known/matrix/* localhost:6167
-      reverse_proxy * http://localhost:8080 {
-          flush_interval -1
-      }
-    '';
-    virtualHosts."https://msg.xinyang.life:443".extraConfig = ''
-      reverse_proxy /_matrix/* localhost:6167
-    '';
-    virtualHosts."https://git.xinyang.life:443".extraConfig = ''
-      reverse_proxy http://${config.services.gitea.settings.server.DOMAIN}:${toString config.services.gitea.settings.server.HTTP_PORT}
-    '';
-
-    virtualHosts."http://auth.xinyang.life:80".extraConfig = ''
-      reverse_proxy ${config.security.acme.certs."auth.xinyang.life".listenHTTP}
-    '';
-    virtualHosts."https://auth.xinyang.life".extraConfig = ''
-      reverse_proxy https://127.0.0.1:${toString kanidm_listen_port} {
-          header_up Host {upstream_hostport}
-          header_down Access-Control-Allow-Origin "*"
-          transport http {
-              tls_server_name ${config.services.kanidm.serverSettings.domain}
-          }
-      }
-    '';
-
-    virtualHosts."https://rss.xinyang.life".extraConfig = ''
-      reverse_proxy ${config.custom.miniflux.environment.LISTEN_ADDR}
-    '';
-
-    virtualHosts."https://ntfy.xinyang.life".extraConfig = ''
-      reverse_proxy unix/${config.services.ntfy-sh.settings.listen-unix}
-      @httpget {
-        protocol http
-        method GET
-        path_regexp ^/([-_a-z0-9]{0,64}$|docs/|static/)
-      }
-      redir @httpget https://{host}{uri}
-    '';
-
-    virtualHosts."https://grafana.xinyang.life".extraConfig =
-      let
-        grafanaSettings = config.services.grafana.settings.server;
-      in
-      ''
-        reverse_proxy http://${grafanaSettings.http_addr}:${toString grafanaSettings.http_port}
-      '';
-  };
-}
diff --git a/machines/massicot/services/conduit.nix b/machines/massicot/services/conduit.nix
new file mode 100644
index 0000000..505c699
--- /dev/null
+++ b/machines/massicot/services/conduit.nix
@@ -0,0 +1,46 @@
+{ pkgs, lib, ... }:
+let
+  inherit (lib) mkForce;
+in
+{
+  config = {
+    custom.cifs-mounts = [ "conduit" ];
+
+    services.matrix-conduit = {
+      enable = true;
+      # package = inputs.conduit.packages.${pkgs.system}.default;
+      package = pkgs.matrix-conduit;
+      settings.global = {
+        server_name = "xinyang.life";
+        port = 6167;
+        # database_path = "/var/lib/matrix-conduit/";
+        max_concurrent_requests = 100;
+        log = "info";
+        database_backend = "rocksdb";
+        allow_registration = false;
+
+        well_known = {
+          client = "https://msg.xinyang.life";
+          server = "msg.xinyang.life:443";
+        };
+      };
+    };
+
+    systemd.services.conduit = {
+      serviceConfig = {
+        DynamicUser = mkForce false;
+      };
+    };
+
+    users.users.conduit = {
+      group = "conduit";
+      isSystemUser = true;
+    };
+    users.groups.conduit = { };
+
+    services.caddy.enable = true;
+    services.caddy.virtualHosts."https://msg.xinyang.life:443".extraConfig = ''
+      reverse_proxy /_matrix/* localhost:6167
+    '';
+  };
+}
diff --git a/machines/massicot/services/default.nix b/machines/massicot/services/default.nix
new file mode 100644
index 0000000..cb4ebc1
--- /dev/null
+++ b/machines/massicot/services/default.nix
@@ -0,0 +1,22 @@
+{
+  imports = [
+    ./conduit.nix
+    ./forgejo.nix
+    ./gotosocial.nix
+    ./grafana.nix
+    ./hedgedoc.nix
+    ./kanidm
+    ./miniflux.nix
+    ./ntfy.nix
+    ./storagebox.nix
+    ./vaultwarden.nix
+  ];
+  config = {
+
+    custom.prometheus = {
+      enable = true;
+      exporters.blackbox.enable = true;
+      exporters.miniflux.enable = true;
+    };
+  };
+}
diff --git a/machines/massicot/services/forgejo.nix b/machines/massicot/services/forgejo.nix
new file mode 100644
index 0000000..f2dd9b6
--- /dev/null
+++ b/machines/massicot/services/forgejo.nix
@@ -0,0 +1,84 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) getExe;
+in
+{
+  config = {
+    custom.cifs-mounts = [ "forgejo" ];
+    services.forgejo = {
+      enable = true;
+      # Use cutting edge instead of lts
+      package = pkgs.forgejo;
+      repositoryRoot = "/mnt/storage/forgejo/repositories";
+      lfs = {
+        enable = true;
+        contentDir = "/mnt/storage/forgejo/lfs";
+      };
+      settings = {
+        service.DISABLE_REGISTRATION = true;
+        server = {
+          ROOT_URL = "https://git.xinyang.life/";
+          START_SSH_SERVER = false;
+          SSH_USER = config.services.forgejo.user;
+          SSH_DOMAIN = "ssh.xinyang.life";
+          SSH_PORT = 22;
+          LFS_MAX_FILE_SIZE = 10737418240;
+          LANDING_PAGE = "/explore/repos";
+        };
+        repository = {
+          ENABLE_PUSH_CREATE_USER = true;
+        };
+        service = {
+          ENABLE_BASIC_AUTHENTICATION = false;
+        };
+        oauth2 = {
+          ENABLED = false; # Disable forgejo as oauth2 provider
+        };
+        oauth2_client = {
+          ACCOUNT_LINKING = "auto";
+          USERNAME = "email";
+          ENABLE_AUTO_REGISTRATION = true;
+          UPDATE_AVATAR = false;
+          OPENID_CONNECT_SCOPES = "openid profile email groups";
+        };
+        other = {
+          SHOW_FOOTER_VERSION = false;
+        };
+      };
+    };
+
+    systemd.services.forgejo = {
+      serviceConfig = {
+        EnvironmentFile = config.sops.secrets."forgejo/env".path;
+        ExecStartPost = ''
+          ${getExe config.services.forgejo.package} admin auth update-oauth \
+              --id 1 \
+              --name kanidm \
+              --provider openidConnect \
+              --key forgejo \
+              --secret $CLIENT_SECRET \
+              --icon-url https://auth.xinyang.life/pkg/img/favicon.png \
+              --group-claim-name forgejo_role --admin-group Admin
+        '';
+      };
+    };
+
+    users.users.git = {
+      isSystemUser = true;
+      useDefaultShell = true;
+      group = "git";
+      extraGroups = [ "forgejo" ];
+    };
+    users.groups.git = { };
+
+    services.caddy.enable = true;
+    services.caddy.virtualHosts."https://git.xinyang.life:443".extraConfig = ''
+      reverse_proxy http://${config.services.gitea.settings.server.DOMAIN}:${toString config.services.gitea.settings.server.HTTP_PORT}
+    '';
+  };
+}
diff --git a/machines/massicot/services/gotosocial.nix b/machines/massicot/services/gotosocial.nix
new file mode 100644
index 0000000..d6fe1d3
--- /dev/null
+++ b/machines/massicot/services/gotosocial.nix
@@ -0,0 +1,33 @@
+{ config, ... }:
+{
+  config = {
+    custom.cifs-mounts = [ "gotosocial" ];
+    services.gotosocial = {
+      enable = true;
+      settings = {
+        log-level = "debug";
+        host = "xinyang.life";
+        letsencrypt-enabled = false;
+        bind-address = "localhost";
+        instance-expose-public-timeline = true;
+        oidc-enabled = true;
+        oidc-idp-name = "Kanidm";
+        oidc-issuer = "https://auth.xinyang.life/oauth2/openid/gts";
+        oidc-client-id = "gts";
+        oidc-link-existing = true;
+        storage-local-base-path = "/mnt/storage/gotosocial/storage";
+      };
+      environmentFile = config.sops.secrets.gts_env.path;
+    };
+
+    services.caddy.enable = true;
+    services.caddy.virtualHosts."xinyang.life:443".extraConfig = ''
+      tls internal
+      encode zstd gzip
+      reverse_proxy /.well-known/matrix/* localhost:6167
+      reverse_proxy * http://localhost:8080 {
+          flush_interval -1
+      }
+    '';
+  };
+}
diff --git a/machines/massicot/services/grafana.nix b/machines/massicot/services/grafana.nix
new file mode 100644
index 0000000..a8e2cea
--- /dev/null
+++ b/machines/massicot/services/grafana.nix
@@ -0,0 +1,47 @@
+{ config, ... }:
+{
+  config = {
+    services.grafana = {
+      enable = true;
+      settings = {
+        server = {
+          http_addr = "127.0.0.1";
+          http_port = 3003;
+          root_url = "https://grafana.xinyang.life";
+          domain = "grafana.xinyang.life";
+        };
+        "auth.generic_oauth" = {
+          enabled = true;
+          name = "Kanidm";
+          client_id = "grafana";
+          scopes = "openid,profile,email,groups";
+          auth_url = "https://auth.xinyang.life/ui/oauth2";
+          token_url = "https://auth.xinyang.life/oauth2/token";
+          api_url = "https://auth.xinyang.life/oauth2/openid/grafana/userinfo";
+          use_pkce = true;
+          use_refresh_token = true;
+          allow_sign_up = true;
+          login_attribute_path = "preferred_username";
+          groups_attribute_path = "groups";
+          role_attribute_path = "contains(grafana_role[*], 'GrafanaAdmin') && 'GrafanaAdmin' || contains(grafana_role[*], 'Admin') && 'Admin' || contains(grafana_role[*], 'Editor') && 'Editor' || 'Viewer'";
+          allow_assign_grafana_admin = true;
+          auto_login = true;
+        };
+        "auth" = {
+          disable_login_form = true;
+        };
+      };
+    };
+
+    systemd.services.grafana.serviceConfig.EnvironmentFile =
+      config.sops.secrets.grafana_oauth_secret.path;
+
+    services.caddy.virtualHosts."https://grafana.xinyang.life".extraConfig =
+      let
+        grafanaSettings = config.services.grafana.settings.server;
+      in
+      ''
+        reverse_proxy http://${grafanaSettings.http_addr}:${toString grafanaSettings.http_port}
+      '';
+  };
+}
diff --git a/machines/massicot/services/hedgedoc.nix b/machines/massicot/services/hedgedoc.nix
new file mode 100644
index 0000000..5aa2d2e
--- /dev/null
+++ b/machines/massicot/services/hedgedoc.nix
@@ -0,0 +1,20 @@
+{ config, ... }:
+{
+  config = {
+    custom.cifs-mounts = [ "hedgedoc" ];
+    custom.hedgedoc = {
+      enable = true;
+      caddy = true;
+      domain = "docs.xinyang.life";
+      mediaPath = "/mnt/storage/hedgedoc";
+      oidc = {
+        enable = true;
+        baseURL = "https://auth.xinyang.life/oauth2/openid/hedgedoc";
+        authorizationURL = "https://auth.xinyang.life/ui/oauth2";
+        tokenURL = "https://auth.xinyang.life/oauth2/token";
+        userProfileURL = "https://auth.xinyang.life/oauth2/openid/hedgedoc/userinfo";
+      };
+      environmentFile = config.sops.secrets.hedgedoc_env.path;
+    };
+  };
+}
diff --git a/machines/massicot/services/kanidm/default.nix b/machines/massicot/services/kanidm/default.nix
new file mode 100644
index 0000000..381644d
--- /dev/null
+++ b/machines/massicot/services/kanidm/default.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, ... }:
+let
+  kanidm_listen_port = 5324;
+in
+{
+  config = {
+    services.caddy = {
+      virtualHosts."http://auth.xinyang.life:80".extraConfig = ''
+        reverse_proxy ${config.security.acme.certs."auth.xinyang.life".listenHTTP}
+      '';
+      virtualHosts."https://auth.xinyang.life".extraConfig = ''
+        reverse_proxy https://127.0.0.1:${toString kanidm_listen_port} {
+            header_up Host {upstream_hostport}
+            header_down Access-Control-Allow-Origin "*"
+            transport http {
+                tls_server_name ${config.services.kanidm.serverSettings.domain}
+            }
+        }
+      '';
+    };
+
+    services.kanidm = {
+      package = pkgs.kanidm.withSecretProvisioning;
+      enableServer = true;
+      serverSettings = {
+        domain = "auth.xinyang.life";
+        origin = "https://auth.xinyang.life";
+        bindaddress = "[::]:${toString kanidm_listen_port}";
+        tls_key = ''${config.security.acme.certs."auth.xinyang.life".directory}/key.pem'';
+        tls_chain = ''${config.security.acme.certs."auth.xinyang.life".directory}/fullchain.pem'';
+        online_backup.versions = 7;
+        # db_path = "/var/lib/kanidm/kanidm.db";
+      };
+      provision = import ./kanidm-provision.nix;
+    };
+
+    networking.firewall.allowedTCPPorts = [
+      80
+      443
+    ];
+
+    security.acme = {
+      acceptTerms = true;
+      certs."auth.xinyang.life" = {
+        email = "lixinyang411@gmail.com";
+        listenHTTP = "127.0.0.1:1360";
+        group = "kanidm";
+      };
+    };
+
+  };
+}
diff --git a/machines/massicot/kanidm-provision.nix b/machines/massicot/services/kanidm/kanidm-provision.nix
similarity index 100%
rename from machines/massicot/kanidm-provision.nix
rename to machines/massicot/services/kanidm/kanidm-provision.nix
diff --git a/machines/massicot/services/miniflux.nix b/machines/massicot/services/miniflux.nix
new file mode 100644
index 0000000..703aac4
--- /dev/null
+++ b/machines/massicot/services/miniflux.nix
@@ -0,0 +1,26 @@
+{ config, ... }:
+{
+  config = {
+    custom.miniflux = {
+      enable = true;
+      environment = {
+        LOG_LEVEL = "debug";
+        LISTEN_ADDR = "127.0.0.1:58173";
+        BASE_URL = "https://rss.xinyang.life/";
+        OAUTH2_PROVIDER = "oidc";
+        OAUTH2_CLIENT_ID = "miniflux";
+        OAUTH2_REDIRECT_URL = "https://rss.xinyang.life/oauth2/oidc/callback";
+        OAUTH2_OIDC_DISCOVERY_ENDPOINT = "https://auth.xinyang.life/oauth2/openid/miniflux";
+        OAUTH2_USER_CREATION = 1;
+      };
+      oauth2SecretFile = config.sops.secrets."miniflux/oauth2_secret".path;
+    };
+
+    services.caddy = {
+      enable = true;
+      virtualHosts."https://rss.xinyang.life".extraConfig = ''
+        reverse_proxy ${config.custom.miniflux.environment.LISTEN_ADDR}
+      '';
+    };
+  };
+}
diff --git a/machines/massicot/services/ntfy.nix b/machines/massicot/services/ntfy.nix
new file mode 100644
index 0000000..02ff488
--- /dev/null
+++ b/machines/massicot/services/ntfy.nix
@@ -0,0 +1,29 @@
+{ config, ... }:
+{
+  config = {
+    services.ntfy-sh = {
+      enable = true;
+      group = "caddy";
+      settings = {
+        listen-unix = "/var/run/ntfy-sh/ntfy.sock";
+        listen-unix-mode = 432; # octal 0660
+        base-url = "https://ntfy.xinyang.life";
+      };
+    };
+    systemd.services.ntfy-sh.serviceConfig.RuntimeDirectory = "ntfy-sh";
+
+    users.users = {
+      ${config.services.caddy.user}.extraGroups = [ config.services.ntfy-sh.group ];
+    };
+
+    services.caddy.virtualHosts."https://ntfy.xinyang.life".extraConfig = ''
+      reverse_proxy unix/${config.services.ntfy-sh.settings.listen-unix}
+      @httpget {
+        protocol http
+        method GET
+        path_regexp ^/([-_a-z0-9]{0,64}$|docs/|static/)
+      }
+      redir @httpget https://{host}{uri}
+    '';
+  };
+}
diff --git a/machines/massicot/services/storagebox.nix b/machines/massicot/services/storagebox.nix
new file mode 100644
index 0000000..9cbd8f3
--- /dev/null
+++ b/machines/massicot/services/storagebox.nix
@@ -0,0 +1,25 @@
+{ config, lib, ... }:
+let
+  inherit (lib) mkDefault mkOption types;
+
+  cfg = config.custom;
+in
+{
+  options = {
+    custom.cifs-mounts = mkOption { type = with types; (listOf str); };
+  };
+
+  config = {
+    services.cachefilesd.enable = true;
+
+    systemd.mounts = map (share: {
+      what = "//u380335-sub1.your-storagebox.de/u380335-sub1/${share}";
+      where = "/mnt/storage/${share}";
+      type = "cifs";
+      options = mkDefault "rw,uid=${share},gid=${share},credentials=${config.sops.secrets.storage_box_mount.path},_netdev,fsc";
+      before = [ "${share}.service" ];
+      after = [ "cachefilesd.service" ];
+      wantedBy = [ "${share}.service" ];
+    }) cfg.cifs-mounts;
+  };
+}
diff --git a/machines/massicot/services/vaultwarden.nix b/machines/massicot/services/vaultwarden.nix
new file mode 100644
index 0000000..7d754c0
--- /dev/null
+++ b/machines/massicot/services/vaultwarden.nix
@@ -0,0 +1,8 @@
+{
+  config = {
+    custom.vaultwarden = {
+      enable = true;
+      domain = "vaultwarden.xinyang.life";
+    };
+  };
+}