diff --git a/machines/read/configuration.nix b/machines/read/configuration.nix
index c91f371..9d3ae3f 100644
--- a/machines/read/configuration.nix
+++ b/machines/read/configuration.nix
@@ -1,6 +1,5 @@
 {
   self,
-  comin,
   caddy-with-plugins,
   ...
 }:
@@ -14,8 +13,6 @@
   imports = [
     (modulesPath + "/virtualisation/lxc-container.nix")
 
-    comin.nixosModules.comin
-
     ../../users/root
     ../../users/erwin
 
@@ -42,6 +39,7 @@
         }
       ];
     };
+    rust-motd.enable = true;
     tailscale.enable = true;
   };
 
@@ -68,16 +66,6 @@
     firewall.trustedInterfaces = [ "tailscale0" ];
   };
 
-  services.comin = {
-    enable = true;
-    remotes = [
-      {
-        name = "origin";
-        url = "https://git.datarift.nl/erwin/nixos-config";
-      }
-    ];
-  };
-
   systemd = {
     services.logrotate-checkconf.enable = false;
 
@@ -112,28 +100,6 @@
     sudo.enable = false;
   };
 
-  programs.rust-motd = {
-    enable = true;
-    settings = {
-      banner = {
-        color = "red";
-        command = "${pkgs.figlet}/bin/figlet -f slant ${config.networking.hostName}";
-      };
-      weather = {
-        loc = "De%20Westereen,%20Netherlands";
-      };
-      uptime = {
-        prefix = "up: ";
-      };
-      filesystems = {
-        root = "/";
-      };
-      memory = {
-        swap_pos = "none";
-      };
-    };
-  };
-
   sops.defaultSopsFile = ./secrets.yaml;
   sops.secrets = {
     caddy-env = { };
diff --git a/modules/rust-motd/default.nix b/modules/rust-motd/default.nix
new file mode 100644
index 0000000..b74d075
--- /dev/null
+++ b/modules/rust-motd/default.nix
@@ -0,0 +1,40 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+let
+  cfg = config.eboskma.rust-motd;
+in
+{
+  options.eboskma.rust-motd = {
+    enable = mkEnableOption "rust-motd";
+  };
+
+  config = mkIf cfg.enable {
+    programs.rust-motd = {
+      enable = true;
+      settings = {
+        banner = {
+          color = "red";
+          command = "${pkgs.figlet}/bin/figlet -f slant ${config.networking.hostName}";
+        };
+        weather = {
+          loc = "De%20Westereen,%20Netherlands";
+        };
+        uptime = {
+          prefix = "up: ";
+        };
+        filesystems = {
+          root = "/";
+        };
+        memory = {
+          swap_pos = "none";
+        };
+      };
+    };
+
+  };
+}