From 96fe999669303f080a1f95a236ded0ddbdaf505e Mon Sep 17 00:00:00 2001 From: Robert Gerus Date: Tue, 7 Nov 2023 14:42:52 +0100 Subject: [PATCH] akamanto: screen is now mounted correct-side up leaving the workarounds in, commented out, just in case --- nixos/akamanto/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/akamanto/default.nix b/nixos/akamanto/default.nix index cb59194..4f59073 100644 --- a/nixos/akamanto/default.nix +++ b/nixos/akamanto/default.nix @@ -7,9 +7,9 @@ let moonraker_host: localhost moonraker_port: 7125 ''; + # ${pkgs.wlr-randr}/bin/wlr-randr --output HDMI-A-1 --transform 180 cageScript = pkgs.writeScriptBin "klipperCageScript" '' #!${pkgs.runtimeShell} - ${pkgs.wlr-randr}/bin/wlr-randr --output HDMI-A-1 --transform 180 sounds=( /home/ar/startup-sounds/* ) ${pkgs.mpv}/bin/mpv ''${sounds[ $RANDOM % ''${#sounds[@]}]} & ${pkgs.klipperscreen}/bin/KlipperScreen --configfile ${klipperScreenConfig} @@ -76,7 +76,7 @@ in { kernelModules = [ "bcm2835-v4l2" ]; # avoid building zfs supportedFilesystems = lib.mkForce [ "vfat" "ext4" ]; - kernelParams = [ "console=ttyS1,115200n8" "fbcon=rotate:2" ]; + kernelParams = [ "console=ttyS1,115200n8" ]; # "fbcon=rotate:2" loader.grub.enable = false; loader.generic-extlinux-compatible.enable = true; }; @@ -443,8 +443,9 @@ in { force_logins = false; cors_domains = [ "*.local" "*.waw.hackerspace.pl" ]; trusted_clients = [ + "127.0.0.1/32" "10.8.0.0/23" - "2a0d:eb00:4242::/64" + "2a0d:eb00:4242:0000:0000:0000:0000:0000/64" ]; }; # causes issues for some reason @@ -488,9 +489,8 @@ in { # ENV{WL_OUTPUT}="HDMI-A-1" # sadly, this doesn't work for us here, for some unbeknownst reason services.udev.extraRules = '' - SUBSYSTEM=="input", ATTRS{idVendor}=="0eef", ENV{LIBINPUT_CALIBRATION_MATRIX}="-1 0 1 0 -1 1" KERNEL=="gpiochip0", GROUP="dialout", MODE="0660" - ''; + ''; # SUBSYSTEM=="input", ATTRS{idVendor}=="0eef", ENV{LIBINPUT_CALIBRATION_MATRIX}="-1 0 1 0 -1 1" services.cage = { enable = true; user = "ar";