From 3d577fd69bfe89a9b8497367fdc55d75174e34bd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 15 Apr 2025 09:21:54 +0200 Subject: ... --- _sources/generated.json | 30 +++++++-------- _sources/generated.nix | 30 +++++++-------- accounts/gkleen@sif/default.nix | 1 - flake.lock | 82 ++++++++++++++++++++++++++--------------- flake.nix | 11 +++++- overlays/deploy-rs.nix | 14 +++++++ overlays/nix-monitored.nix | 8 ++++ overlays/scutiger.nix | 2 +- overlays/swayosd/default.nix | 4 +- overlays/thunderbird.nix | 11 ------ shell.nix | 4 +- user-profiles/direnv.nix | 9 ++++- 12 files changed, 126 insertions(+), 80 deletions(-) create mode 100644 overlays/deploy-rs.nix create mode 100644 overlays/nix-monitored.nix delete mode 100644 overlays/thunderbird.nix diff --git a/_sources/generated.json b/_sources/generated.json index b85cb274..d9868b8e 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -76,12 +76,12 @@ "name": null, "owner": "Mange", "repo": "emoji-data", - "rev": "v2.6", - "sha256": "sha256-6nBiT9q139P1pXLqkV1JejE0s2rZn1gUbNsejXJR6RU=", + "rev": "v2.7", + "sha256": "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs=", "sparseCheckout": [], "type": "github" }, - "version": "v2.6" + "version": "v2.7" }, "lesspipe": { "cargoLocks": null, @@ -99,7 +99,7 @@ }, "mako": { "cargoLocks": null, - "date": "2025-03-21", + "date": "2025-04-03", "extract": null, "name": "mako", "passthru": null, @@ -109,13 +109,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "2a06a341efae601431a6944f94cfe4965a46cb44", - "sha256": "sha256-QH2rxJcNiurHFEtkmq6Ki15k11b6ft6WYiZKbGs7SS0=", + "rev": "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5", + "sha256": "sha256-XMrwWVGp2ow1gCvjS1JbCerBNpRXzqsTMePFkSSjVXA=", "sparseCheckout": [], "type": "git", "url": "https://github.com/emersion/mako" }, - "version": "2a06a341efae601431a6944f94cfe4965a46cb44" + "version": "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5" }, "mpv-autosave": { "cargoLocks": null, @@ -223,7 +223,7 @@ }, "mpv-subselect": { "cargoLocks": null, - "date": "2024-12-22", + "date": "2025-04-04", "extract": null, "name": "mpv-subselect", "passthru": null, @@ -233,13 +233,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "77d0148aa6aa952f07f06212cabe32d54dfdf49e", - "sha256": "sha256-VxwwTxE8c8rRQt/m2NA7cRC7+7O1ItYFFGv81nxqIxg=", + "rev": "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb", + "sha256": "sha256-+eVga4b7KIBnfrtmlgq/0HNjQVS3SK6YWVXCPvOeOOc=", "sparseCheckout": [], "type": "git", "url": "https://github.com/CogentRedTester/mpv-sub-select" }, - "version": "77d0148aa6aa952f07f06212cabe32d54dfdf49e" + "version": "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb" }, "mpv-youtube-quality": { "cargoLocks": null, @@ -407,7 +407,7 @@ }, "v4l2loopback": { "cargoLocks": null, - "date": "2025-03-24", + "date": "2025-04-12", "extract": null, "name": "v4l2loopback", "passthru": null, @@ -419,12 +419,12 @@ "name": null, "owner": "umlaeute", "repo": "v4l2loopback", - "rev": "84cccedd9d3979f0a8ec5478b100ea57adf29696", - "sha256": "sha256-o31+j5OdMV0e5GvyoGSR1RK6GjTwz9sfhfUK+vbW+b4=", + "rev": "5fae555286b74a61beb1e5b45b01ba7736a1c234", + "sha256": "sha256-cALS7DrSolAdFtE1YJpmNjq81CPbXA38YsFyx2sSLcQ=", "sparseCheckout": [], "type": "github" }, - "version": "84cccedd9d3979f0a8ec5478b100ea57adf29696" + "version": "5fae555286b74a61beb1e5b45b01ba7736a1c234" }, "xcompose": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index ddcbbf10..3376df44 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -42,13 +42,13 @@ }; emoji-data = { pname = "emoji-data"; - version = "v2.6"; + version = "v2.7"; src = fetchFromGitHub { owner = "Mange"; repo = "emoji-data"; - rev = "v2.6"; + rev = "v2.7"; fetchSubmodules = true; - sha256 = "sha256-6nBiT9q139P1pXLqkV1JejE0s2rZn1gUbNsejXJR6RU="; + sha256 = "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs="; }; }; lesspipe = { @@ -61,17 +61,17 @@ }; mako = { pname = "mako"; - version = "2a06a341efae601431a6944f94cfe4965a46cb44"; + version = "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5"; src = fetchgit { url = "https://github.com/emersion/mako"; - rev = "2a06a341efae601431a6944f94cfe4965a46cb44"; + rev = "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-QH2rxJcNiurHFEtkmq6Ki15k11b6ft6WYiZKbGs7SS0="; + sha256 = "sha256-XMrwWVGp2ow1gCvjS1JbCerBNpRXzqsTMePFkSSjVXA="; }; - date = "2025-03-21"; + date = "2025-04-03"; }; mpv-autosave = { pname = "mpv-autosave"; @@ -136,17 +136,17 @@ }; mpv-subselect = { pname = "mpv-subselect"; - version = "77d0148aa6aa952f07f06212cabe32d54dfdf49e"; + version = "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb"; src = fetchgit { url = "https://github.com/CogentRedTester/mpv-sub-select"; - rev = "77d0148aa6aa952f07f06212cabe32d54dfdf49e"; + rev = "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-VxwwTxE8c8rRQt/m2NA7cRC7+7O1ItYFFGv81nxqIxg="; + sha256 = "sha256-+eVga4b7KIBnfrtmlgq/0HNjQVS3SK6YWVXCPvOeOOc="; }; - date = "2024-12-22"; + date = "2025-04-04"; }; mpv-youtube-quality = { pname = "mpv-youtube-quality"; @@ -254,15 +254,15 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "84cccedd9d3979f0a8ec5478b100ea57adf29696"; + version = "5fae555286b74a61beb1e5b45b01ba7736a1c234"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "84cccedd9d3979f0a8ec5478b100ea57adf29696"; + rev = "5fae555286b74a61beb1e5b45b01ba7736a1c234"; fetchSubmodules = true; - sha256 = "sha256-o31+j5OdMV0e5GvyoGSR1RK6GjTwz9sfhfUK+vbW+b4="; + sha256 = "sha256-cALS7DrSolAdFtE1YJpmNjq81CPbXA38YsFyx2sSLcQ="; }; - date = "2025-03-24"; + date = "2025-04-12"; }; xcompose = { pname = "xcompose"; diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 11f24f31..b54103e1 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -398,7 +398,6 @@ in { fira-code-symbols libreoffice xournalpp google-chrome nixos-shell virt-viewer freerdp gnome-icon-theme paper-icon-theme sshpassSecret weechat element-desktop - flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs sieve-connect gimp inkscape udiskie glab nitrokey-app pynitrokey gtklock wlrctl remmina openscad spice-record libguestfs-with-appliance nerd-fonts.fira-mono diff --git a/flake.lock b/flake.lock index 55213878..faa3faff 100644 --- a/flake.lock +++ b/flake.lock @@ -202,11 +202,11 @@ "flake-registry": { "flake": false, "locked": { - "lastModified": 1734450202, - "narHash": "sha256-/3gigrEBFORQs6a8LL5twoHs7biu08y/8Xc5aQmk3b0=", + "lastModified": 1744623129, + "narHash": "sha256-nlQTQrHqM+ywXN0evDXnYEV6z6WWZB5BFQ2TkXsduKw=", "owner": "NixOS", "repo": "flake-registry", - "rev": "02fe640c9e117dd9d6a34efc7bcb8bd09c08111d", + "rev": "1322f33d5836ae757d2e6190239252cf8402acf6", "type": "github" }, "original": { @@ -397,11 +397,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743186084, - "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", + "lastModified": 1744480072, + "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", + "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743017820, - "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", + "lastModified": 1744475937, + "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=", "owner": "YaLTeR", "repo": "niri", - "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", + "rev": "95eafba346a17104a9af71021011fcdc9e13776b", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1743306489, - "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", + "lastModified": 1744518957, + "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", + "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", "type": "github" }, "original": { @@ -486,6 +486,27 @@ "type": "github" } }, + "nix-monitored": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737219791, + "narHash": "sha256-OU0NPjJ3woNDFNx7HtWuUXBb4eI6Ggre/Uj2qhiSjrg=", + "owner": "ners", + "repo": "nix-monitored", + "rev": "6ed8ed4832ff26c616e5856ba19f5b8141d61bd3", + "type": "github" + }, + "original": { + "owner": "ners", + "ref": "master", + "repo": "nix-monitored", + "type": "github" + } + }, "nixVirt": { "inputs": { "nixpkgs": [ @@ -508,11 +529,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -630,11 +651,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1744309437, + "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", "type": "github" }, "original": { @@ -678,11 +699,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -748,11 +769,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742397518, - "narHash": "sha256-nzgO/ZCSBzWjbMkYDxG+yl9Z2eGbCgQu06Oku3ir5D4=", + "lastModified": 1743690424, + "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "b9a98080beff0903a5e5fe431f42cde1e3e50d6b", + "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94", "type": "github" }, "original": { @@ -871,6 +892,7 @@ "impermanence": "impermanence", "niri-flake": "niri-flake", "nix-index-database": "nix-index-database", + "nix-monitored": "nix-monitored", "nixVirt": "nixVirt", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -891,11 +913,11 @@ ] }, "locked": { - "lastModified": 1743305778, - "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", + "lastModified": 1744518500, + "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e873886bbfc32163fe027b8676c75637b7da114", + "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "type": "github" }, "original": { @@ -1000,11 +1022,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742773235, - "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1cc9782c..116aed21 100644 --- a/flake.nix +++ b/flake.nix @@ -194,6 +194,15 @@ # niri-unstable.url = "github:gkleen/niri"; }; }; + nix-monitored = { + type = "github"; + owner = "ners"; + repo = "nix-monitored"; + ref = "master"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; }; outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs: @@ -378,6 +387,6 @@ filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs); in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides)); - checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; }; } diff --git a/overlays/deploy-rs.nix b/overlays/deploy-rs.nix new file mode 100644 index 00000000..0bf1c3b2 --- /dev/null +++ b/overlays/deploy-rs.nix @@ -0,0 +1,14 @@ +{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions + flakeInputs.deploy-rs.overlays.default + (final: prev: { + deploy-rs = prev.deploy-rs // { + deploy-rs = prev.deploy-rs.deploy-rs.overrideAttrs (oldAttrs: { + nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper]; + preFixup = '' + wrapProgram $out/bin/deploy \ + --prefix PATH : ${prev.lib.makeBinPath (with final; [ nix-monitored ])} + ''; + }); + }; + }) + final prev diff --git a/overlays/nix-monitored.nix b/overlays/nix-monitored.nix new file mode 100644 index 00000000..9f6caff1 --- /dev/null +++ b/overlays/nix-monitored.nix @@ -0,0 +1,8 @@ +{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions + flakeInputs.nix-monitored.overlays.default + (final: prev: { + nix-monitored = prev.nix-monitored.override { + withNotify = false; + }; + }) + final prev diff --git a/overlays/scutiger.nix b/overlays/scutiger.nix index 7a56adaf..b00b34a4 100644 --- a/overlays/scutiger.nix +++ b/overlays/scutiger.nix @@ -2,7 +2,7 @@ scutiger = final.rustPlatform.buildRustPackage { inherit (sources.scutiger) pname version src; - cargoHash = "sha256-d+wJ3trrldCVATsudsbglElU6q4LaS6feRocRyHal2k="; + cargoHash = "sha256-FTAEmRuO95ii84uwaALVuImiymnSAQkB2UwZ5yX0WPs="; nativeBuildInputs = with final; [ pkg-config pcre2.dev zlib.dev git ]; }; diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix index 2a3a0f2b..b535f7f9 100644 --- a/overlays/swayosd/default.nix +++ b/overlays/swayosd/default.nix @@ -1,10 +1,10 @@ { final, prev, sources, ... }: { swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec { inherit (sources.swayosd) version src; - cargoDeps = prev.rustPlatform.fetchCargoTarball { + cargoDeps = prev.rustPlatform.fetchCargoVendor { inherit (oldAttrs) pname; inherit version src; - hash = "sha256-s2vgyQP6J3i0q2o/Tt8dYoamBH3vrI/FNJYteHO8v5Q="; + hash = "sha256-b5Ei6k9p/KiyiSSl5zxDXrTgGAq24O5ll0BvyJ/41F8="; }; patches = (oldAttrs.patches or []) ++ [ ./exponential.patch diff --git a/overlays/thunderbird.nix b/overlays/thunderbird.nix deleted file mode 100644 index 48ae2ccb..00000000 --- a/overlays/thunderbird.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ final, prev, ... }: { - thunderbird-unwrapped = prev.thunderbird-unwrapped.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) - ++ prev.lib.optional (prev.lib.versionAtLeast oldAttrs.version "136") (prev.fetchpatch { - url = "https://hg.mozilla.org/comm-central/raw-rev/a82bd8fc0bc0"; - hash = "sha256-7t8IqxwcZJqXmOevpGof1mcrFKZvXtCcY2EOIsP47EY="; - stripLen = 1; - extraPrefix = "comm/"; - }); - }); -} diff --git a/shell.nix b/shell.nix index 5bcb8180..b6059799 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -inputs@{ system, self, deploy-rs, nvfetcher, nixpkgs, ca-util, ... }: +inputs@{ system, self, nvfetcher, nixpkgs, ca-util, ... }: let pkgs = self.legacyPackages.${system}; utils = import ./utils { inherit (nixpkgs) lib; }; @@ -9,7 +9,7 @@ in pkgs.mkShell { wireguard-tools gup nftables - deploy-rs.packages.${system}.deploy-rs + deploy-rs.deploy-rs knot-dns yq nvfetcher.packages.${system}.default diff --git a/user-profiles/direnv.nix b/user-profiles/direnv.nix index 7887d765..3cc1af3e 100644 --- a/user-profiles/direnv.nix +++ b/user-profiles/direnv.nix @@ -1,9 +1,14 @@ -{ userName, ... }: +{ userName, pkgs, ... }: { home-manager.users.${userName} = { programs.direnv = { enable = true; - nix-direnv.enable = true; + nix-direnv = { + enable = true; + package = pkgs.nix-direnv.override { + nix = pkgs.nix-monitored; + }; + }; }; }; } -- cgit v1.2.3