diff --git a/flake.lock b/flake.lock index 50feab6..877319f 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1734772301, + "narHash": "sha256-mQEQQzCTUlDiEw/EbblB510P/GQOmIPtKoJrqDqeGVc=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "0ab2f858dfefe73402eb53fbe6a3bad4f6702d5f", "type": "github" }, "original": { @@ -315,11 +315,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1733651163, - "narHash": "sha256-8W0zp4rU63bRRYVOKK0Prl93Y9XmKFd25jbNZOSFaBo=", + "lastModified": 1734749715, + "narHash": "sha256-YHUevU8Y6dchCUGsDxJzkzNZnBcNQjAIxMdQJ1NMIek=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2a7e4cb2b7430e8f412e8046b558e1540f6fb8cf", + "rev": "4165fa3e7070c1252254ca61f8efeafdd2113293", "type": "github" }, "original": { @@ -348,11 +348,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733639139, - "narHash": "sha256-oQ7YwoK/Hhpal6URjypm+BEB3n2S8GAJQVG8sVLC0/I=", + "lastModified": 1734270275, + "narHash": "sha256-FfpxEVDPQ1qSDoLOqnSK2laM6oPklgZhd2YWzxOB8Ns=", "owner": "YaLTeR", "repo": "niri", - "rev": "9824321fc9499b9987f344308a5c5c69cb9b7a77", + "rev": "d35ad73e3572b0ac704b0c08928f53d0cfd1951f", "type": "github" }, "original": { @@ -368,11 +368,11 @@ ] }, "locked": { - "lastModified": 1734137637, - "narHash": "sha256-dwg29WDzbPpHZE81nZ10ufI6sBOXvNs2JFBIq0hydZE=", + "lastModified": 1734742251, + "narHash": "sha256-bamyP4/3Ryf9YGrWpg4xn/kG1uxb6YDduWrmdXuTWDk=", "owner": "nix-community", "repo": "nixpkgs-terraform-providers-bin", - "rev": "825e37026b465e9e63e65ecd492416887cfb4e85", + "rev": "e564c85806a714ed1bec187c7595882440320e85", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734694533, - "narHash": "sha256-OPww6Fzq7qnHctBcu6J9vmVdZ4NS8vpdG8JRvWm4i3s=", + "lastModified": 1734785024, + "narHash": "sha256-JbW30U7Vc3L9eRVvSnqswu3peu3NGsa4opCMh6aza2s=", "owner": "rebmit", "repo": "nix-exprs", - "rev": "4a958c802908b90f60f7aac2c85de433c86ec76c", + "rev": "89604613d41c5512d1b564ece404f0cf85781eb6", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -570,11 +570,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1732233710, - "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { diff --git a/home-manager/profiles/fontconfig/default.nix b/home-manager/profiles/fontconfig/default.nix index 8997b01..90d4a1f 100644 --- a/home-manager/profiles/fontconfig/default.nix +++ b/home-manager/profiles/fontconfig/default.nix @@ -6,7 +6,7 @@ noto-fonts-cjk-serif noto-fonts-emoji roboto-mono - (nerdfonts.override { fonts = [ "RobotoMono" ]; }) + nerd-fonts.roboto-mono ]; fonts.fontconfig.enable = true; diff --git a/nixos/modules/networking/netns/mntns.nix b/nixos/modules/networking/netns/mntns.nix index ef80eea..e8c3f7c 100644 --- a/nixos/modules/networking/netns/mntns.nix +++ b/nixos/modules/networking/netns/mntns.nix @@ -102,11 +102,9 @@ in unshare --mount=${mntnsPath} --propagation slave true nsenter --mount=${mntnsPath} bash ${pkgs.writeShellScript "netns-${name}-mntns-bind-mount" '' declare -A bind_mounts=( - ${ - concatMapStringsSep "\n" (d: '' - ["${d.mountPoint}"]="${d.hostPath}:${if d.isReadOnly then "ro" else "rw"}" - '') (attrValues bindMounts) - } + ${concatMapStringsSep "\n" (d: '' + ["${d.mountPoint}"]="${d.hostPath}:${if d.isReadOnly then "ro" else "rw"}" + '') (attrValues bindMounts)} ) for mount_point in "''${!bind_mounts[@]}"; do diff --git a/nixos/modules/services/enthalpy/exit.nix b/nixos/modules/services/enthalpy/exit.nix index fb7d317..441947b 100644 --- a/nixos/modules/services/enthalpy/exit.nix +++ b/nixos/modules/services/enthalpy/exit.nix @@ -54,11 +54,9 @@ in services.enthalpy.bird.config = '' protocol static { ipv6 sadr; - ${ - concatMapStringsSep "\n" (p: '' - route ${p.destination} from ${p.source} via fe80::ff:fe00:1 dev "host"; - '') birdPrefix - } + ${concatMapStringsSep "\n" (p: '' + route ${p.destination} from ${p.source} via fe80::ff:fe00:1 dev "host"; + '') birdPrefix} } ''; diff --git a/nixos/modules/system/sops-secrets.nix b/nixos/modules/system/sops-secrets.nix index 2642d56..2f79781 100644 --- a/nixos/modules/system/sops-secrets.nix +++ b/nixos/modules/system/sops-secrets.nix @@ -82,11 +82,9 @@ in gnupg.sshKeyPaths = [ ]; opentofuTemplate = '' { - ${ - lib.concatMapStringsSep "\n, " (cfg: ''"${cfg.name}": ${cfg.opentofu.jqPath}'') ( - lib.attrValues secretsFromOutputs - ) - } + ${lib.concatMapStringsSep "\n, " (cfg: ''"${cfg.name}": ${cfg.opentofu.jqPath}'') ( + lib.attrValues secretsFromOutputs + )} } ''; secretFiles = { diff --git a/nixos/profiles/services/prometheus/server.nix b/nixos/profiles/services/prometheus/server.nix index 851495c..275a482 100644 --- a/nixos/profiles/services/prometheus/server.nix +++ b/nixos/profiles/services/prometheus/server.nix @@ -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, ... }: let common = import ../../../../zones/common.nix;