From 2f3d52e6f54752ebe8eee86c789badfa87d2dd1f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 22 Mar 2025 13:04:06 +0100 Subject: ... --- _sources/generated.json | 14 ++++++------ _sources/generated.nix | 14 ++++++------ flake.lock | 52 +++++++++++++++++++++---------------------- flake.nix | 7 ++++-- hosts/surtr/email/default.nix | 2 +- 5 files changed, 46 insertions(+), 43 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 80194b7f..c1af7cc8 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -99,7 +99,7 @@ }, "mako": { "cargoLocks": null, - "date": "2025-03-07", + "date": "2025-03-21", "extract": null, "name": "mako", "passthru": null, @@ -109,13 +109,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "91a1fc482b1ef8c45a64e38f13e0b23e84155f32", - "sha256": "sha256-i91WGv1O5OZ0338/F2nkXUZ7xLD3N9Zxloeq3sDt04w=", + "rev": "2a06a341efae601431a6944f94cfe4965a46cb44", + "sha256": "sha256-QH2rxJcNiurHFEtkmq6Ki15k11b6ft6WYiZKbGs7SS0=", "sparseCheckout": [], "type": "git", "url": "https://github.com/emersion/mako" }, - "version": "91a1fc482b1ef8c45a64e38f13e0b23e84155f32" + "version": "2a06a341efae601431a6944f94cfe4965a46cb44" }, "mpv-autosave": { "cargoLocks": null, @@ -456,10 +456,10 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-8zynbfLk2zGIDy/kCNRPUFjZ8TUBWxPlBhDfvngkW+o=", + "sha256": "sha256-W89HsolyVOo4FpNajd5H0kO/9VZ4LM7WsWorhea2gro=", "type": "url", - "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.2.19.tar.gz" + "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.3.21.tar.gz" }, - "version": "2025.2.19" + "version": "2025.3.21" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 0dcedc0e..b0cf46e5 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -61,17 +61,17 @@ }; mako = { pname = "mako"; - version = "91a1fc482b1ef8c45a64e38f13e0b23e84155f32"; + version = "2a06a341efae601431a6944f94cfe4965a46cb44"; src = fetchgit { url = "https://github.com/emersion/mako"; - rev = "91a1fc482b1ef8c45a64e38f13e0b23e84155f32"; + rev = "2a06a341efae601431a6944f94cfe4965a46cb44"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-i91WGv1O5OZ0338/F2nkXUZ7xLD3N9Zxloeq3sDt04w="; + sha256 = "sha256-QH2rxJcNiurHFEtkmq6Ki15k11b6ft6WYiZKbGs7SS0="; }; - date = "2025-03-07"; + date = "2025-03-21"; }; mpv-autosave = { pname = "mpv-autosave"; @@ -278,10 +278,10 @@ }; yt-dlp = { pname = "yt-dlp"; - version = "2025.2.19"; + version = "2025.3.21"; src = fetchurl { - url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.2.19.tar.gz"; - sha256 = "sha256-8zynbfLk2zGIDy/kCNRPUFjZ8TUBWxPlBhDfvngkW+o="; + url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.3.21.tar.gz"; + sha256 = "sha256-W89HsolyVOo4FpNajd5H0kO/9VZ4LM7WsWorhea2gro="; }; }; } diff --git a/flake.lock b/flake.lock index 4f3e02a1..593f8eee 100644 --- a/flake.lock +++ b/flake.lock @@ -397,11 +397,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742108116, - "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=", + "lastModified": 1742636890, + "narHash": "sha256-FDMxPw/9LNkH9N+FBbUO7gRX70rrp/347YSTkkxBq9I=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "824f10012de455a1d0ef795a605f28948ee10467", + "rev": "93d595a2484ee3c7a55a2b4cbb0660ad280eeb9b", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742103165, - "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", + "lastModified": 1742631227, + "narHash": "sha256-iignxt2VAXMbJuzwJ4+k4T++vduDyhO5BTGi9PDd8fE=", "owner": "YaLTeR", "repo": "niri", - "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", + "rev": "f95d5a82df89d3f09e818091a853b3608eaa5831", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1742096597, - "narHash": "sha256-CUy00dj513aIvtN2NGiDKLCVEQSz4xHWSDf229EiJdU=", + "lastModified": 1742174123, + "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5c77c6d6f2e8cc6007c2b1a4df1a507834404a67", + "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -748,11 +748,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741790785, + "lastModified": 1742397518, "narHash": "sha256-nzgO/ZCSBzWjbMkYDxG+yl9Z2eGbCgQu06Oku3ir5D4=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "f842aae3a72ef764e38eaf3e75aa435fb9861bba", + "rev": "b9a98080beff0903a5e5fe431f42cde1e3e50d6b", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1741861888, - "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=", + "lastModified": 1742595978, + "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f", + "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742083780, - "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", + "lastModified": 1742475924, + "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", + "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4e119e98..1cc9782c 100644 --- a/flake.nix +++ b/flake.nix @@ -298,7 +298,7 @@ forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); activateNixosConfigurations = forAllSystems (system: _pkgs: filterAttrs (_n: v: v != null) (mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" (if system == nixosConfig.config.nixpkgs.system then { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; } else null)) self.nixosConfigurations)); - startVMs = forAllSystems (system: pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "run-${hostName}-vm" { type = "app"; program = "${nixosConfig.config.system.build.vm}/bin/run-${hostName}-vm"; }) (nixImport rec { dir = ./hosts; _import = mkNixosConfiguration [ { config.virtualisation.host.pkgs = pkgs; } ] dir; })); + # startVMs = forAllSystems (system: pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "run-${hostName}-vm" { type = "app"; program = "${nixosConfig.config.system.build.vm}/bin/run-${hostName}-vm"; }) (nixImport rec { dir = ./hosts; _import = mkNixosConfiguration [ { config.virtualisation.host.pkgs = pkgs; } ] dir; })); activateHomeManagerConfigurations = forAllSystems (system: _pkgs: filterAttrs (_n: v: v != null) (listToAttrs (concatLists (mapAttrsToList (hostName: nixosConfig: mapAttrsToList (userName: userCfg: nameValuePair "${userName}@${hostName}-activate" (if system == nixosConfig.config.nixpkgs.system then { type = "app"; program = "${userCfg.home.activationPackage}/activate"; } else null)) nixosConfig.config.home-manager.users) self.nixosConfigurations)))); installerShells = system: pkgs: mapAttrs (installerName: config: pkgs.callPackage ./installer/shell.nix { inherit system installerName config; @@ -346,7 +346,10 @@ legacyPackages = forAllSystems (system: systemPkgs: systemPkgs.override { overlays = attrValues self.overlays; }); - apps = foldr recursiveUpdate {} [startVMs activateNixosConfigurations activateHomeManagerConfigurations]; + apps = foldr recursiveUpdate {} [ + #startVMs + activateNixosConfigurations activateHomeManagerConfigurations + ]; devShells = forAllSystems (system: systemPkgs: { default = import ./shell.nix ({ inherit system; } // inputs); } // installerShells system systemPkgs); diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix index 4196a8bc..a85b76aa 100644 --- a/hosts/surtr/email/default.nix +++ b/hosts/surtr/email/default.nix @@ -484,6 +484,7 @@ in { users.groups.${config.services.redis.servers.rspamd.user}.members = [ config.services.rspamd.user ]; + environment.systemPackages = with pkgs; [ dovecot_pigeonhole dovecot_fts_xapian ]; services.dovecot2 = { enable = true; enablePAM = false; @@ -491,7 +492,6 @@ in { sslServerKey = "/run/credentials/dovecot2.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"; - modules = with pkgs; [ dovecot_pigeonhole dovecot_fts_xapian ]; mailPlugins.globally.enable = [ "fts" "fts_xapian" ]; protocols = [ "lmtp" "sieve" ]; sieve = { -- cgit v1.2.3