From 6b9469b990b1732f23a1455a77a210f8eba186c8 Mon Sep 17 00:00:00 2001
From: UGA Innovation Factory <engr-ugaif@uga.edu>
Date: Mon, 8 Dec 2025 20:12:40 +0000
Subject: [PATCH] force osk with user service

---
 sw-kiosk.nix | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/sw-kiosk.nix b/sw-kiosk.nix
index 8cfc6d9..d06bd8f 100644
--- a/sw-kiosk.nix
+++ b/sw-kiosk.nix
@@ -1,15 +1,6 @@
 { pkgs, inputs, ... }:
 
 {
-  services.cage = {
-    enable = false;
-    user = "engr-ugaif";
-    program = "${(pkgs.writeShellScriptBin "chromium-kiosk" ''
-      sleep 5
-      ${pkgs.chromium}/bin/chromium --kiosk "https://ha.factory.uga.edu"
-    '')}/bin/chromium-kiosk";
-  };
-
   services.xserver = {
     enable = true;
     desktopManager.phosh = {
@@ -84,25 +75,10 @@
       "/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas";
   };
 
-  services.udev.extraRules = ''
-    # These shouldn't be counted as keyboards, but should still produce events
-    ACTION=="add|change", KERNEL=="event*", ATTRS{name}=="Video Bus", \
-      ENV{ID_INPUT_KEYBOARD}="", ENV{ID_INPUT_KEY}=""
-    ACTION=="add|change", KERNEL=="event*", ATTRS{name}=="Power Button", \
-      ENV{ID_INPUT_KEYBOARD}="", ENV{ID_INPUT_KEY}=""
-    ACTION=="add|change", KERNEL=="event*", ATTRS{name}=="Intel HID events", \
-      ENV{ID_INPUT_KEYBOARD}="", ENV{ID_INPUT_KEY}=""
-    ACTION=="add|change", KERNEL=="event*", ATTRS{name}=="Intel HID 5 button array", \
-      ENV{ID_INPUT_KEYBOARD}="", ENV{ID_INPUT_KEY}=""
-    ACTION=="change", SUBSYSTEM=="switch", ATTRS{name}=="Intel HID switches", \
-      ENV{SW_TABLET_MODE}="1"
-    ACTION=="add|change", KERNEL=="event*", ATTRS{name}=="AT Translated Set 2 keyboard", \
-      ENV{ID_INPUT_KEY}="", ENV{ID_INPUT_KEYBOARD}=""
-  '';
   systemd.user.services."force-osk" = {
     description = "Force the OSK to Enable";
-    wantedBy = [ "graphical-session.target" ];
-    partOf   = [ "graphical-session.target" ];
+    wantedBy = [ "chromium-kiosk.service" ];
+    partOf   = [ "chromium-kiosk.service" ];
 
     serviceConfig = {
       ExecStart = ''
@@ -119,7 +95,7 @@
     serviceConfig = {
       ExecStart = ''
         ${pkgs.chromium}/bin/chromium \
-          --enable-features=UseOzonePlatform,WebRTCLibcamera,TouchpadOverscrollHistoryNavigation \
+          --enable-features=UseOzonePlatform,TouchpadOverscrollHistoryNavigation \
           --ozone-platform=wayland \
           --kiosk \
           --start-fullscreen \