inputs: bump

This commit is contained in:
Lu Wang 2024-12-21 21:36:01 +08:00
parent 68d8d0a13c
commit c6935ca7f7
Signed by: rebmit
SSH key fingerprint: SHA256:3px8QV1zEerIrEWHaqtH5rR9kjetyRST5EipOPrd+bU
6 changed files with 51 additions and 55 deletions

View file

@ -104,11 +104,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1733328505,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1733312601,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +176,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1734425854,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,11 +238,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1734622215,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1731242966, "lastModified": 1734772301,
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "narHash": "sha256-mQEQQzCTUlDiEw/EbblB510P/GQOmIPtKoJrqDqeGVc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "rev": "0ab2f858dfefe73402eb53fbe6a3bad4f6702d5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -315,11 +315,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1733651163, "lastModified": 1734749715,
"narHash": "sha256-8W0zp4rU63bRRYVOKK0Prl93Y9XmKFd25jbNZOSFaBo=", "narHash": "sha256-YHUevU8Y6dchCUGsDxJzkzNZnBcNQjAIxMdQJ1NMIek=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "2a7e4cb2b7430e8f412e8046b558e1540f6fb8cf", "rev": "4165fa3e7070c1252254ca61f8efeafdd2113293",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,11 +348,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733639139, "lastModified": 1734270275,
"narHash": "sha256-oQ7YwoK/Hhpal6URjypm+BEB3n2S8GAJQVG8sVLC0/I=", "narHash": "sha256-FfpxEVDPQ1qSDoLOqnSK2laM6oPklgZhd2YWzxOB8Ns=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "9824321fc9499b9987f344308a5c5c69cb9b7a77", "rev": "d35ad73e3572b0ac704b0c08928f53d0cfd1951f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -368,11 +368,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734137637, "lastModified": 1734742251,
"narHash": "sha256-dwg29WDzbPpHZE81nZ10ufI6sBOXvNs2JFBIq0hydZE=", "narHash": "sha256-bamyP4/3Ryf9YGrWpg4xn/kG1uxb6YDduWrmdXuTWDk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-terraform-providers-bin", "repo": "nixpkgs-terraform-providers-bin",
"rev": "825e37026b465e9e63e65ecd492416887cfb4e85", "rev": "e564c85806a714ed1bec187c7595882440320e85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +383,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1734424634,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +413,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1734694533, "lastModified": 1734785024,
"narHash": "sha256-OPww6Fzq7qnHctBcu6J9vmVdZ4NS8vpdG8JRvWm4i3s=", "narHash": "sha256-JbW30U7Vc3L9eRVvSnqswu3peu3NGsa4opCMh6aza2s=",
"owner": "rebmit", "owner": "rebmit",
"repo": "nix-exprs", "repo": "nix-exprs",
"rev": "4a958c802908b90f60f7aac2c85de433c86ec76c", "rev": "89604613d41c5512d1b564ece404f0cf85781eb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -501,11 +501,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733128155, "lastModified": 1734546875,
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +537,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730321837, "lastModified": 1734704479,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -570,11 +570,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732233710, "lastModified": 1734745564,
"narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,7 +6,7 @@
noto-fonts-cjk-serif noto-fonts-cjk-serif
noto-fonts-emoji noto-fonts-emoji
roboto-mono roboto-mono
(nerdfonts.override { fonts = [ "RobotoMono" ]; }) nerd-fonts.roboto-mono
]; ];
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;

View file

@ -102,11 +102,9 @@ in
unshare --mount=${mntnsPath} --propagation slave true unshare --mount=${mntnsPath} --propagation slave true
nsenter --mount=${mntnsPath} bash ${pkgs.writeShellScript "netns-${name}-mntns-bind-mount" '' nsenter --mount=${mntnsPath} bash ${pkgs.writeShellScript "netns-${name}-mntns-bind-mount" ''
declare -A bind_mounts=( declare -A bind_mounts=(
${ ${concatMapStringsSep "\n" (d: ''
concatMapStringsSep "\n" (d: '' ["${d.mountPoint}"]="${d.hostPath}:${if d.isReadOnly then "ro" else "rw"}"
["${d.mountPoint}"]="${d.hostPath}:${if d.isReadOnly then "ro" else "rw"}" '') (attrValues bindMounts)}
'') (attrValues bindMounts)
}
) )
for mount_point in "''${!bind_mounts[@]}"; do for mount_point in "''${!bind_mounts[@]}"; do

View file

@ -54,11 +54,9 @@ in
services.enthalpy.bird.config = '' services.enthalpy.bird.config = ''
protocol static { protocol static {
ipv6 sadr; ipv6 sadr;
${ ${concatMapStringsSep "\n" (p: ''
concatMapStringsSep "\n" (p: '' route ${p.destination} from ${p.source} via fe80::ff:fe00:1 dev "host";
route ${p.destination} from ${p.source} via fe80::ff:fe00:1 dev "host"; '') birdPrefix}
'') birdPrefix
}
} }
''; '';

View file

@ -82,11 +82,9 @@ in
gnupg.sshKeyPaths = [ ]; gnupg.sshKeyPaths = [ ];
opentofuTemplate = '' opentofuTemplate = ''
{ {
${ ${lib.concatMapStringsSep "\n, " (cfg: ''"${cfg.name}": ${cfg.opentofu.jqPath}'') (
lib.concatMapStringsSep "\n, " (cfg: ''"${cfg.name}": ${cfg.opentofu.jqPath}'') ( lib.attrValues secretsFromOutputs
lib.attrValues secretsFromOutputs )}
)
}
} }
''; '';
secretFiles = { secretFiles = {

View file

@ -1,3 +1,5 @@
# Portions of this file are sourced from
# https://github.com/NickCao/flakes/blob/3b03efb676ea602575c916b2b8bc9d9cd13b0d85/nixos/hcloud/iad1/prometheus.nix
{ config, lib, ... }: { config, lib, ... }:
let let
common = import ../../../../zones/common.nix; common = import ../../../../zones/common.nix;