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

10
machines/pericyte/servers/public/mirotalk.nix
View File

@@ -1,14 +1,16 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
nixpkgs.overlays = [(final: prev: { nixpkgs.overlays = [(final: prev: {
mirotalk = prev.buildNpmPackage { mirotalk = prev.buildNpmPackage {
pname = "afterwriter"; pname = "mirotalk";
version = "1.17.3-2025-09-24"; version = "2025-11-01";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "miroslavpejic85"; owner = "miroslavpejic85";
repo = "mirotalk"; repo = "mirotalk";
rev = ""; rev = "168f4ce2675f6691dfceec352b72e7a53372c9a7";
hash = ""; hash = "sha256-4HC25RM8GenHgNCYoJDWmtaUxnoSorr692RLa7PpW5s=";
}; };
npmDepsHash = "sha256-B0eHRkBThLgZ4SNA38uW1T4auCsUvS1ULOIR1iEoPqk=";
dontNpmBuild = true;
}; };
})]; })];

1
machines/universedesktop/configuration.nix
View File

@@ -65,6 +65,7 @@
networking.wireless.enable = true; networking.wireless.enable = true;
networking.wireless.networks = { networking.wireless.networks = {
"BELL422 5G".pskRaw = "ext:PSK_HOME";
"BELL422".pskRaw = "ext:PSK_HOME"; "BELL422".pskRaw = "ext:PSK_HOME";
}; };

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

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

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 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 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 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 bordercolor[] = COLOR(0x233e5dff);
static const float focuscolor[] = COLOR(0x005577ff); static const float focuscolor[] = COLOR(0x005577ff);
static const float urgentcolor[] = COLOR(0xff0000ff); 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 diff --git a/frontend/widgets/OBSProjector.cpp b/frontend/widgets/OBSProjector.cpp
index e61f23182..a405e9f17 100644 index cc214ea..79b0120 100644
--- a/UI/window-projector.cpp --- a/frontend/widgets/OBSProjector.cpp
+++ b/UI/window-projector.cpp +++ b/frontend/widgets/OBSProjector.cpp
@@ -37,11 +37,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor, @@ -36,11 +36,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
// can skip it // can skip it
windowHandle()->setProperty("isOBSProjectorWindow", true); windowHandle()->setProperty("isOBSProjectorWindow", true);
@@ -12,5 +12,5 @@ index e61f23182..a405e9f17 100644
-#endif -#endif
- -
type = type_; type = type_;
#ifdef __APPLE__ #ifndef __APPLE__
setWindowIcon( setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));

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

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

13
machines/universedesktop/programs/art.nix
View File

@@ -69,16 +69,6 @@
# morphio # morphio
# # TODO add BluePy support? # # TODO add BluePy support?
# ]); # ]);
# Update RX and Aseprite
rx = prev.rx.overrideAttrs (old: {
version = "git";
src = prev.fetchFromGitHub {
owner = "cloudhead";
repo = old.pname;
rev = "18625a68921873ebe21a7ea8096409a9f0314541";
sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
};
});
})]; })];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@@ -86,8 +76,7 @@
# GTK theme support (basic) for GTK apps e.g. inkscape # GTK theme support (basic) for GTK apps e.g. inkscape
adwaita-icon-theme adwaita-icon-theme
rx aseprite
aseprite-unfree
pixelorama pixelorama
gimp gimp

4
machines/universedesktop/programs/desktop.nix
View File

@@ -18,11 +18,11 @@
firefox firefox
chromium chromium
bitwarden bitwarden-desktop
bitwarden-cli bitwarden-cli
nextcloud-client nextcloud-client
libsForQt5.kdeconnect-kde kdePackages.kdeconnect-kde
discord discord
zoom-us zoom-us

4
machines/universedesktop/programs/games.nix
View File

@@ -16,7 +16,7 @@
patches = []; patches = [];
mitmCache = gradle.fetchDeps { mitmCache = final.gradle_8.fetchDeps {
inherit (old) pname; inherit (old) pname;
data = ./shattered-pixel-dungeon/deps.json; data = ./shattered-pixel-dungeon/deps.json;
}; };
@@ -33,6 +33,8 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# For Steam # For Steam
protontricks protontricks
gamescope
gamescope-wsi
# Minecraft # Minecraft
openjdk17 openjdk17