diff --git a/hosts/Niko/default.nix b/hosts/Niko/default.nix
index 8855d07..9efdf12 100644
--- a/hosts/Niko/default.nix
+++ b/hosts/Niko/default.nix
@@ -52,6 +52,10 @@
     };
 
     networkmanager.enable = true;
+
+    extraHosts = ''
+      192.168.0.11 jelly.depeuter.dev
+    '';
   };
 
   nix = {
@@ -68,16 +72,20 @@
 
   # List services that you want to enable:
   services = {
-    displayManager = {
+    # Cage, a wayland kiosk service
+    cage = {
       enable = true;
-      autoLogin = {
-        enable = true;
-        user = config.users.users.jellyfin-mpv-shim.name;
+      environment = {
+        # Do not fail when there are no input devices.
+        # WLR_LIBINPUT_NO_DEVICES = "1";
       };
-    };
-    xserver = {
-      enable = true;
-      displayManager.startx.enable = true;
+      extraArguments = [
+        "-d" # Don't draw client side decorations, when possible
+        # "-m" "last" # Use only the last connected output
+        "-s" # Allow VT switching
+      ];
+      program = "/home/jellyfin-mpv-shim/start.sh";
+      user = config.users.users.jellyfin-mpv-shim.name;
     };
 
     openssh = {
@@ -126,6 +134,8 @@
         ];
         packages = with pkgs; [
           jellyfin-mpv-shim
+          mpv
+          socat
         ];
       };
     };
@@ -158,9 +168,14 @@
     ];
   };
 
+  systemd.services."cage-tty1".serviceConfig.Restart = "always";
+
   system.stateVersion = "24.05";
 
   virtualisation = {
+    # Enable Android emulator
+    # waydroid.enable = true;
+
     docker = {
       enable = true;
       autoPrune.enable = true;
diff --git a/hosts/Niko/hardware-configuration.nix b/hosts/Niko/hardware-configuration.nix
index bf837af..260cf1f 100644
--- a/hosts/Niko/hardware-configuration.nix
+++ b/hosts/Niko/hardware-configuration.nix
@@ -12,7 +12,6 @@
         "ahci"
         "usb_storage"
         "sd_mod"
-        "iwlwifi"
       ];
     };
     kernelModules = [ ];
@@ -29,6 +28,15 @@
       device = "/dev/disk/by-uuid/0B6D-0DCD";
       fsType = "vfat";
     };
+
+#    "/data/photos" = {
+#      device = "//192.168.0.11/CANVAS";
+#      fsType = "cifs";
+#      options = let
+#        # this line prevents hanging on network split
+#        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+#      in ["${automount_opts},credentials=/etc/nixos/smb-secrets"];
+#    };
   };
 
   swapDevices = [