From 0965e78ac821516d12ec8fb5aa70cd6e7da514a5 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sun, 1 Dec 2024 15:17:23 -0600 Subject: [PATCH] alasdflkasdjf --- boxes/copernicus/default.nix | 13 +++++++++++++ boxes/copernicus/hardware-configuration.nix | 2 +- boxes/copernicus/jsfw.json | 11 +++++++++-- builds/utils/disp | 3 +++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/boxes/copernicus/default.nix b/boxes/copernicus/default.nix index 9ca9c90..b6d3e9f 100644 --- a/boxes/copernicus/default.nix +++ b/boxes/copernicus/default.nix @@ -68,6 +68,19 @@ virtualisation.virtualbox.host.enable = true; + security.sudo.extraRules = [ + { + users = [ "usr" ]; + runAs = "root"; + commands = [ + { + command = "/run/current-system/sw/bin/jsfw"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; + boot.loader = { efi = { canTouchEfiVariables = true; diff --git a/boxes/copernicus/hardware-configuration.nix b/boxes/copernicus/hardware-configuration.nix index 8758230..a22174d 100644 --- a/boxes/copernicus/hardware-configuration.nix +++ b/boxes/copernicus/hardware-configuration.nix @@ -10,7 +10,7 @@ boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-intel" "psmouse" "wacom" ]; boot.extraModulePackages = [ ]; fileSystems."/" = diff --git a/boxes/copernicus/jsfw.json b/boxes/copernicus/jsfw.json index daee382..ce9e31d 100644 --- a/boxes/copernicus/jsfw.json +++ b/boxes/copernicus/jsfw.json @@ -3,9 +3,16 @@ { "controllers": [ { - "tag": ["keyboard"], + "tag": "keyboard", "vendor": "dead", - "product": "beef" + "product": "beef", + "name": "keyboard" + }, + { + "tag": "mouse", + "vendor": "0002", + "product": "000e", + "name": "ETPS/2 Elantech Touchpad" } ] } diff --git a/builds/utils/disp b/builds/utils/disp index 654130c..7dec090 100755 --- a/builds/utils/disp +++ b/builds/utils/disp @@ -132,6 +132,9 @@ case "$(hostname)" in ;; esac phone pair & disown + pkill jsfw + st -e sudo /run/current-system/sw/bin/jsfw client 192.168.1.211 24800 ~/dot_testing/boxes/copernicus/jsfw.json & disown + st -e sudo /run/current-system/sw/bin/jsfw client 192.168.1.211 24800 ~/dot_testing/boxes/copernicus/jsfw.json & disown ;; "localhost") # phone in termux xrandr --output VNC-0 --mode 1920x1080