diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index f1e67273..cd9c6379 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -5,8 +5,26 @@
     ../base.nix
   ];
 
+  services.xrdp.enable = true;
+  services.xrdp.defaultWindowManager = "startplasma-x11";
+  networking.firewall.allowedTCPPorts = [ 3389 ];
+
+  services.home-assistant = {
+    enable = true;
+    extraComponents = [
+      # Components required to complete the onboarding
+      "met"
+      "radio_browser"
+    ];
+    config = {
+      # Includes dependencies for a basic setup
+      # https://www.home-assistant.io/integrations/default_config/
+      default_config = {};
+    };
+  };
+
   networking.hostName = "biskcomp";
-  hardware.video.hidpi.enable = true;
+  # hardware.video.hidpi.enable = true;
 
   system.stateVersion = "21.05";
 }
diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix
index 4af2ae7a..4d7a1ea4 100644
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -8,23 +8,6 @@
   hardware.raspberry-pi."4".fkms-3d.enable = true;
   hardware.raspberry-pi."4".audio.enable = true;
 
-  boot = {
-    kernelPackages = pkgs.linuxPackages_rpi4;
-    tmpOnTmpfs = true;
-    loader = {
-      grub.enable = false;
-      generic-extlinux-compatible.enable = true;
-      raspberryPi = {
-        enable = true;
-	      version = 4;
-	      firmwareConfig = ''
-          dtparam=audio=on
-          hdmi_drive=2
-	      '';
-      };
-    };
-  };
-
   hardware.enableRedistributableFirmware = true;
 
   networking.useDHCP = false;