diff --git a/flake.lock b/flake.lock
index 532fad2..9fba769 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,22 @@
         "type": "github"
       }
     },
+    "ckiee": {
+      "locked": {
+        "lastModified": 1651228769,
+        "narHash": "sha256-7aO7XxunWR5FUdwZBrNgXWt1xD6posMo7nLubIEbh50=",
+        "owner": "ckiee",
+        "repo": "nixpkgs",
+        "rev": "b123419b91b91afce08491861a6dd7069e2ba949",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ckiee",
+        "ref": "gpt2simple-py-init",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "deploy-rs": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -40,11 +56,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1650104515,
-        "narHash": "sha256-fuvcZH6wVqRGo/yeJkHh3jmKmTZhYTxTc3xTe+fSkt4=",
+        "lastModified": 1651259218,
+        "narHash": "sha256-Op4KH8XyqYKrD7DyuAF3dnq9oOOcE9n2LULxSs2FgQ4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "ba54077d5eb8fedfede088ce174a6a0aa5e4dc8b",
+        "rev": "82abb862fec2c3f48d8f3690d22f27fc25f48478",
         "type": "github"
       },
       "original": {
@@ -85,16 +101,35 @@
         "type": "github"
       }
     },
+    "gomod2nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_8",
+        "utils": "utils_4"
+      },
+      "locked": {
+        "lastModified": 1641803356,
+        "narHash": "sha256-ZjF43cckJLJCV9I+SXwTGNQGI52KrYwUhLt/R83TyKk=",
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "rev": "fc5adcc53031c5a3934500a57896a840a2bd073d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1649984295,
-        "narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=",
+        "lastModified": 1651262513,
+        "narHash": "sha256-5iW1fevaAD0Rbtbgb4I++7fyaND3oarGs3mAjyadE0Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d49d68f4196d32c5039cb9e91d730cee894f6f14",
+        "rev": "f8b51be7149a0735e87b232d21ae4f852619eac7",
         "type": "github"
       },
       "original": {
@@ -155,11 +190,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1639947939,
-        "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
+        "lastModified": 1650265945,
+        "narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
+        "rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df",
         "type": "github"
       },
       "original": {
@@ -224,11 +259,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1649961138,
-        "narHash": "sha256-8ZCPrazs+qd2V8Elw84lIWuk0kKfVQ8Ei/19gahURhM=",
+        "lastModified": 1651114127,
+        "narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d08394e7cd5c7431a1e8f53b7f581e74ee909548",
+        "rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921",
         "type": "github"
       },
       "original": {
@@ -238,11 +273,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1649809588,
-        "narHash": "sha256-f6sgDj9A8FXTVyA2zkxA66YX+j6BftxE9VHTeIMhEKE=",
+        "lastModified": 1651007983,
+        "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff9efb0724de5ae0f9db9df2debefced7eb1571d",
+        "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936",
         "type": "github"
       },
       "original": {
@@ -254,11 +289,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1645866791,
-        "narHash": "sha256-okyN8nAb0gFfF2rjjJnMiIuOM+nZXxZ9Wc2PyoYYKWo=",
+        "lastModified": 1650555608,
+        "narHash": "sha256-e34oMPWPwRWhF1K6NZnF0mNle7qDADJzjWujp8UupGo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "607178a179d6943cb64970882511c24b2a983c2b",
+        "rev": "c11ee1c598b15a24d18f142f85ee3d438afc39e6",
         "type": "github"
       },
       "original": {
@@ -267,6 +302,21 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1650161686,
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1640319671,
         "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
@@ -282,13 +332,66 @@
         "type": "github"
       }
     },
-    "portable-svc": {
+    "nixpkgs_8": {
       "locked": {
-        "lastModified": 1645960986,
-        "narHash": "sha256-XuapDz2dkUAgKaj3L2EUgzXApn6IXGtQVg/TEfhr0w8=",
+        "lastModified": 1625191069,
+        "narHash": "sha256-M8/UH9pMgQEtuzY9bFwklYw8hx0pOKtUTyQC8E2UTHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d8079260a3028ae3221d7a5467443ee3a9edd2b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1650161686,
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "portable-svc": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1650586426,
+        "narHash": "sha256-n/Q2IzITm8s5sej3l3D0rxJcd7vx4P7KF4hOkN9pOOg=",
         "ref": "main",
-        "rev": "138c25c1c3ee4f7945059e05259d3fe03678e843",
-        "revCount": 5,
+        "rev": "eb4b2c4754e5cd4a976a2941c27194526e8781de",
+        "revCount": 6,
+        "type": "git",
+        "url": "https://tulpa.dev/cadey/portable-svc.git"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://tulpa.dev/cadey/portable-svc.git"
+      }
+    },
+    "portable-svc_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_9"
+      },
+      "locked": {
+        "lastModified": 1650586426,
+        "narHash": "sha256-n/Q2IzITm8s5sej3l3D0rxJcd7vx4P7KF4hOkN9pOOg=",
+        "ref": "main",
+        "rev": "eb4b2c4754e5cd4a976a2941c27194526e8781de",
+        "revCount": 6,
         "type": "git",
         "url": "https://tulpa.dev/cadey/portable-svc.git"
       },
