diff --git a/hosts/gojo/default.nix b/hosts/gojo/default.nix
deleted file mode 100644
index 3686af1..0000000
--- a/hosts/gojo/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  inputs,
-  lib,
-  ...
-}: {
-  imports = [
-    inputs.nixos-hardware.nixosModules.common-cpu-intel
-    inputs.nixos-hardware.nixosModules.common-gpu-intel
-    inputs.nixos-hardware.nixosModules.common-pc-laptop
-    inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
-
-    ../../config/basic
-    ../../config/optional/dev.nix
-    ../../config/optional/graphical.nix
-    ../../config/optional/wayland.nix
-    ../../config/optional/xserver.nix
-    ../../config/optional/printing.nix
-    ../../config/hardware/bluetooth.nix
-    ../../config/hardware/laptop.nix
-    ../../config/hardware/physical.nix
-    ../../config/hardware/pipewire.nix
-    ../../config/hardware/yubikey.nix
-
-    ./net.nix
-    ./fs.nix
-
-    ../../users/simon
-  ];
-  stylix.fonts.sizes = {
-    #terminal = 9;
-    #applications = 9;
-    #desktop = 8;
-  };
-  services.xserver = {
-    layout = "de";
-    xkbVariant = "neo";
-    libinput = {
-      touchpad = lib.mkForce {
-        accelSpeed = "0.5";
-      };
-    };
-  };
-}
diff --git a/hosts/gojo/fs.nix b/hosts/gojo/fs.nix
deleted file mode 100644
index 25a24ed..0000000
--- a/hosts/gojo/fs.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  disko.devices = {
-    disk = {
-      ssd = {
-        type = "disk";
-        device = "/dev/disk/by-id/${config.secrets.secrets.local.disko.ssd}";
-        content = with lib.disko.gpt; {
-          type = "gpt";
-          partitions = {
-            boot = partEfi "260MB";
-            rpool = {
-              content = {
-                type = "zfs";
-                pool = "rpool";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {datasets = impermanenceZfsDatasets;};
-    };
-  };
-  fileSystems."/state".neededForBoot = true;
-}
diff --git a/hosts/gojo/net.nix b/hosts/gojo/net.nix
deleted file mode 100644
index 0a3f29b..0000000
--- a/hosts/gojo/net.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{config, ...}: {
-  networking = {
-    inherit (config.secrets.secrets.local.networking) hostId;
-    wireless.iwd.enable = true;
-  };
-
-  systemd.network.networks = {
-    "01-wlan1" = {
-      DHCP = "yes";
-      matchConfig.MACAddress = config.secrets.secrets.local.networking.wlan1.mac;
-      networkConfig = {
-        IPv6PrivacyExtensions = "yes";
-        MulticastDNS = true;
-      };
-      dns = ["1.1.1.1"];
-      dhcpV4Config.RouteMetric = 40;
-      dhcpV6Config.RouteMetric = 40;
-    };
-  };
-  age.secrets.eduroam = {
-    rekeyFile = ./secrets/iwd/eduroam.8021x.age;
-    path = "/var/lib/iwd/eduroam.8021x";
-  };
-}
diff --git a/hosts/gojo/secrets/host.pub b/hosts/gojo/secrets/host.pub
deleted file mode 100644
index 6713d9b..0000000
--- a/hosts/gojo/secrets/host.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH+6isyj+sdzilpFSgGjw3xUfoJ1s307OJGcuzmgJL+L
diff --git a/hosts/gojo/secrets/iwd/eduroam.8021x.age b/hosts/gojo/secrets/iwd/eduroam.8021x.age
deleted file mode 100644
index b735c83..0000000
--- a/hosts/gojo/secrets/iwd/eduroam.8021x.age
+++ /dev/null
@@ -1,17 +0,0 @@
-age-encryption.org/v1
--> X25519 FvDDqK/3eca0id5we/szPNjtkeNg44MPJJa/DkxA8yY
-bERDGRpArN1wKKvYEDZuP4ktvBj3yYj5ophx5PLC9hU
--> piv-p256 XTQkUA AxE8qOeoW7GCN++vsXmKs1p92iiNHuV/DEPR4K1h64gy
-UUfWj4rXavZA28BM/hBKqLF1MJcakFpEIdzd/78SoVY
--> piv-p256 ZFgiIw AtMYu+DvAD//JL7rZfEkkeGyxakvqzArsTjVwe6IRDZI
-fdTmmtSM1Wy2y+0INVKYbCItuKh/qSipRa/OHeNQoEY
--> piv-p256 5vmPtQ A/pjTZCYMU8jMEN1lIDPTsnuMxclc+7tSDZ/jc+vHptt
-6KAF06R1l47U2RdCkJK+lFc67SMR/+hvxfi2qrJDyS0
--> piv-p256 ZFgiIw A0N/CAMSA29+Sqbol4PCs7wYYJT4AvAKd0DKe0hfy8Bp
-Vlo9T4FZNRK8kR5OuxrAVUe5Tx5x9NAeaI2gKIJeNEA
--> dZ2v|-grease *(F:08]t
-IZuQlw2zI1CelSB69O6XeKI2qG83Cu/bRhusaMtUYfGH5iskbPdh0OJ6ohadEusT
-sYUVi0mBry7L
---- Y5cpADckhrStO9mPQXw8h448VBYUXCiKEYucO8qNHg4
-6�ɒ�U
s�ֽ�K�tJ4�8�ˋ���%7���۰��'���o�����]�-7n�|bx����M���

ږ���m$�����X⇸S����sUf�|�K6�Ҏ�vL�._.�+���V
-��s�m���֭����n���~P�5p!g��W׽k��`�+�y}��
\ No newline at end of file
diff --git a/hosts/gojo/secrets/secrets.nix.age b/hosts/gojo/secrets/secrets.nix.age
deleted file mode 100644
index da50162..0000000
Binary files a/hosts/gojo/secrets/secrets.nix.age and /dev/null differ