From a4b683444e596fc2086b0363740e484d8eec0f33 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 20 Jul 2026 21:54:41 +0200 Subject: ... --- _sources/generated.json | 30 ++--- _sources/generated.nix | 30 ++--- accounts/gkleen@sif/systemd.nix | 63 ---------- flake.lock | 267 +++++++++++++++++++++++----------------- flake.nix | 10 +- hosts/sif/default.nix | 4 +- lib/pythonSet.nix | 7 ++ nvfetcher.toml | 4 - overlays/etesync-dav.nix | 6 +- overlays/nix-output-monitor.nix | 9 +- system-profiles/nfsroot.nix | 2 +- user-profiles/utils.nix | 2 +- 12 files changed, 208 insertions(+), 226 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index d8abdb3b..df25df57 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "bpf-examples": { "cargoLock": null, - "date": "2026-06-09", + "date": "2026-07-13", "extract": null, "name": "bpf-examples", "passthru": null, @@ -34,12 +34,12 @@ "name": null, "owner": "xdp-project", "repo": "bpf-examples", - "rev": "43e565901c4287efa863edca7f0e6cd6e35ed896", - "sha256": "sha256-d4JZy/QXGc0r3IaxgnmfIx45Sh5iH1VxbB/Pkz8XvoI=", + "rev": "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3", + "sha256": "sha256-GMU07jroyT4dckTqfip1WgBjfSXNO7vmueb0VmcVE30=", "sparseCheckout": [], "type": "github" }, - "version": "43e565901c4287efa863edca7f0e6cd6e35ed896" + "version": "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3" }, "emacs-scratch_el": { "cargoLock": null, @@ -293,7 +293,7 @@ }, "nix-output-monitor": { "cargoLock": null, - "date": "2026-05-29", + "date": "2026-07-14", "extract": null, "name": "nix-output-monitor", "passthru": null, @@ -303,13 +303,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "df744a9d1777f05ea3cb6a173a280c595b8f69b0", - "sha256": "sha256-74ZOOlyPjLKohnxn4ghsyk5o1Ts3RTlJ4L7klCCdp/U=", + "rev": "030658cd63512887c74652261079ca8bbb636c23", + "sha256": "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs=", "sparseCheckout": [], "type": "git", "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" }, - "version": "df744a9d1777f05ea3cb6a173a280c595b8f69b0" + "version": "030658cd63512887c74652261079ca8bbb636c23" }, "postfix-mta-sts-resolver": { "cargoLock": null, @@ -375,7 +375,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2026-06-18", + "date": "2026-07-10", "extract": null, "name": "quickshell", "passthru": null, @@ -385,13 +385,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "68c2c85c33845385f7ab8147b32f1450b1e468e0", - "sha256": "sha256-Mo2YtNEGlcySnbq0YuP3nUKMAQCMAfE+TcCffo5vzD8=", + "rev": "4df562dfb2475a9057f0f33a8db75808efad8670", + "sha256": "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "68c2c85c33845385f7ab8147b32f1450b1e468e0" + "version": "4df562dfb2475a9057f0f33a8db75808efad8670" }, "scutiger": { "cargoLock": null, @@ -511,12 +511,12 @@ "name": null, "owner": "yt-dlp", "repo": "yt-dlp", - "rev": "2026.06.09", - "sha256": "sha256-ykqTDPzKKIWRGSQmw2esCRKyYqDZKXRYDeba888tkDU=", + "rev": "2026.07.04", + "sha256": "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc=", "sparseCheckout": [], "type": "github" }, - "version": "2026.06.09" + "version": "2026.07.04" }, "yt-dlp-ejs": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 7a5e95ab..bc46d643 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -23,15 +23,15 @@ }; bpf-examples = { pname = "bpf-examples"; - version = "43e565901c4287efa863edca7f0e6cd6e35ed896"; + version = "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3"; src = fetchFromGitHub { owner = "xdp-project"; repo = "bpf-examples"; - rev = "43e565901c4287efa863edca7f0e6cd6e35ed896"; + rev = "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3"; fetchSubmodules = true; - sha256 = "sha256-d4JZy/QXGc0r3IaxgnmfIx45Sh5iH1VxbB/Pkz8XvoI="; + sha256 = "sha256-GMU07jroyT4dckTqfip1WgBjfSXNO7vmueb0VmcVE30="; }; - date = "2026-06-09"; + date = "2026-07-13"; }; emacs-scratch_el = { pname = "emacs-scratch_el"; @@ -185,17 +185,17 @@ }; nix-output-monitor = { pname = "nix-output-monitor"; - version = "df744a9d1777f05ea3cb6a173a280c595b8f69b0"; + version = "030658cd63512887c74652261079ca8bbb636c23"; src = fetchgit { url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; - rev = "df744a9d1777f05ea3cb6a173a280c595b8f69b0"; + rev = "030658cd63512887c74652261079ca8bbb636c23"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-74ZOOlyPjLKohnxn4ghsyk5o1Ts3RTlJ4L7klCCdp/U="; + sha256 = "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs="; }; - date = "2026-05-29"; + date = "2026-07-14"; }; postfix-mta-sts-resolver = { pname = "postfix-mta-sts-resolver"; @@ -237,17 +237,17 @@ }; quickshell = { pname = "quickshell"; - version = "68c2c85c33845385f7ab8147b32f1450b1e468e0"; + version = "4df562dfb2475a9057f0f33a8db75808efad8670"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "68c2c85c33845385f7ab8147b32f1450b1e468e0"; + rev = "4df562dfb2475a9057f0f33a8db75808efad8670"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-Mo2YtNEGlcySnbq0YuP3nUKMAQCMAfE+TcCffo5vzD8="; + sha256 = "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs="; }; - date = "2026-06-18"; + date = "2026-07-10"; }; scutiger = { pname = "scutiger"; @@ -313,13 +313,13 @@ }; yt-dlp = { pname = "yt-dlp"; - version = "2026.06.09"; + version = "2026.07.04"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; - rev = "2026.06.09"; + rev = "2026.07.04"; fetchSubmodules = false; - sha256 = "sha256-ykqTDPzKKIWRGSQmw2esCRKyYqDZKXRYDeba888tkDU="; + sha256 = "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc="; }; }; yt-dlp-ejs = { diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix index c21514ea..7aee29c5 100644 --- a/accounts/gkleen@sif/systemd.nix +++ b/accounts/gkleen@sif/systemd.nix @@ -239,69 +239,6 @@ in { WatchdogSec = "2s"; }; }; - gtklock = { - Unit = { - Requisite = ["graphical-session.target"]; - After = [ "graphical-session.target" ]; - PartOf = ["graphical-session.target"]; - }; - Service = { - Type = "notify"; - RuntimeDirectory = "gtklock"; - CacheDirectory = "gtklock"; - ExecStartPre = [ - "-${lib.getExe' pkgs.libsForQt5.qt5.qttools.bin "qdbus"} org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases" - "-${lib.getExe' config.systemd.package "systemctl"} --user stop gpg-agent.service" - "-${lib.getExe pkgs.playerctl} -a pause" - "-${lib.getExe (pkgs.writeShellApplication { - name = "generate-css"; - runtimeInputs = with pkgs; [cfg.services.wpaperd.package jq coreutils imagemagick findutils]; - text = '' - declare -A monitors - monitors=() - while IFS= read -r entry; do - path=$(jq -r ".path" <<<"$entry") - [[ -z "$path" || ! -f "$path" ]] && continue - blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}" - monitor=$(jq -r ".display" <<<"$entry") - if [[ ! -f "$blurred_path" ]]; then - mkdir -p "$(dirname "$blurred_path")" - magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" & - fi - monitors+=([$monitor]="$blurred_path") - done < <(wpaperctl all-wallpapers -j | jq -c ".[]") - # wait - - cp --no-preserve=mode ${pkgs.writeText "gtklock.css" '' - #window-box { - padding: 64px; - /* border: 1px solid black; */ - border-radius: 4px; - box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px; - /* background-color: white; */ - background-color: rgba(0, 0, 0, 0.5); - } - ''} "$RUNTIME_DIRECTORY"/style.css - for monitor in "''${!monitors[@]}"; do - cat >>"$RUNTIME_DIRECTORY"/style.css <