From f8a9228baa4f68c7639ef703e15f97bf146c53ee Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 13 Nov 2025 22:45:18 +0100 Subject: ... --- _sources/generated.json | 168 ++++++++++++-------------- _sources/generated.nix | 105 ++++++++-------- accounts/gkleen@sif/niri/default.nix | 4 +- flake.lock | 165 ++++++++++++------------- flake.nix | 2 +- hosts/sif/default.nix | 10 +- hosts/surtr/email/default.nix | 35 +----- installer/default.nix | 6 +- nvfetcher.toml | 12 +- overlays/nix-output-monitor.nix | 6 + overlays/postfix-mta-sts-resolver/default.nix | 2 +- overlays/quickshell/default.nix | 3 +- overlays/quickshell/greetd-response.patch | 16 --- overlays/yt-dlp.nix | 1 + system-profiles/zfs.nix | 4 +- user-profiles/zsh/default.nix | 2 +- users/gkleen/default.nix | 135 ++++++++++++--------- users/root.nix | 110 ++++++++++++----- 18 files changed, 385 insertions(+), 401 deletions(-) create mode 100644 overlays/nix-output-monitor.nix delete mode 100644 overlays/quickshell/greetd-response.patch diff --git a/_sources/generated.json b/_sources/generated.json index dd73e455..9eb52238 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,6 +1,6 @@ { "afew": { - "cargoLocks": null, + "cargoLock": null, "date": "2021-05-30", "extract": null, "name": "afew", @@ -14,15 +14,15 @@ "owner": "gkleen", "repo": "afew", "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109", - "sha256": "sha256-Wdvack+oAq88a9E6i+OcMlSNStv4dWsZstHgLao0c9g=", + "sha256": "sha256-DtOhimn5R+PRHO+3rHcY71e0xYPBnDqJGSNfQdNFpTQ=", "sparseCheckout": [], "type": "github" }, "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109" }, "bpf-examples": { - "cargoLocks": null, - "date": "2025-09-19", + "cargoLock": null, + "date": "2025-11-04", "extract": null, "name": "bpf-examples", "passthru": null, @@ -34,15 +34,15 @@ "name": null, "owner": "xdp-project", "repo": "bpf-examples", - "rev": "d621b4fb25c4877415a563887606ab0fe47ad59a", - "sha256": "sha256-IQBTYtqHsghbb/Mpx29Hjr9AsLVG6w3BqfJYSKoMotU=", + "rev": "9a67546cbe94efe39ecb32579c33b8acabd695d7", + "sha256": "sha256-Ztx4vZxVudlJOrCgCTkPiyY1XYTautRjwDhgYbziKus=", "sparseCheckout": [], "type": "github" }, - "version": "d621b4fb25c4877415a563887606ab0fe47ad59a" + "version": "9a67546cbe94efe39ecb32579c33b8acabd695d7" }, "emacs-scratch_el": { - "cargoLocks": null, + "cargoLock": null, "date": "2015-09-10", "extract": null, "name": "emacs-scratch_el", @@ -63,7 +63,7 @@ "version": "0077334cc299aa7885f804d88f52cdb1b35caf71" }, "emoji-data": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "emoji-data", @@ -84,7 +84,7 @@ "version": "v2.7" }, "lesspipe": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "lesspipe", @@ -97,28 +97,8 @@ }, "version": "2.20" }, - "mako": { - "cargoLocks": null, - "date": "2025-09-11", - "extract": null, - "name": "mako", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "8318972590420c042c0177af16e26a1768550fab", - "sha256": "sha256-Y/exF/Pv60E31Zl+M1zboWkmkZgOUCA3l93OKbtvZ+g=", - "sparseCheckout": [], - "type": "git", - "url": "https://github.com/emersion/mako" - }, - "version": "8318972590420c042c0177af16e26a1768550fab" - }, "mpv-autosave": { - "cargoLocks": null, + "cargoLock": null, "date": "2020-10-22", "extract": null, "name": "mpv-autosave", @@ -138,7 +118,7 @@ "version": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704" }, "mpv-chapterskip": { - "cargoLocks": null, + "cargoLock": null, "date": "2022-09-08", "extract": null, "name": "mpv-chapterskip", @@ -159,7 +139,7 @@ "version": "b26825316e3329882206ae78dc903ebc4613f039" }, "mpv-createchapter": { - "cargoLocks": null, + "cargoLock": null, "date": "2020-09-05", "extract": null, "name": "mpv-createchapter", @@ -180,7 +160,7 @@ "version": "8dd33e2debbcb963a195ec1371e02c85b49e7faa" }, "mpv-mpris": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "mpv-mpris", @@ -201,7 +181,7 @@ "version": "1.1" }, "mpv-reload": { - "cargoLocks": null, + "cargoLock": null, "date": "2025-02-07", "extract": null, "name": "mpv-reload", @@ -222,7 +202,7 @@ "version": "60e6fb1c578aa9af80d725857dac8e439095b033" }, "mpv-subselect": { - "cargoLocks": null, + "cargoLock": null, "date": "2025-04-04", "extract": null, "name": "mpv-subselect", @@ -242,7 +222,7 @@ "version": "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb" }, "mpv-youtube-quality": { - "cargoLocks": null, + "cargoLock": null, "date": "2020-02-10", "extract": null, "name": "mpv-youtube-quality", @@ -262,7 +242,7 @@ "version": "1f8c31457459ffc28cd1c3f3c2235a53efad7148" }, "netbootxyz-efi": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "netbootxyz-efi", @@ -270,14 +250,14 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E=", + "sha256": "sha256-rmMU/OTOh7zId+zwQCXHt2SJyBAtLNfCOZhDyrkBKjw=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.efi" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.efi" }, - "version": "2.0.88" + "version": "2.0.89" }, "netbootxyz-lkrn": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "netbootxyz-lkrn", @@ -285,28 +265,48 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-igy3O30noS25dU7ZnHuKrWqLLkjjd/L46IdCTd038dI=", + "sha256": "sha256-y0yibC3UeJUHslFBeMPVm2yEwxQqvL7/+BYMD5xDMm4=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.lkrn" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.lkrn" + }, + "version": "2.0.89" + }, + "nix-output-monitor": { + "cargoLock": null, + "date": "2025-11-09", + "extract": null, + "name": "nix-output-monitor", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "698e6f3afdc9d68dd65d84df7b030499dbfaf84b", + "sha256": "sha256-QwEVaUxvXEdx5icIZZYQQjvJO5j0+GeWtJvCJ/LZwpA=", + "sparseCheckout": [], + "type": "git", + "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" }, - "version": "2.0.88" + "version": "698e6f3afdc9d68dd65d84df7b030499dbfaf84b" }, "postfix-mta-sts-resolver": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "postfix-mta-sts-resolver", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-DrPWxAlzdtb5K0Z+yVi+rL1h7CyLj0/Fiio8B2H/Ssg=", + "sha256": "sha256-OdliqfPeiRwQz/YtUSn43atQNrdtalHOw/lRuc/ji5g=", "type": "tarball", - "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.5.0.tar.gz" + "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.5.1.tar.gz" }, - "version": "1.5.0" + "version": "1.5.1" }, "postfwd": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "postfwd", @@ -320,21 +320,21 @@ "version": "2.03" }, "prometheus-lvm-exporter": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "prometheus-lvm-exporter", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-mg4iyp/heYzSoK+pGSMYfZb5UauoBMrEL1QPH6EoJ8o=", + "sha256": "sha256-Ra/Lo8RQQQz8UaiOzQd2FF7i+SDt4Mcj1gsk2WRh6KA=", "type": "tarball", - "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.1.tar.gz" + "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.2.tar.gz" }, - "version": "0.6.1" + "version": "0.6.2" }, "psql-versioning": { - "cargoLocks": null, + "cargoLock": null, "date": "2023-11-23", "extract": null, "name": "psql-versioning", @@ -354,8 +354,8 @@ "version": "330cb9da36651b701085ad53ae75ff296d02202a" }, "quickshell": { - "cargoLocks": null, - "date": "2025-09-19", + "cargoLock": null, + "date": "2025-10-31", "extract": null, "name": "quickshell", "passthru": null, @@ -365,16 +365,16 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "e9a574d919a89602d2868621576b2ccae54a5cb0", - "sha256": "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ=", + "rev": "fc704e6b5d445899a1565955268c91942a4f263f", + "sha256": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "e9a574d919a89602d2868621576b2ccae54a5cb0" + "version": "fc704e6b5d445899a1565955268c91942a4f263f" }, "scutiger": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "scutiger", @@ -388,7 +388,7 @@ "version": "0.2.0" }, "smartprom": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "smartprom", @@ -402,7 +402,7 @@ "version": "2.5.0" }, "spice-record": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "spice-record", @@ -415,28 +415,8 @@ }, "version": "0.2.1" }, - "swayosd": { - "cargoLocks": null, - "date": "2025-07-07", - "extract": null, - "name": "swayosd", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "73aed75146b81aaf67c4301353790ff5a17aed1f", - "sha256": "sha256-p31HNelptAw7Sk0NmYP4FkoUCdA5uAsrXC20JJp24Vw=", - "sparseCheckout": [], - "type": "git", - "url": "https://github.com/ErikReider/SwayOSD" - }, - "version": "73aed75146b81aaf67c4301353790ff5a17aed1f" - }, "tomorrow-night-paradise-theme": { - "cargoLocks": null, + "cargoLock": null, "date": "2012-06-04", "extract": null, "name": "tomorrow-night-paradise-theme", @@ -456,8 +436,8 @@ "version": "70225a5bf90d495e13a9260bfdc268632ece0801" }, "v4l2loopback": { - "cargoLocks": null, - "date": "2025-08-18", + "cargoLock": null, + "date": "2025-10-15", "extract": null, "name": "v4l2loopback", "passthru": null, @@ -469,15 +449,15 @@ "name": null, "owner": "umlaeute", "repo": "v4l2loopback", - "rev": "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed", - "sha256": "sha256-YcSpNfItvUdPVirlDyGdYuCnVvxHhh780x+OI5VNZmE=", + "rev": "c394f8fb2c168932055c2577247c42390198d7c9", + "sha256": "sha256-lf2n5tjnGHwhY49UVKnGgaz0ZPexFcK0/RkMDecGfXs=", "sparseCheckout": [], "type": "github" }, - "version": "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed" + "version": "c394f8fb2c168932055c2577247c42390198d7c9" }, "xcompose": { - "cargoLocks": null, + "cargoLock": null, "date": "2025-06-05", "extract": null, "name": "xcompose", @@ -498,7 +478,7 @@ "version": "4d8eab4d05a19537ce79294ae0459fdae78ffb20" }, "yt-dlp": { - "cargoLocks": null, + "cargoLock": null, "date": null, "extract": null, "name": "yt-dlp", @@ -506,10 +486,10 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-koKtHerbTJCy5tO8+fNgq/iMXy5LqDba17UTh7CG11c=", + "sha256": "sha256-XweVprj8V6XCMzLWfWxqz4GaC0a5GmMkuuKUFPqX8FI=", "type": "url", - "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.9.23.tar.gz" + "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.11.12.tar.gz" }, - "version": "2025.9.23" + "version": "2025.11.12" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 8eac064b..14548513 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,5 +1,10 @@ # This file was generated by nvfetcher, please do not modify it manually. -{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: +{ + fetchgit, + fetchurl, + fetchFromGitHub, + dockerTools, +}: { afew = { pname = "afew"; @@ -12,21 +17,21 @@ deepClone = false; leaveDotGit = true; sparseCheckout = [ ]; - sha256 = "sha256-Wdvack+oAq88a9E6i+OcMlSNStv4dWsZstHgLao0c9g="; + sha256 = "sha256-DtOhimn5R+PRHO+3rHcY71e0xYPBnDqJGSNfQdNFpTQ="; }; date = "2021-05-30"; }; bpf-examples = { pname = "bpf-examples"; - version = "d621b4fb25c4877415a563887606ab0fe47ad59a"; + version = "9a67546cbe94efe39ecb32579c33b8acabd695d7"; src = fetchFromGitHub { owner = "xdp-project"; repo = "bpf-examples"; - rev = "d621b4fb25c4877415a563887606ab0fe47ad59a"; + rev = "9a67546cbe94efe39ecb32579c33b8acabd695d7"; fetchSubmodules = true; - sha256 = "sha256-IQBTYtqHsghbb/Mpx29Hjr9AsLVG6w3BqfJYSKoMotU="; + sha256 = "sha256-Ztx4vZxVudlJOrCgCTkPiyY1XYTautRjwDhgYbziKus="; }; - date = "2025-09-19"; + date = "2025-11-04"; }; emacs-scratch_el = { pname = "emacs-scratch_el"; @@ -59,20 +64,6 @@ sha256 = "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU="; }; }; - mako = { - pname = "mako"; - version = "8318972590420c042c0177af16e26a1768550fab"; - src = fetchgit { - url = "https://github.com/emersion/mako"; - rev = "8318972590420c042c0177af16e26a1768550fab"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-Y/exF/Pv60E31Zl+M1zboWkmkZgOUCA3l93OKbtvZ+g="; - }; - date = "2025-09-11"; - }; mpv-autosave = { pname = "mpv-autosave"; version = "744c3ee61d2f0a8e9bb4e308dec6897215ae4704"; @@ -164,26 +155,40 @@ }; netbootxyz-efi = { pname = "netbootxyz-efi"; - version = "2.0.88"; + version = "2.0.89"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.efi"; - sha256 = "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.efi"; + sha256 = "sha256-rmMU/OTOh7zId+zwQCXHt2SJyBAtLNfCOZhDyrkBKjw="; }; }; netbootxyz-lkrn = { pname = "netbootxyz-lkrn"; - version = "2.0.88"; + version = "2.0.89"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.lkrn"; - sha256 = "sha256-igy3O30noS25dU7ZnHuKrWqLLkjjd/L46IdCTd038dI="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.lkrn"; + sha256 = "sha256-y0yibC3UeJUHslFBeMPVm2yEwxQqvL7/+BYMD5xDMm4="; + }; + }; + nix-output-monitor = { + pname = "nix-output-monitor"; + version = "698e6f3afdc9d68dd65d84df7b030499dbfaf84b"; + src = fetchgit { + url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; + rev = "698e6f3afdc9d68dd65d84df7b030499dbfaf84b"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; + sha256 = "sha256-QwEVaUxvXEdx5icIZZYQQjvJO5j0+GeWtJvCJ/LZwpA="; }; + date = "2025-11-09"; }; postfix-mta-sts-resolver = { pname = "postfix-mta-sts-resolver"; - version = "1.5.0"; + version = "1.5.1"; src = fetchTarball { - url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.5.0.tar.gz"; - sha256 = "sha256-DrPWxAlzdtb5K0Z+yVi+rL1h7CyLj0/Fiio8B2H/Ssg="; + url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.5.1.tar.gz"; + sha256 = "sha256-OdliqfPeiRwQz/YtUSn43atQNrdtalHOw/lRuc/ji5g="; }; }; postfwd = { @@ -196,10 +201,10 @@ }; prometheus-lvm-exporter = { pname = "prometheus-lvm-exporter"; - version = "0.6.1"; + version = "0.6.2"; src = fetchTarball { - url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.1.tar.gz"; - sha256 = "sha256-mg4iyp/heYzSoK+pGSMYfZb5UauoBMrEL1QPH6EoJ8o="; + url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.2.tar.gz"; + sha256 = "sha256-Ra/Lo8RQQQz8UaiOzQd2FF7i+SDt4Mcj1gsk2WRh6KA="; }; }; psql-versioning = { @@ -218,17 +223,17 @@ }; quickshell = { pname = "quickshell"; - version = "e9a574d919a89602d2868621576b2ccae54a5cb0"; + version = "fc704e6b5d445899a1565955268c91942a4f263f"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "e9a574d919a89602d2868621576b2ccae54a5cb0"; + rev = "fc704e6b5d445899a1565955268c91942a4f263f"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ="; + sha256 = "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0="; }; - date = "2025-09-19"; + date = "2025-10-31"; }; scutiger = { pname = "scutiger"; @@ -254,20 +259,6 @@ sha256 = "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8="; }; }; - swayosd = { - pname = "swayosd"; - version = "73aed75146b81aaf67c4301353790ff5a17aed1f"; - src = fetchgit { - url = "https://github.com/ErikReider/SwayOSD"; - rev = "73aed75146b81aaf67c4301353790ff5a17aed1f"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-p31HNelptAw7Sk0NmYP4FkoUCdA5uAsrXC20JJp24Vw="; - }; - date = "2025-07-07"; - }; tomorrow-night-paradise-theme = { pname = "tomorrow-night-paradise-theme"; version = "70225a5bf90d495e13a9260bfdc268632ece0801"; @@ -284,15 +275,15 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed"; + version = "c394f8fb2c168932055c2577247c42390198d7c9"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed"; + rev = "c394f8fb2c168932055c2577247c42390198d7c9"; fetchSubmodules = true; - sha256 = "sha256-YcSpNfItvUdPVirlDyGdYuCnVvxHhh780x+OI5VNZmE="; + sha256 = "sha256-lf2n5tjnGHwhY49UVKnGgaz0ZPexFcK0/RkMDecGfXs="; }; - date = "2025-08-18"; + date = "2025-10-15"; }; xcompose = { pname = "xcompose"; @@ -308,10 +299,10 @@ }; yt-dlp = { pname = "yt-dlp"; - version = "2025.9.23"; + version = "2025.11.12"; src = fetchurl { - url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.9.23.tar.gz"; - sha256 = "sha256-koKtHerbTJCy5tO8+fNgq/iMXy5LqDba17UTh7CG11c="; + url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.11.12.tar.gz"; + sha256 = "sha256-XweVprj8V6XCMzLWfWxqz4GaC0a5GmMkuuKUFPqX8FI="; }; }; } diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix index 5ae372c1..d4b77d9c 100644 --- a/accounts/gkleen@sif/niri/default.nix +++ b/accounts/gkleen@sif/niri/default.nix @@ -821,8 +821,8 @@ in { wl-copy "$(cut -d ':' -f 1 <<<"$FUZZEL_RES" | tr -d '\n')" && wtype -k XF86Paste ''; })); - "Print".action = screenshot; - "Control+Print".action = screenshot-window; + "Print".action = kdl.magic-leaf "screenshot"; + "Control+Print".action = kdl.magic-leaf "screenshot-window"; "Shift+Print".action = kdl.magic-leaf "screenshot-screen"; "Mod+B".action = with-select-window-action ".workspace_id == ($active_workspace | tonumber)" "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}"; "Mod+Shift+B".action = with-select-window-action "true" "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}"; diff --git a/flake.lock b/flake.lock index b99d27a9..71b66525 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1749105467, - "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "lastModified": 1762286984, + "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", + "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1753177987, - "narHash": "sha256-PkCc+YTrl0A/H6EV09DCr5yZpvQZ9DkuFXj/NNaEvHs=", + "lastModified": 1762691701, + "narHash": "sha256-G4XxDQEg+nWQZuJ8fFspFWEwQKBNWp2qfwNerTqgPgo=", "owner": "gkleen", "repo": "home-manager", - "rev": "b493410fc6e427129a1caee8f50970d152a27daa", + "rev": "d2e6122b484d43b6e87d4ea0578057507df380ab", "type": "github" }, "original": { @@ -469,16 +469,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", + "ref": "v0.4.3", "repo": "lanzaboote", "type": "github" } @@ -502,16 +502,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757437545, - "narHash": "sha256-7ssbrFnmSrqtCtOySiu5ncyOBxPrR6p2nhNHrg6D+fo=", + "lastModified": 1762886612, + "narHash": "sha256-gaPe/qkI4C9KyT8IZMvS9rXCWn2klxCC+MjXFU+jvqk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ef694b996daeeb8684c0adfaa9b7067a6e709054", + "rev": "4efef728e910bb8f009fa2db143baeacaa3466ec", "type": "github" }, "original": { @@ -541,11 +541,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757671534, - "narHash": "sha256-7tfypHWNtR+wZS9K9XrvcUwyvZ3h8CxInQ2mVsjUU9A=", + "lastModified": 1762690468, + "narHash": "sha256-JA7OTscpnkSPbmA211nYpkzueGLcTe01FfPZUpuCJiE=", "owner": "gkleen", "repo": "niri", - "rev": "5e3611a3c5f8c819e5517d0b3f795f161579a0db", + "rev": "e13a1ea28e4474bcae0324c154093249e03d0b73", "type": "github" }, "original": { @@ -583,11 +583,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1762660502, + "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "type": "github" }, "original": { @@ -625,11 +625,11 @@ ] }, "locked": { - "lastModified": 1748140003, - "narHash": "sha256-DNBZmuk1YRM2PmwbHzVdXumRjCUzQkMarg4iI/37rOQ=", + "lastModified": 1762024563, + "narHash": "sha256-jQNt4yOfCnhuePhRRi1bdILJ2eAEHFHrk3F6Dfjk1t8=", "owner": "AshleyYakeley", "repo": "NixVirt", - "rev": "5dfe108fd859b122f9a96981cb6bc12297653d6c", + "rev": "28906a0d198d5cdcb9501e3703eca93a482f03f0", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -765,27 +765,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -795,7 +779,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1748026580, "narHash": "sha256-rWtXrcIzU5wm/C8F9LWvUfBGu5U5E7cFzPYT1pHIJaQ=", @@ -811,7 +795,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -829,11 +813,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "NixOS", + "lastModified": 1762981181, + "narHash": "sha256-tnAS+voD6T221j4u7ldRrM3WwQtVVmwC3TYRkubdeKI=", + "owner": "gkleen", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "258ffe798997c648dcc04a784166c4e1a3bdd68e", "type": "github" }, "original": { @@ -872,11 +856,11 @@ ] }, "locked": { - "lastModified": 1732501185, - "narHash": "sha256-Z0BpHelaGQsE5VD9hBsBHsvMU9h+Xt0kfkDJyFivZOU=", + "lastModified": 1760948256, + "narHash": "sha256-nIsrxp6n1nQ63n1JTDaO/18RjvYbW9GVkanTP4G6Y18=", "owner": "berberman", "repo": "nvfetcher", - "rev": "bdb14eab6fe9cefc29efe01e60c3a3f616d6b62a", + "rev": "cb958b35b647c8a79fbd9d79764accc5e5a9a430", "type": "github" }, "original": { @@ -967,15 +951,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -990,7 +973,7 @@ "flake-utils": "flake-utils_2", "gitignore": "gitignore_4", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1685361114, @@ -1074,11 +1057,11 @@ ] }, "locked": { - "lastModified": 1755484659, - "narHash": "sha256-2FfbqsaHVQd12XFFUAinIMAuGO3853LONmva1gT3vKw=", + "lastModified": 1761781027, + "narHash": "sha256-YDvxPAm2WnxrznRqWwHLjryBGG5Ey1ATEJXrON+TWt8=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "9778e87c2361810ff15e287ca5895c9da4a0e900", + "rev": "795a980d25301e5133eca37adae37283ec3c8e66", "type": "github" }, "original": { @@ -1094,11 +1077,11 @@ ] }, "locked": { - "lastModified": 1754923840, - "narHash": "sha256-QSKpYg+Ts9HYF155ltlj40iBex39c05cpOF8gjoE2EM=", + "lastModified": 1762427963, + "narHash": "sha256-CkPlAbIQ87wmjy5qHibfzk4DmMGBNqFer+lLfXjpP5M=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "023cd4be230eacae52635be09eef100c37ef78da", + "rev": "4540ea004e04fcd12dd2738d51383d10f956f7b9", "type": "github" }, "original": { @@ -1127,7 +1110,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-eostre": "nixpkgs-eostre", "nixpkgs-pgbackrest": "nixpkgs-pgbackrest", - "nixpkgs-stable": "nixpkgs-stable_4", + "nixpkgs-stable": "nixpkgs-stable_3", "nvfetcher": "nvfetcher", "poetry2nix": "poetry2nix", "prometheus-borg-exporter": "prometheus-borg-exporter", @@ -1146,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1166,11 +1149,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1762812535, + "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7", "type": "github" }, "original": { @@ -1241,11 +1224,11 @@ ] }, "locked": { - "lastModified": 1755485731, - "narHash": "sha256-k8kxwVs8Oze6q/jAaRa3RvZbb50I/K0b5uptlsh0HXI=", + "lastModified": 1762859175, + "narHash": "sha256-R4lx2xW4NuIU/+YvF4hNb/Fw6xIImlmm+6S1QB+Jh+k=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "bebbd80bf56110fcd20b425589814af28f1939eb", + "rev": "41816ac37553af248bb29624885c471f5ae2b835", "type": "github" }, "original": { @@ -1298,11 +1281,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b93a1f2e..e358251c 100644 --- a/flake.nix +++ b/flake.nix @@ -230,7 +230,7 @@ type = "github"; owner = "nix-community"; repo = "lanzaboote"; - ref = "v0.4.2"; + ref = "v0.4.3"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index fb2dddc6..ce0d6355 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -402,10 +402,10 @@ in { thinkfan.enable = true; - logind = { - lidSwitch = "suspend"; - lidSwitchDocked = "ignore"; - lidSwitchExternalPower = "ignore"; + logind.settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchDocked = "ignore"; + HandleLidSwitchExternalPower = "ignore"; }; atd = { @@ -572,7 +572,7 @@ in { # setLdLibraryPath = true; }; - firmware = [ pkgs.firmwareLinuxNonfree ]; + firmware = [ pkgs.linux-firmware ]; keyboard.uhk.enable = true; nitrokey.enable = true; diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix index b4b2b5c8..c09e1511 100644 --- a/hosts/surtr/email/default.nix +++ b/hosts/surtr/email/default.nix @@ -539,7 +539,7 @@ in { users.groups.${config.services.redis.servers.rspamd.user}.members = [ config.services.rspamd.user ]; - environment.systemPackages = with pkgs; [ dovecot_pigeonhole dovecot_fts_xapian ]; + environment.systemPackages = with pkgs; [ dovecot_pigeonhole dovecot-fts-flatcurve ]; services.dovecot2 = { enable = true; enablePAM = false; @@ -547,7 +547,7 @@ in { sslServerKey = "/run/credentials/dovecot.service/surtr.yggdrasil.li.key.pem"; sslCACert = toString ./ca/ca.crt; mailLocation = "maildir:/var/lib/mail/%u/maildir:UTF-8:INDEX=/var/lib/dovecot/indices/%u"; - mailPlugins.globally.enable = [ "fts" "fts_xapian" ]; + mailPlugins.globally.enable = [ "fts" "fts_flatcurve" ]; protocols = [ "lmtp" "sieve" ]; sieve = { extensions = ["copy" "imapsieve" "variables" "imap4flags" "vacation" "vacation-seconds" "vnd.dovecot.debug"]; @@ -726,13 +726,10 @@ in { } plugin { - plugin = fts fts_xapian - fts = xapian - fts_xapian = partial=3 full=20 attachments=1 verbose=1 + plugin = fts fts_flatcurve + fts = yes fts_autoindex = yes - - fts_enforced = no } service indexer-worker { @@ -741,30 +738,6 @@ in { ''; }; - systemd.services.dovecot-fts-xapian-optimize = { - description = "Optimize dovecot indices for fts_xapian"; - requisite = [ "dovecot.service" ]; - after = [ "dovecot.service" ]; - startAt = "*-*-* 22:00:00 Europe/Berlin"; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${getExe' pkgs.dovecot "doveadm"} fts optimize -A"; - PrivateDevices = true; - PrivateNetwork = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectSystem = true; - PrivateTmp = true; - }; - }; - systemd.timers.dovecot-fts-xapian-optimize = { - timerConfig = { - RandomizedDelaySec = 4 * 3600; - }; - }; - environment.etc = { "dovecot/sieve_before.d/tag-junk.sieve".text = '' require ["imap4flags"]; diff --git a/installer/default.nix b/installer/default.nix index 26f38572..8c0082fa 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -8,7 +8,11 @@ with lib; ]; config = { - boot.initrd.kernelModules = [ "e1000e" "virtio_net" ]; + boot = { + initrd.kernelModules = [ "e1000e" "virtio_net" ]; + kernelPackages = pkgs.linuxPackages_6_17; + zfs.package = pkgs.zfs_unstable; + }; hardware.cpu.amd.updateMicrocode = config.hardware.enableRedistributableFirmware; diff --git a/nvfetcher.toml b/nvfetcher.toml index 8e3ba905..4d49583e 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -108,14 +108,6 @@ fetch.tarball = "https://github.com/JonathonReinhart/spice-record/archive/refs/t src.pypi = "yt_dlp" fetch.pypi = "yt_dlp" -[mako] -src.git = "https://github.com/emersion/mako" -fetch.git = "https://github.com/emersion/mako" - -[swayosd] -src.git = "https://github.com/ErikReider/SwayOSD" -fetch.git = "https://github.com/ErikReider/SwayOSD" - [netbootxyz-efi] src.github = "netbootxyz/netboot.xyz" fetch.url = "https://github.com/netbootxyz/netboot.xyz/releases/download/$ver/netboot.xyz.efi" @@ -127,3 +119,7 @@ fetch.url = "https://github.com/netbootxyz/netboot.xyz/releases/download/$ver/ne [quickshell] src.git = "https://git.outfoxxed.me/quickshell/quickshell.git" fetch.git = "https://git.outfoxxed.me/quickshell/quickshell.git" + +[nix-output-monitor] +src.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" +fetch.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" diff --git a/overlays/nix-output-monitor.nix b/overlays/nix-output-monitor.nix new file mode 100644 index 00000000..a15913ef --- /dev/null +++ b/overlays/nix-output-monitor.nix @@ -0,0 +1,6 @@ +{ final, prev, sources, ... }: +{ + nix-output-monitor = prev.nix-output-monitor.overrideAttrs (oldAttrs: prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.ghc.version "9.10.1") { + inherit (sources.nix-output-monitor) version src; + }); +} diff --git a/overlays/postfix-mta-sts-resolver/default.nix b/overlays/postfix-mta-sts-resolver/default.nix index 52ab2d40..c210cf79 100644 --- a/overlays/postfix-mta-sts-resolver/default.nix +++ b/overlays/postfix-mta-sts-resolver/default.nix @@ -11,7 +11,7 @@ projectDir = cleanPythonSources { src = prev.runCommand "sources" {} '' mkdir $out - cp -r ${sources.postfix-mta-sts-resolver.src}/. $out + cp -r --no-preserve=all ${sources.postfix-mta-sts-resolver.src}/. $out cp ${./pyproject.toml} $out/pyproject.toml cp ${./poetry.lock} $out/poetry.lock diff --git a/overlays/quickshell/default.nix b/overlays/quickshell/default.nix index c01fac20..7c4a263d 100644 --- a/overlays/quickshell/default.nix +++ b/overlays/quickshell/default.nix @@ -3,8 +3,9 @@ quickshell = prev.quickshell.overrideAttrs (oldAttrs: { inherit (sources.quickshell) version src; + buildInputs = (oldAttrs.buildInputs or []) ++ [ final.polkit.dev ]; + patches = (oldAttrs.patches or []) ++ [ - ./greetd-response.patch ./lock-state-changed.patch ./pipewire.patch ./io.patch diff --git a/overlays/quickshell/greetd-response.patch b/overlays/quickshell/greetd-response.patch deleted file mode 100644 index a0efb562..00000000 --- a/overlays/quickshell/greetd-response.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git c/src/services/greetd/connection.cpp w/src/services/greetd/connection.cpp -index bf0d1fd..a790ab7 100644 ---- c/src/services/greetd/connection.cpp -+++ w/src/services/greetd/connection.cpp -@@ -225,6 +225,11 @@ void GreetdConnection::onSocketReady() { - - this->mResponseRequired = responseRequired; - emit this->authMessage(message, error, responseRequired, echoResponse); -+ -+ if (!responseRequired) -+ this->sendRequest({ -+ {"type", "post_auth_message_response"} -+ }); - } else goto unexpected; - - return; diff --git a/overlays/yt-dlp.nix b/overlays/yt-dlp.nix index 9a54a32b..435afd58 100644 --- a/overlays/yt-dlp.nix +++ b/overlays/yt-dlp.nix @@ -3,5 +3,6 @@ inherit (sources.yt-dlp) pname version src; postPatch = ""; + installCheckPhase = "true"; }); } diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix index af9f1c17..d4a2175f 100644 --- a/system-profiles/zfs.nix +++ b/system-profiles/zfs.nix @@ -1,8 +1,8 @@ { config, pkgs, lib, ... } : { config = { boot = { - kernelPackages = pkgs.linuxPackages_6_12; - zfs.package = pkgs.zfs_2_3; + kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12; + zfs.package = lib.mkDefault pkgs.zfs_2_3; supportedFilesystems.zfs = true; }; diff --git a/user-profiles/zsh/default.nix b/user-profiles/zsh/default.nix index ab523a52..944d10ff 100644 --- a/user-profiles/zsh/default.nix +++ b/user-profiles/zsh/default.nix @@ -4,7 +4,7 @@ home-manager.users.${userName} = let sysConfig = config; in { config, ... }: { config = { programs.zsh = { - dotDir = ".config/zsh"; + dotDir = "${config.xdg.configHome}/zsh"; enable = true; autocd = true; enableCompletion = true; diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix index 5ce93de7..84446582 100644 --- a/users/gkleen/default.nix +++ b/users/gkleen/default.nix @@ -1,5 +1,7 @@ -{ flake, userName, pkgs, customUtils, lib, ... }: -{ +{ flake, home-manager, userName, pkgs, customUtils, lib, ... }: +let + homeManagerRelease = lib.importJSON (home-manager + /release.json); +in { imports = with flake.nixosModules.userProfiles.${userName}; [ utils direnv ]; @@ -15,69 +17,84 @@ hashedPassword = "$6$rounds=500000$dOMgCU7DAk$yQFYGOURTEt12387LIYBnFKSWmtwXMUk1LJWnV0m7OFt.y2TnxQn2abdGA5dhwG9EmMB5wZGXf4J5F71c746C/"; }; - home-manager.users.${userName} = { - home.keyboard = { - layout = "us"; - variant = "dvp"; - options = [ "ctl:nocaps" "compose:caps" ]; - }; + home-manager.users.${userName} = { config, ... }: lib.foldr lib.recursiveUpdate {} ([ + { + home.keyboard = { + layout = "us"; + variant = "dvp"; + options = [ "ctl:nocaps" "compose:caps" ]; + }; + + programs = { + git.enable = true; + ssh.enable = true; + + gpg.enable = true; + }; + } + ] ++ (lib.optional (lib.versionAtLeast homeManagerRelease.release "25.11") { programs = { - git = { - enable = true; - userEmail = "gkleen@yggdrasil.li"; - userName = "Gregor Kleen"; - delta.enable = true; - extraConfig = { - core.excludesfile = toString ./gitignore; - pull.rebase = true; - submodule.recurse = true; - init.defaultBranch = "main"; - column.ui = "auto"; - branch.sort = "-committerdate"; - tag.sort = "version:refname"; - diff = { - algorithm = "histogram"; - colorMoved = "plain"; - mnemonicPrefix = true; - renames = true; - }; - push = { - default = "simple"; - autoSetupRemote = true; - followTags = true; - }; - fetch = { - prune = true; - pruneTags = true; - all = true; - }; - rerere = { - enabled = true; - autoupdate = true; - }; - rebase = { - autoSquash = true; - autoStash = true; - updateRefs = true; - }; - merge.conflictstyle = "zdiff3"; + git.settings = { + user = { + email = "gkleen@yggdrasil.li"; + name = "Gregor Kleen"; + }; + core.excludesfile = toString ./gitignore; + pull.rebase = true; + submodule.recurse = true; + init.defaultBranch = "main"; + column.ui = "auto"; + branch.sort = "-committerdate"; + tag.sort = "version:refname"; + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + mnemonicPrefix = true; + renames = true; + }; + push = { + default = "simple"; + autoSetupRemote = true; + followTags = true; + }; + fetch = { + prune = true; + pruneTags = true; + all = true; }; + rerere = { + enabled = true; + autoupdate = true; + }; + rebase = { + autoSquash = true; + autoStash = true; + updateRefs = true; + }; + merge.conflictstyle = "zdiff3"; }; - - ssh = { + delta = { enable = true; - controlMaster = "auto"; - controlPersist = "30m"; - serverAliveInterval = 6; - serverAliveCountMax = 10; - hashKnownHosts = true; - extraConfig = '' - IdentitiesOnly true - ''; + enableGitIntegration = true; }; + ssh = { + enableDefaultConfig = false; + matchBlocks."*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlPath = "~/.ssh/master-%r@%n:%p"; - gpg.enable = true; + controlMaster = "auto"; + controlPersist = "30m"; + serverAliveInterval = 6; + serverAliveCountMax = 10; + hashKnownHosts = true; + identitiesOnly = true; + }; + }; }; - }; + })); } diff --git a/users/root.nix b/users/root.nix index ed1acd50..7fa99452 100644 --- a/users/root.nix +++ b/users/root.nix @@ -1,6 +1,7 @@ -{ flake, lib, config, hostName, userName, pkgs, ... }: +{ flake, home-manager, lib, config, hostName, userName, pkgs, ... }: let haveGKleen = flake.nixosModules.accounts ? "gkleen@${hostName}"; + homeManagerRelease = lib.importJSON (home-manager + /release.json); in { imports = with flake.nixosModules.userProfiles.${userName}; [ direnv utils @@ -11,42 +12,89 @@ in { openssh.authorizedKeys.keyFiles = config.users.users."gkleen".openssh.authorizedKeys.keyFiles; }; - home-manager.users.${userName} = { + home-manager.users.${userName} = { config, ... }: lib.foldr lib.recursiveUpdate {} ([ + { + programs = { + git.enable = true; + + ssh.enable = true; + + gpg.enable = true; + }; + + services = { + gpg-agent = { + enable = true; + enableSshSupport = true; + extraConfig = '' + pinentry-program ${pkgs.pinentry-curses}/bin/pinentry + grab + ''; + }; + }; + } + ] ++ (lib.optional (lib.versionAtLeast homeManagerRelease.release "25.11") { programs = { - git = { - enable = true; - userEmail = "gkleen@yggdrasil.li"; - userName = "Gregor Kleen"; - delta.enable = true; - extraConfig = { - pull.rebase = false; + git.settings = { + user = { + email = "gkleen@yggdrasil.li"; + name = "Gregor Kleen"; + }; + core.excludesfile = toString ./gitignore; + pull.rebase = true; + submodule.recurse = true; + init.defaultBranch = "main"; + column.ui = "auto"; + branch.sort = "-committerdate"; + tag.sort = "version:refname"; + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + mnemonicPrefix = true; + renames = true; + }; + push = { + default = "simple"; + autoSetupRemote = true; + followTags = true; + }; + fetch = { + prune = true; + pruneTags = true; + all = true; }; + rerere = { + enabled = true; + autoupdate = true; + }; + rebase = { + autoSquash = true; + autoStash = true; + updateRefs = true; + }; + merge.conflictstyle = "zdiff3"; }; - - ssh = { + delta = { enable = true; - controlMaster = "auto"; - controlPersist = "30m"; - serverAliveInterval = 6; - serverAliveCountMax = 10; - hashKnownHosts = true; - extraConfig = '' - IdentitiesOnly true - ''; + enableGitIntegration = true; }; + ssh = { + enableDefaultConfig = false; + matchBlocks."*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlPath = "~/.ssh/master-%r@%n:%p"; - gpg.enable = true; - }; - - services = { - gpg-agent = { - enable = true; - enableSshSupport = true; - extraConfig = '' - pinentry-program ${pkgs.pinentry-curses}/bin/pinentry - grab - ''; + controlMaster = "auto"; + controlPersist = "30m"; + serverAliveInterval = 6; + serverAliveCountMax = 10; + hashKnownHosts = true; + identitiesOnly = true; + }; }; }; - }; + })); } -- cgit v1.2.3