diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix
deleted file mode 100644
index ac04f3c..0000000
--- a/hosts/froidmpa-laptop/default.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-{ config, ... }:
-{
-  imports = [ ./hardware-configuration.nix ];
-
-  modules = {
-    desktop.wm.enable = true;
-    editor = {
-      vim.enable = true;
-      emacs.enable = true;
-    };
-    services = {
-      flatpak.enable = true;
-      belgian-eid.enable = true;
-      docker.enable = true;
-      libvirt.enable = true;
-      languagetool.enable = true;
-      work-proxy.enable = true;
-    };
-    media = {
-      mpd.enable = true;
-      ncmpcpp.enable = true;
-    };
-  };
-
-  user.name = "froidmpa";
-
-  # Monitor backlight control
-  programs.light.enable = true;
-
-  services.tlp.enable = true;
-
-  home-manager.users.${config.user.name} =
-    { ... }:
-    {
-      services.network-manager-applet.enable = true;
-      services.blueman-applet.enable = true;
-      wayland.windowManager.hyprland.settings = {
-        monitor = [
-          "eDP-1, 1920x1080, 0x720, 1.5"
-          "DP-1, 1920x1080, 0x0, 1.5"
-        ];
-
-        workspace = [
-          "w[tv1], gapsout:0, gapsin:0"
-          "f[1], gapsout:0, gapsin:0"
-        ];
-        windowrulev2 = [
-          "bordersize 0, floating:0, onworkspace:w[tv1]"
-          "rounding 0, floating:0, onworkspace:w[tv1]"
-          "bordersize 0, floating:0, onworkspace:f[1]"
-          "rounding 0, floating:0, onworkspace:f[1]"
-        ];
-      };
-    };
-
-  services.pipewire.wireplumber.extraConfig = {
-    "monitor.bluez.properties" = {
-      "bluez5.enable-sbc-xq" = true;
-      "bluez5.enable-msbc" = true;
-      "bluez5.enable-hw-volume" = true;
-      "bluez5.roles" = [
-        "hsp_hs"
-        "hsp_ag"
-        "hfp_hf"
-        "hfp_ag"
-      ];
-    };
-  };
-
-  services.tailscale.enable = true;
-
-  services.openssh = {
-    enable = true;
-    settings.PasswordAuthentication = false;
-    listenAddresses = [
-      {
-        # Tailscale interface
-        addr = "100.64.0.1";
-        port = 22;
-      }
-    ];
-  };
-  services.logind.settings.Login.HandleLidSwitch = "ignore";
-  users.users.${config.user.name} = {
-    openssh.authorizedKeys.keyFiles = [
-      ../../ssh_keys/phfroidmont-desktop.pub
-      ../../ssh_keys/phfroidmont-stellaris.pub
-    ];
-    extraGroups = [ "video" ];
-  };
-
-  nix = {
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "hel1.banditlair.com";
-        sshUser = "nix-ssh";
-        system = "x86_64-linux";
-        supportedFeatures = [
-          "nixos-test"
-          "benchmark"
-          "big-parallel"
-          "kvm"
-        ];
-      }
-    ];
-    settings = {
-      substituters = [ "ssh://nix-ssh@hel1.banditlair.com" ];
-      trusted-public-keys = [ "hel1.banditlair.com:stzB4xe5QTFvSABoP11ZpNzLDCRZ93PExk0Z/gOzW3g=" ];
-      builders-use-substitutes = true;
-    };
-  };
-  system.stateVersion = "21.05";
-}
diff --git a/hosts/froidmpa-laptop/hardware-configuration.nix b/hosts/froidmpa-laptop/hardware-configuration.nix
deleted file mode 100644
index 06c9403..0000000
--- a/hosts/froidmpa-laptop/hardware-configuration.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "sdhci_pci"
-      ];
-      kernelModules = [ "dm-snapshot" ];
-    };
-    kernelModules = [ "kvm-amd" ];
-    # Required, otherwise the kernel freezes on boot
-    kernelParams = [
-      "amd_iommu=on"
-      "iommu=pt"
-      "pci=noats"
-    ];
-    extraModulePackages = [ ];
-    loader.systemd-boot.enable = true;
-    loader.efi.canTouchEfiVariables = true;
-    initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61";
-  };
-
-  hardware.cpu.amd.updateMicrocode = true;
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/077C-758A";
-    fsType = "vfat";
-  };
-
-  swapDevices = [ { device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; } ];
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      # Enable A2DP Sink
-      settings = {
-        General = {
-          Enable = "Source,Sink,Media,Socket";
-        };
-      };
-    };
-  };
-
-  networking.networkmanager.enable = true;
-
-  services.blueman.enable = true;
-
-}
diff --git a/hosts/rpi3/default.nix b/hosts/rpi3/default.nix
index b48da97..dce1070 100644
--- a/hosts/rpi3/default.nix
+++ b/hosts/rpi3/default.nix
@@ -27,7 +27,7 @@
   services.openssh.enable = true;
   users.users.root.openssh.authorizedKeys.keyFiles = [
     ../../ssh_keys/phfroidmont-desktop.pub
-    ../../ssh_keys/phfroidmont-laptop.pub
+    ../../ssh_keys/phfroidmont-stellaris.pub
   ];
 
   services.adguardhome = {
diff --git a/hosts/stellaris/default.nix b/hosts/stellaris/default.nix
index ffc52ee..d6039ce 100644
--- a/hosts/stellaris/default.nix
+++ b/hosts/stellaris/default.nix
@@ -116,7 +116,6 @@
   users.users.${config.user.name} = {
     openssh.authorizedKeys.keyFiles = [
       ../../ssh_keys/phfroidmont-desktop.pub
-      ../../ssh_keys/phfroidmont-laptop.pub
     ];
     extraGroups = [ "video" ];
   };
diff --git a/ssh_keys/phfroidmont-laptop.pub b/ssh_keys/phfroidmont-laptop.pub
deleted file mode 100644
index ebf70fe..0000000
--- a/ssh_keys/phfroidmont-laptop.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILu2vaezsTNaTY8X4o2mFOmQguPnSAMOoPZRlW2ACAku froidmpa@froidmpa-laptop-2021-06-30
\ No newline at end of file