From 92cda1db7a5b699d88742c9cfab968fefe7c5304 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 24 May 2026 17:24:30 +0200 Subject: [PATCH] update --- flake.lock | 134 ++++++++++++++------------------- servers/fern/configuration.nix | 3 +- servers/ui-mode/home.nix | 12 ++- 3 files changed, 70 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 519187c..f337eac 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,6 @@ "inputs": { "corefonts": "corefonts", "crane": "crane", - "elemental-wine-source": "elemental-wine-source", "fenix": "fenix", "flake-compat": "flake-compat", "flake-parts": "flake-parts", @@ -16,11 +15,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1779358118, - "narHash": "sha256-9gG3EecvlD5JmR/TPTamaLTuv4RDBhQX4w2SP7jhUiY=", + "lastModified": 1779522232, + "narHash": "sha256-43PUS3kPWEWVArFV9h1m4mrWIdHeeVXv7kdteYhobOs=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "87a5f3049b675790794101e2ec36dbc28124de1f", + "rev": "328f8f66e375c64255dc3cb3453271aab4d4c273", "type": "github" }, "original": { @@ -74,11 +73,11 @@ ] }, "locked": { - "lastModified": 1779432002, - "narHash": "sha256-PxOA3ZFgKPmMtnZ5RvZ48ZMAPgGMhZ6HAITpoN1KoQw=", + "lastModified": 1779515965, + "narHash": "sha256-f5NJWIJ9gTtuVT5ZLiu+HjeqSYjv2+YZuQtv2nnVKIs=", "owner": "0xferrous", "repo": "CodexBar-flake", - "rev": "1f0a3b6f2b6fc025e08d4bd66573ea746063bfae", + "rev": "1aa345500ec39be29b0ced6c063fe05cd8c0769c", "type": "github" }, "original": { @@ -115,11 +114,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1779406317, - "narHash": "sha256-PkUEqtdOqt9dy0miFfbWvG3pNrZEh7wZ3X81lnRE3s0=", + "lastModified": 1779485759, + "narHash": "sha256-lgL1feacjPiLDwupOsk+qZud7IpCCOviz7wcmCbYck8=", "owner": "9001", "repo": "copyparty", - "rev": "b2401ff15a21a8ba389599f1d582ce41d36f9ceb", + "rev": "ca406472f4b45f68842bc31716deb52b66698637", "type": "github" }, "original": { @@ -203,12 +202,12 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1778179392, - "narHash": "sha256-W6zorvjBYbzMNvqKIqCdpDF4rq3gj50Xximl56YM9/I=", - "rev": "efd54faa68be8cd777b5c28cab11e638998a0853", - "revCount": 416, + "lastModified": 1779475417, + "narHash": "sha256-7/U/+X66C7XmLnt5JVJVtpx8wVDRU//Awaeqkq9+NNc=", + "rev": "8a9c57ea6b458a40589df60f26200b7d305354d1", + "revCount": 417, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.20.0/019e03c3-7dc0-7873-a333-9ab02d6f690c/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.0/019e5103-0940-7a50-bac6-f1c621bf31ff/source.tar.gz" }, "original": { "type": "tarball", @@ -218,37 +217,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-z4mCqKI3Qd6weuHrlfzGccJG0giym/VJhKv20ijRSs0=", + "narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-yW+VNepSRytzfanSssPMJPvwioCcmlZYaBX8++UFkAk=", + "narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-+L102C3Hhkd1GlXmRm2eLTLsZKBxEvooiQZFqQRlBf0=", + "narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" } }, "dms": { @@ -291,25 +290,6 @@ "type": "github" } }, - "elemental-wine-source": { - "flake": false, - "locked": { - "host": "gitlab.winehq.org", - "lastModified": 1722747031, - "narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=", - "owner": "ElementalWarrior", - "repo": "wine", - "rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2", - "type": "gitlab" - }, - "original": { - "host": "gitlab.winehq.org", - "owner": "ElementalWarrior", - "ref": "affinity-photo3-wine9.13-part3", - "repo": "wine", - "type": "gitlab" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -674,11 +654,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1779336803, - "narHash": "sha256-4zTqjkq4jMrMlu03i/n9w8drbGft4yeFNB8bcnTaI+o=", + "lastModified": 1779508010, + "narHash": "sha256-7Wcp38Saw8cnyfc1OyjsxiF0btKBaL5KcHV+q9ljsns=", "owner": "schembriaiden", "repo": "helium-browser-nix-flake", - "rev": "d07b924b2e8389821373ff303057b1af75158881", + "rev": "4e6b8bdd6692db7f2357e4dd86444914e53ec095", "type": "github" }, "original": { @@ -694,11 +674,11 @@ ] }, "locked": { - "lastModified": 1779336838, - "narHash": "sha256-n1+l78hJRABp4cQHKeD0BVByT0vZLPqd09Tvoq8Q+d8=", + "lastModified": 1779507042, + "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "928d72376949e222ea4f07b44828a55b0136422e", + "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34", "type": "github" }, "original": { @@ -1135,11 +1115,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1779378331, - "narHash": "sha256-A8MBNRY+FDLVJ64HWjrcdbtahlAey3fvca/hu9q07yA=", + "lastModified": 1779477998, + "narHash": "sha256-acWBiLVnoEmabvXQEfzuL9h0h+jhdzNcoCsJfpj1/88=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f539bec9083f42a406db82e3d974162281e69d12", + "rev": "1209504f60d88fa5bea843471c19aedb87f7e1e2", "type": "github" }, "original": { @@ -1190,12 +1170,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1778177425, - "narHash": "sha256-oyHvP5HDRe59opmjTrq2ED9lh+R9FrHyaCGPPNfBqWM=", - "rev": "f0ccb960d3ad5bff28acd9cabf8bdef885b5d52f", - "revCount": 25858, + "lastModified": 1779472733, + "narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=", + "rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa", + "revCount": 25967, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.20.0/019e03bc-3f83-7833-aba3-b691ef4956c7/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.0/019e50fb-8633-73d0-b673-b2e265950490/source.tar.gz" }, "original": { "type": "tarball", @@ -1209,11 +1189,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1779447251, - "narHash": "sha256-blxMFn/yCAeyKhG3qU7CvuI4nWwqIkyA/2FRQRmQV5s=", + "lastModified": 1779507984, + "narHash": "sha256-Fyege4MHeyrof0dlnScWjsxQl9JBeck4svJjggTXOjU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "814364f40627d996d7ec0379cdcb90fdd09e6c4b", + "rev": "3b36ed6ed66168c752ad0eba1274937b8a7e3c40", "type": "github" }, "original": { @@ -1389,11 +1369,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1779357205, + "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "type": "github" }, "original": { @@ -1453,11 +1433,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1779357205, + "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "type": "github" }, "original": { @@ -1578,12 +1558,12 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1777826146, - "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=", - "rev": "73c703c22422b8951895a960959dbbaca7296492", - "revCount": 991389, + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "revCount": 998534, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.991389%2Brev-73c703c22422b8951895a960959dbbaca7296492/019df6c8-934b-7d40-b402-027bb5def30f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.998534%2Brev-d233902339c02a9c334e7e593de68855ad26c4cb/019e3efc-e09a-7ff1-b05f-0c8f85ba7441/source.tar.gz" }, "original": { "type": "tarball", @@ -1644,11 +1624,11 @@ ] }, "locked": { - "lastModified": 1779448991, - "narHash": "sha256-RxAGn1/Sx3KRvAbLn3PyUVJ4lK/LCpXQxQP9fOYbiYI=", + "lastModified": 1779509871, + "narHash": "sha256-77i/f8Ho99ykAWmdyqAE8RL910hdpCyyl7oflg0C2iI=", "owner": "getpaseo", "repo": "paseo", - "rev": "789a559b31e57ee4413893599ff235ae1c822c4d", + "rev": "0962529d4865415ac91046d338b374be521fe5a2", "type": "github" }, "original": { @@ -1753,11 +1733,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1779459919, - "narHash": "sha256-D6fsjD+4jATb4NAHi012wG7fwy91K6S9i4QYZsmxa8E=", + "lastModified": 1779512012, + "narHash": "sha256-gaGOxs4ld8NcKwM2KfXYiZcQW5XZRjvHv8U1dchDT6o=", "owner": "temidaradev", "repo": "rusic", - "rev": "dc3cc443e6614f87b5c6302181dc69a9bc91aa3a", + "rev": "687bc68ccba8c55ea3a0ed88cf01540985fd9039", "type": "github" }, "original": { diff --git a/servers/fern/configuration.nix b/servers/fern/configuration.nix index bb01ff1..afbb6d3 100644 --- a/servers/fern/configuration.nix +++ b/servers/fern/configuration.nix @@ -30,6 +30,7 @@ let find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; + npmRoot = "tools/server/webui"; npmDepsHash = "sha256-k62LIbyY2DXvs7XXbX0lNPiYxuYzeJUyQtS4eA+68f8="; cmakeFlags = with pkgs.lib; [ # -march=native is non-deterministic; override with platform-specific flags if needed @@ -50,7 +51,7 @@ let # (cmakeBool "GGML_METAL" false) # (cmakeBool "GGML_RPC" false) # (cmakeBool "GGML_VULKAN" false) - (cmakeFeature "LLAMA_BUILD_NUMBER" "8667") + (cmakeFeature "LLAMA_BUILD_NUMBER" version) (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" "120") ]; }) diff --git a/servers/ui-mode/home.nix b/servers/ui-mode/home.nix index 7feaa0e..9976ac6 100644 --- a/servers/ui-mode/home.nix +++ b/servers/ui-mode/home.nix @@ -26,6 +26,16 @@ let allowUnfree = true; }; }; + activitywatchPackages = pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch" { }; + activitywatchFixed = pkgs.activitywatch.override { + aw-server-rust = pkgs.aw-server-rust.overrideAttrs (oldAttrs: { + env = (oldAttrs.env or { }) // { + AW_WEBUI_DIR = activitywatchPackages.aw-webui.overrideAttrs { + doCheck = false; + }; + }; + }); + }; codexbarWrapped = pkgs.writeShellApplication { name = "codexbar"; runtimeInputs = [ pkgs.bubblewrap ]; @@ -204,7 +214,7 @@ in #dunst sccache swaybg - activitywatch + activitywatchFixed networkmanagerapplet kubectl duf