Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catchup

Browse Source
This commit is contained in:
David Crompton
2026-01-31 00:08:41 -05:00
parent 987df4ff14
commit c89318349d
9 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
machines/universedesktop/desktop/dwl.nix
View File

@@ -7,6 +7,9 @@ in {
imports = [
./wayland.nix
];
services.displayManager.ly = {
enable = true;
};
services.displayManager.sessionPackages = [ pkgs.dwl ];
#services.gnome.gnome-keyring.enable = lib.mkDefault true;
@@ -14,20 +17,21 @@ in {
nixpkgs.overlays = [
(final: prev: {
wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
src = final.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "d305934ebe6852785a1f425ee96861f0b7280d76"; # 0.19-prev # 25-01-25
hash = "sha256-NnPSC5p/phTFe+nWp9vl8LUbmBO/RXSSUuDZ2boucXY=";
};
});
# wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
# version = "0.20.0-dev";
# src = final.fetchFromGitLab {
# domain = "gitlab.freedesktop.org";
# owner = "wlroots";
# repo = "wlroots";
# rev = "106f0f950639924d706df21f48545b09db8197ed"; # 0.20.0-dev # 2025-11-14
# hash = "sha256-Xybhb4hdvrfLCa0HopnKa6HP4b5gaepK5Y54YUg/TKM=";
# };
# });
dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
dwl-patches = pkgs.fetchgit {
url = "https://codeberg.org/dwl/dwl-patches.git";
rev = "4a869141fa643d9be792a9aa44a42cf7f7f882ad";
hash = "sha256-xlaK9xMrc+KDNecsyByRIxXmPEZ2dmP4FQ0bMojsyws=";
rev = "46021333a10ecb9179c8477588fafd75c7cc7a05";
hash = "sha256-Q39EYfGNTSsfViTxW9ZFLqaw/udqkBc1hb7hEfjmsgY=";
};
patches = let
dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
@@ -38,14 +42,14 @@ in {
(dwl-patch "autostart")
];
in {
version = "21-09-2024";
version = "28-09-2025";
src = final.fetchFromGitea {
domain = "codeberg.org";
owner = "dwl";
repo = "dwl";
rev = "d1c2f434983562bd7d2ace15ab0c05155be603bc";
hash = "sha256-SpfjQfzvbpDiihziyKGPoBwvp3evgCQQhhjldAE/MwY=";
rev = "6cd26568d5b8be2252ac0def36cd194b4fb2d7c3";
hash = "sha256-ihxF9Z4uT0K3omO4mbzkeICY/RyqvuD+C5JSGWIf6MI=";
};
patches = (old.patches or []) ++ patches;
@@ -97,7 +101,7 @@ in {
wlr.enable = true;
};
security = {
polkit.enable = true;
pam.services.swaylock = { };

2
machines/universedesktop/desktop/dwl/config.def.h
View File

@@ -7,7 +7,7 @@
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const unsigned int borderpx = 3; /* border pixel of windows */
static const float rootcolor[] = COLOR(0x222222ff);
static const float rootcolor[] = COLOR(0x000000ff);
static const float bordercolor[] = COLOR(0x233e5dff);
static const float focuscolor[] = COLOR(0x005577ff);
static const float urgentcolor[] = COLOR(0xff0000ff);

14
machines/universedesktop/desktop/obs-wayland-window-projection.patch
View File

@@ -1,8 +1,8 @@
diff --git a/UI/window-projector.cpp b/UI/window-projector.cpp
index e61f23182..a405e9f17 100644
--- a/UI/window-projector.cpp
+++ b/UI/window-projector.cpp
@@ -37,11 +37,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
diff --git a/frontend/widgets/OBSProjector.cpp b/frontend/widgets/OBSProjector.cpp
index cc214ea..79b0120 100644
--- a/frontend/widgets/OBSProjector.cpp
+++ b/frontend/widgets/OBSProjector.cpp
@@ -36,11 +36,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
// can skip it
windowHandle()->setProperty("isOBSProjectorWindow", true);
@@ -12,5 +12,5 @@ index e61f23182..a405e9f17 100644
-#endif
-
type = type_;
#ifdef __APPLE__
setWindowIcon(
#ifndef __APPLE__
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));

10
machines/universedesktop/desktop/wayland.nix
View File

@@ -11,11 +11,11 @@
in {
glfw3-minecraft = prev.glfw3-minecraft.overrideAttrs (old: {
patches = [ (builtins.head old.patches) ] ++ [
(patch' "0001-Key-Modifiers-Fix")
(patch' "0002-Fix-duplicate-pointer-scroll-events")
(patch' "0003-Implement-glfwSetCursorPosWayland")
(patch' "0004-Fix-Window-size-on-unset-fullscreen")
(patch' "0005-Avoid-error-on-startup")
# (patch' "0001-Key-Modifiers-Fix")
# (patch' "0002-Fix-duplicate-pointer-scroll-events")
# (patch' "0003-Implement-glfwSetCursorPosWayland")
# (patch' "0004-Fix-Window-size-on-unset-fullscreen")
# (patch' "0005-Avoid-error-on-startup")
./0006-DontCrashWindowPos.patch
];
});