From 1882573a5cf3a47723b07575d8a9017f0dbe7290 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Thu, 25 Sep 2025 15:29:28 +0200 Subject: [PATCH] fix monado --- flake.lock | 18 ++-- overlays.nix | 132 +++++++-------------------- systems/amd-server/configuration.nix | 1 + systems/pc/configuration.nix | 4 +- 4 files changed, 47 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index a0546c7..1d73d41 100644 --- a/flake.lock +++ b/flake.lock @@ -460,11 +460,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1758072148, - "narHash": "sha256-MiftHJ4tyCXIZGeR/hq/WpgvlgZZsv+SbYV6lZtFDVE=", + "lastModified": 1758504570, + "narHash": "sha256-Ip1FZU7t84E1vFVFUyIGiNyMD5MYjJWZegrDDL6duwA=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "328e9c9eab98b43db0f421797d59d06d5bc0fc63", + "rev": "cc5ab1f8e3edfbb7b8a0d41a86a7b38ccea933a0", "type": "github" }, "original": { @@ -475,11 +475,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -811,11 +811,11 @@ ] }, "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", + "lastModified": 1758206697, + "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", "type": "github" }, "original": { diff --git a/overlays.nix b/overlays.nix index c52f47b..3fb662b 100644 --- a/overlays.nix +++ b/overlays.nix @@ -27,73 +27,6 @@ index 196c2e78..42a3df76 100644 height = 10, width = 10, ''; - #TODO: sending keyboard stuff requires converting from keysym -> keycode. idk how to do that - testing-patch = '' -diff --git i/src/portals/RemoteDesktop.cpp w/src/portals/RemoteDesktop.cpp -index 551550f..cc97d02 100644 ---- i/src/portals/RemoteDesktop.cpp -+++ w/src/portals/RemoteDesktop.cpp -@@ -29,7 +29,7 @@ CRemoteDesktopPortal::CRemoteDesktopPortal() { - return onStart(o1, o2, s1, s2, m); - }), - sdbus::registerMethod("NotifyPointerMotion") -- .implementedAs([this](sdbus::ObjectPath o, double d1, double d2, std::unordered_map m) { -+ .implementedAs([this](sdbus::ObjectPath o, std::unordered_map m, double d1, double d2) { - return onNotifyPointerMotion(o, d1, d2, m); - }), - sdbus::registerMethod("NotifyPointerMotionAbsolute") -@@ -37,11 +37,11 @@ CRemoteDesktopPortal::CRemoteDesktopPortal() { - return onNotifyPointerMotionAbsolute(o, u, d1, d2, m); - }), - sdbus::registerMethod("NotifyPointerButton") -- .implementedAs([this](sdbus::ObjectPath o, int i, unsigned int u, std::unordered_map m) { -+ .implementedAs([this](sdbus::ObjectPath o, std::unordered_map m, int i, unsigned int u) { - return onNotifyPointerButton(o, i, u, m); - }), - sdbus::registerMethod("NotifyPointerAxis") -- .implementedAs([this](sdbus::ObjectPath o, double d1, double d2, std::unordered_map m) { -+ .implementedAs([this](sdbus::ObjectPath o, std::unordered_map m, double d1, double d2) { - return onNotifyPointerAxis(o, d1, d2, m); - }), - sdbus::registerMethod("NotifyPointerAxisDiscrete") -@@ -53,7 +53,7 @@ CRemoteDesktopPortal::CRemoteDesktopPortal() { - return onNotifyKeyboardKeycode(o, i, u, m); - }), - sdbus::registerMethod("NotifyKeyboardKeysym") -- .implementedAs([this](sdbus::ObjectPath o, int i, unsigned int u, std::unordered_map m) { -+ .implementedAs([this](sdbus::ObjectPath o, std::unordered_map m, int i, unsigned int u) { - return onNotifyKeyboardKeysym(o, i, u, m); - }), - sdbus::registerMethod("NotifyTouchDown") -@@ -112,7 +112,7 @@ dbUasv CRemoteDesktopPortal::onCreateSession(sdbus::ObjectPath requestHandle, sd - PSESSION->eis->setVirtualKeyboard(PSESSION->keyboard); - - m_mSessions.emplace(sessionHandle, PSESSION); -- -+ - return {0, {}}; - } - -@@ -137,8 +137,9 @@ dbUasv CRemoteDesktopPortal::onStart(sdbus::ObjectPath requestHandle, sdbus::Obj - } - - dbUasv CRemoteDesktopPortal::onNotifyPointerMotion(sdbus::ObjectPath sessionHandle, double dx, double dy, std::unordered_map opts) { -+ Debug::log(LOG, "[remotedesktop] notify pointer motion: {} {}", dx, dy); - const auto PSESSION = m_mSessions[sessionHandle]; -- PSESSION->pointer->sendMotion(0, dx, dy); -+ PSESSION->pointer->sendMotion(0, dx*20, dy*20); - return {0, {}}; - } - -@@ -149,6 +150,7 @@ dbUasv CRemoteDesktopPortal::onNotifyPointerMotionAbsolute(sdbus::ObjectPath ses - } - - dbUasv CRemoteDesktopPortal::onNotifyPointerButton(sdbus::ObjectPath sessionHandle, int button, unsigned int state, std::unordered_map opts) { -+ Debug::log(LOG, "[remotedesktop] notify button {} {}", button, state); - const auto PSESSION = m_mSessions[sessionHandle]; - PSESSION->pointer->sendButton(0, button, state); - return {0, {}}; -''; in { # This one brings our custom packages from the 'pkgs' directory @@ -135,6 +68,9 @@ in hash = "sha256-NnKhIgDAOKOdEqgHzgLq1MSHG3FDT2AVXJZ53Ozzioc="; }; }; + monado = prev.monado.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_WITH_OPENCV=OFF" (prev.lib.cmakeBool "XRT_HAVE_OPENCV" false) ]; + }); luajitPackages = prev.luajitPackages // { neotest = prev.luajitPackages.neotest.overrideAttrs { @@ -152,39 +88,39 @@ in # to add input capture protocol support (needed for kde connect) - #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - # src = prev.fetchFromGitHub { - # owner = "3l0w"; - # repo = "Hyprland"; - # rev = "2464bfc318f83c093784561c6a0afca6871e119e"; - # hash = "sha256-6MIA9wu9YW/eKsI0UEuP7CgDiribEv9apzr66dHzRME="; - # fetchSubmodules = true; - # }; - #}); - #hyprland-protocols = prev.hyprland-protocols.overrideAttrs (oldAttrs: { - # src = prev.fetchFromGitHub { - # owner = "3l0w"; - # repo = "hyprland-protocols"; - # rev = "d6bfa25be7b250dc417cbad89f13291efb0375d5"; - # hash = "sha256-ULzGRSj18xOrTXnvWrkaaHUaMHaJWyXlmLDDw2jruLo="; - # }; - #}); - #xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (oldAttrs: { - # src = prev.fetchFromGitHub { - # #owner = "3l0w"; - # #repo = "xdg-desktop-portal-hyprland"; - # #rev = "436619a06641d7090e36416546d26b9aee2f0679"; - # #hash = "sha256-OMv/8J2n2skwfVYFe1rY8pheL4T6rbWOTYYx/2u7ouk="; + #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { + # src = prev.fetchFromGitHub { + # owner = "3l0w"; + # repo = "Hyprland"; + # rev = "2464bfc318f83c093784561c6a0afca6871e119e"; + # hash = "sha256-6MIA9wu9YW/eKsI0UEuP7CgDiribEv9apzr66dHzRME="; + # fetchSubmodules = true; + # }; + #}); + #hyprland-protocols = prev.hyprland-protocols.overrideAttrs (oldAttrs: { + # src = prev.fetchFromGitHub { + # owner = "3l0w"; + # repo = "hyprland-protocols"; + # rev = "d6bfa25be7b250dc417cbad89f13291efb0375d5"; + # hash = "sha256-ULzGRSj18xOrTXnvWrkaaHUaMHaJWyXlmLDDw2jruLo="; + # }; + #}); + #xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (oldAttrs: { + # src = prev.fetchFromGitHub { + # #owner = "3l0w"; + # #repo = "xdg-desktop-portal-hyprland"; + # #rev = "436619a06641d7090e36416546d26b9aee2f0679"; + # #hash = "sha256-OMv/8J2n2skwfVYFe1rY8pheL4T6rbWOTYYx/2u7ouk="; - # owner = "toneengo"; - # repo = "xdg-desktop-portal-hyprland"; - # rev = "f74a2278f78a5ec9167c945a40486d8999fefb9d"; - # hash = "sha256-dH+NhC2Zz8v6MoTMaEK8qEZhHBpdCSI4818styWUFew="; - # }; + # owner = "toneengo"; + # repo = "xdg-desktop-portal-hyprland"; + # rev = "f74a2278f78a5ec9167c945a40486d8999fefb9d"; + # hash = "sha256-dH+NhC2Zz8v6MoTMaEK8qEZhHBpdCSI4818styWUFew="; + # }; - # patches = [ (prev.writeText "testing-patch" testing-patch) ]; - # buildInputs = oldAttrs.buildInputs ++ [ prev.libei ]; - #}); + # patches = [ (prev.writeText "testing-patch" testing-patch) ]; + # buildInputs = oldAttrs.buildInputs ++ [ prev.libei ]; + #}); #csharp-ls = prev.csharp-ls-8; }; diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix index 4844a80..334a028 100644 --- a/systems/amd-server/configuration.nix +++ b/systems/amd-server/configuration.nix @@ -55,6 +55,7 @@ mainUser.layout = "de"; mainUser.variant = "us"; + nix.gc.automatic = lib.mkForce false; networking = { useDHCP = false; defaultGateway.address = "192.168.0.1"; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 9b439b5..092208a 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -99,8 +99,10 @@ }; }; }; + + nix.gc.automatic = lib.mkForce false; services.searx = { - enable = true; + enable = false; settings = { use_default_settings=true; server.port = 8787;