diff --git a/.gitignore b/.gitignore
index ed715a6..c6ca54d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /secrets.nix
-/result
+result
diff --git a/configs/networks.nix b/configs/networks.nix
index 464ad7b..3106f2d 100644
--- a/configs/networks.nix
+++ b/configs/networks.nix
@@ -50,14 +50,15 @@ in {
           user = "kfm";
           port = sshPort;
         };
+        catullus = {
+          hostname = "catullus.local";
+          user = "root";
+        };
       };
     };
   };
 
-  programs.ssh = {
-    startAgent = true;
-    forwardX11 = true;
-  };
+  programs.ssh.startAgent = true;
 
   services.openssh = {
     ports = [ sshPort ];
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index c6426e4..fbbc17a 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -1,7 +1,12 @@
 { config, pkgs, ... }:
-{
+let
+  sshKey = {
+    homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com";
+    scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com";
+  };
+in {
   imports = [
-    ../../configs/shells.nix
+    <system/hardware-configuration.nix>
   ];
 
   boot.loader.grub.enable = false;
@@ -15,27 +20,26 @@
     enable = true;
     networks.Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; };
   };
-  environment.variables.EDITOR = "vim";
-  environment.variables.HTOPRC = toString ../../dot/htoprc;
+
   environment.variables.TERM = "linux";
 
-  programs.tmux.enable = true;
+  documentation.enable = false;
+  documentation.doc.enable = false;
+  documentation.man.enable = false;
+  documentation.info.enable = false;
+  fonts.fontconfig.enable = false;
 
+  programs.tmux.enable = true;
   environment.systemPackages = with pkgs; [
     git
-    htop
     vim
   ];
 
-  services.openssh.enable = true;
+  users.mutableUsers = false;
 
-  users.users.kfm = {
-    name = "kfm";
-    description = "Kierán Meinhardt";
-    home = "/home/kfm";
-    createHome = true;
-    group = "users";
-    extraGroups = [ "wheel" ];
-    shell = pkgs.zsh;
-  };
+  services.openssh.enable = true;
+  users.users.root.openssh.authorizedKeys.keys = [
+    sshKey.homeros
+    sshKey.scardanelli
+  ];
 }
diff --git a/systems/catullus/hardware-configuration.nix b/systems/catullus/hardware-configuration.nix
index 20ec1ac..5817349 100644
--- a/systems/catullus/hardware-configuration.nix
+++ b/systems/catullus/hardware-configuration.nix
@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
-  imports = [ ./config.nix ];
-
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelParams = [ "cma=32M" ];
 
diff --git a/systems/krops.nix b/systems/krops.nix
new file mode 100644
index 0000000..4d0820d
--- /dev/null
+++ b/systems/krops.nix
@@ -0,0 +1,23 @@
+let
+  krops = builtins.fetchGit {
+    url = "https://cgit.krebsco.de/krops/";
+  };
+  lib = import "${krops}/lib";
+  pkgs = import "${krops}/pkgs" {};
+
+  source = path: lib.evalSource [{
+    nixpkgs.git = {
+      ref = "6a3f5bcb061e1822f50e299f5616a0731636e4e7"; # 18.09
+      url = https://github.com/NixOS/nixpkgs-channels;
+    };
+    system.file = toString path;
+    nixos-config.symlink = "system/configuration.nix";
+  }];
+
+  systems.catullus = pkgs.krops.writeDeploy "deploy-catullus" {
+    source = source ./catullus;
+    target = "root@catullus.local";
+  };
+in systems // {
+  all = pkgs.writeScript "deploy-all" (lib.concatStringsSep "\n" (lib.attrValues systems));
+}