diff --git a/modules/hosts/janus.nix b/modules/hosts/janus.nix
index daf5bb7..ff5d364 100644
--- a/modules/hosts/janus.nix
+++ b/modules/hosts/janus.nix
@@ -13,7 +13,9 @@ in
       nixos."${username}"
       nixos.zsh
       nixos.docker
+      nixos.login-text
       {
+        networking.hostName = hostname;
         step-ssh-host.hostname = hostname;
 
         home-manager.users."${username}" = {
diff --git a/modules/nixos/login-text.nix b/modules/nixos/login-text.nix
new file mode 100644
index 0000000..625e593
--- /dev/null
+++ b/modules/nixos/login-text.nix
@@ -0,0 +1,44 @@
+{ inputs, ... }: {
+  flake.modules.nixos.login-text = { config, ... }: {
+    programs.rust-motd = {
+      enable = true;
+      refreshInterval = "*:0/5";
+      order = [
+        "global"
+        "last_login"
+        "service_status"
+        "uptime"
+        "memory"
+        "filesystems"
+      ];
+      settings = {
+        global = {
+          time_format = "%Y-%m-%d %H:%M:%S %Z";
+        };
+
+        last_login = {
+          john = 5;
+          root = 3;
+        };
+
+        service_status = {
+          SSH = "sshd.socket";
+          Docker = "docker";
+        };
+
+        uptime = {
+          prefix = "Uptime";
+        };
+
+        memory = {
+          swap_pos = "beside";
+        };
+
+        filesystems = {
+          root = "/";
+          nix = "/nix/store";
+        };
+      };
+    };
+  };
+}
\ No newline at end of file