@@ -311,11 +414,11 @@
         "xess": "xess"
       },
       "locked": {
-        "lastModified": 1645968759,
-        "narHash": "sha256-S7aGJUfsopvTs3tpX74PQtiq0is3RHuuGo/8ph4+TpE=",
+        "lastModified": 1650588246,
+        "narHash": "sha256-Pq92JetnhkvGArE+fUQcTtUB0DUi6yS4mY3IuRGn/qU=",
         "ref": "main",
-        "rev": "b92f7d216d1397936e28f3df9ed33482c7f2d053",
-        "revCount": 58,
+        "rev": "640a40809968f897b7de7694705eb5621bbe87ea",
+        "revCount": 62,
         "type": "git",
         "url": "https://tulpa.dev/cadey/printerfacts.git"
       },
@@ -357,7 +460,8 @@
         "rhea": "rhea",
         "utils": "utils_3",
         "waifud": "waifud",
-        "wsl": "wsl"
+        "wsl": "wsl",
+        "x": "x"
       }
     },
     "utils": {
@@ -405,6 +509,21 @@
         "type": "github"
       }
     },
+    "utils_4": {
+      "locked": {
+        "lastModified": 1623875721,
+        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "waifud": {
       "inputs": {
         "naersk": "naersk_3",
@@ -440,11 +559,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650629047,
-        "narHash": "sha256-IwiKbzXTzodPKMHm5qTizGoMVjipevbliraFmnrdsqU=",
+        "lastModified": 1651096409,
+        "narHash": "sha256-KUpb6NNvv65SCQ1Zqm9hFxXVjtF8T7VltZwlb79ngqg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "69783cf56b2ada7e0e8cc8d17907a346e8bd97b7",
+        "rev": "506d46f8b7509080388ab5d3c6daca5a1097f649",
         "type": "github"
       },
       "original": {
@@ -453,9 +572,35 @@
         "type": "github"
       }
     },
+    "x": {
+      "inputs": {
+        "ckiee": "ckiee",
+        "gomod2nix": "gomod2nix",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "portable-svc": "portable-svc_2",
+        "utils": [
+          "utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1651283351,
+        "narHash": "sha256-yRVh9KO14T+wJqHcR6bzAFANZb3qRUvXSoE6I+JKQ+8=",
+        "owner": "Xe",
+        "repo": "x",
+        "rev": "1f25e37307a99ba97417cd25dcec1b9187bd9437",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Xe",
+        "repo": "x",
+        "type": "github"
+      }
+    },
     "xess": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "utils": "utils_2"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index beec382..872bbaf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,10 +35,15 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.utils.follows = "utils";
     };
+    x = {
+      url = "github:Xe/x";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.utils.follows = "utils";
+    };
   };
 
   outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, printerfacts, mara
-    , rhea, waifud, emacs-overlay, wsl, ... }:
+    , rhea, waifud, emacs-overlay, wsl, x, ... }:
     let
       pkgs = nixpkgs.legacyPackages."x86_64-linux";
       mkSystem = extraModules:
@@ -62,6 +67,7 @@
             printerfacts.nixosModules.${system}.printerfacts
             mara.nixosModules.${system}.bot
             rhea.nixosModule.${system}
+            x.nixosModules.${system}.robocadey
 
           ] ++ extraModules;
         };
@@ -130,8 +136,7 @@
                     '';
                   };
                 in {
-                  imports =
-                    [ ./common/home-manager ];
+                  imports = [ ./common/home-manager ];
 
                   within = {
                     emacs.enable = true;
@@ -144,7 +149,7 @@
                   services.emacs.enable = lib.mkForce false;
                   programs.direnv.enable = true;
                   programs.direnv.nix-direnv.enable = true;
-                  
+
                   programs.git = {
                     package = pkgs.gitAndTools.gitFull;
                     enable = true;