From 2e37d918f3d1f2483bba9e7cf3681bed3f036665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 1 Jan 2023 20:51:19 +0100 Subject: [PATCH] Bump nixos-modules --- config/default.nix | 9 ------- flake.lock | 56 ++++++++++++++++++++-------------------- flake.nix | 2 +- hosts/auth/default.nix | 8 +++--- hosts/sshlog/default.nix | 3 --- 5 files changed, 33 insertions(+), 45 deletions(-) diff --git a/config/default.nix b/config/default.nix index acb9a454..2c051983 100644 --- a/config/default.nix +++ b/config/default.nix @@ -141,13 +141,4 @@ lib.mkMerge [ zramSwap.enable = true; } - - (lib.mkIf config.services.nginx.enable { - services.nginx = { - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - }; - }) ] diff --git a/flake.lock b/flake.lock index a2a42fd4..7215eee0 100644 --- a/flake.lock +++ b/flake.lock @@ -193,11 +193,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1672208605, - "narHash": "sha256-RkgnZ/pmInsjepD/rXsjMjJATAXt6npVlE3bJt+Fq0Q=", + "lastModified": 1672554122, + "narHash": "sha256-vTnoOiRQtjaqdW0Hmtz73GyWEcyQstifpoZ7QAscWyA=", "owner": "nix-community", "repo": "fenix", - "rev": "8310190b73709f0200fdca818f570623330be716", + "rev": "f62d27fa582511fe4d1c32855b8cb4c57e335d9d", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixos": { "locked": { - "lastModified": 1672260924, - "narHash": "sha256-u3fCEk63jBz43iYnHh47yKk1X3hJtU5FS/ou/xKSe0c=", + "lastModified": 1672435815, + "narHash": "sha256-eiSsVGKVJelhccfyvXGCWYU2nVyXtbvbkcgljXEBXBs=", "owner": "SuperSandro2000", "repo": "nixpkgs", - "rev": "89ea0b987148325c9ad9be6c694fada938f8c7cd", + "rev": "aadcb28f842b6bb1817c4a033b2bca406814c6fd", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671631481, - "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", + "lastModified": 1672566874, + "narHash": "sha256-/lmz3/xzdghGSFeCcTiKMjbj0uRmUqTZhh4HHeUJ++g=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", + "rev": "0517e81e8ce24a0f4f9eebedbd7bbefcac97c058", "type": "github" }, "original": { @@ -384,11 +384,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1671892664, - "narHash": "sha256-UFpcl8X8RmC9o913z0N7QJyij9fM69HlY7yL/bKAMWs=", + "lastModified": 1672601867, + "narHash": "sha256-AoIx6eGgYH1eX44rUbllDVZn6lTjUzC5vOZ55jXT5x4=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "50db3061f930636e8995e45b1585cfa4a22a5092", + "rev": "c6373412367897af4d5eeb53cabfc1858aab8983", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "openwrt": { "flake": false, "locked": { - "lastModified": 1671627231, - "narHash": "sha256-5kCj2cua5spl9gJZbiRgU7hacrFSAQTNoua9ixksv18=", + "lastModified": 1672491419, + "narHash": "sha256-/SKMlksnHYuLkhnKR0+gKJO7y0OdhsL1ScD3AHkU+Go=", "ref": "openwrt-21.02", - "rev": "18f05da13dcb4283f61c5a03fbdc48411df6b0f7", - "revCount": 51267, + "rev": "76c9c2b113a8d372b4b4c1a5ccc941fb895dbdf5", + "revCount": 51268, "type": "git", "url": "https://git.openwrt.org/openwrt/openwrt.git" }, @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1672218849, - "narHash": "sha256-9LVQJLtoCO0vZvUkv99OG4Bh1aZgGe41/hzfNxhWJIQ=", + "lastModified": 1672565412, + "narHash": "sha256-4E8fv3RpQ6CZxGENSkxzXODNcTZ7V+Vuhm29W2b081U=", "owner": "astro", "repo": "nix-openwrt-imagebuilder", - "rev": "3beea4b0cac5b42fdf2595c28db7c0818a74dae5", + "rev": "70d50cc4a6e5ffb196253a9abc7a5bc49350bcba", "type": "github" }, "original": { @@ -505,11 +505,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1672170363, - "narHash": "sha256-L2GkQGoKzYzmfa4OouCieT0zl2gxymsf/e/lnLoCQQU=", + "lastModified": 1672498287, + "narHash": "sha256-K2ywmLEJ32D0vtmMHmRUymX2FmHi+kklyLYYcyCV5QY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3033c3ddbfcb0e42084ada8931e88d11eb98dee4", + "rev": "f31733b1d61dd8ab2012bbe466838be244a96dd3", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1672280602, - "narHash": "sha256-aBO2MgTv8Pj24j+q0BKFHV5XmAuAn6+iw7AVNW4wUxc=", + "lastModified": 1672540392, + "narHash": "sha256-Ugd89sapoMnNG2IGC0goij+XXEGOtD70H5i1bCAiVxE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ede977678e5d0164316998487e686d0790744cd7", + "rev": "f17584a6e8f1f26b8d4606fa35d529466a015dc8", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1671937829, - "narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=", + "lastModified": 1672543202, + "narHash": "sha256-nlCUtcIZxaBqUBG1GyaXhZmfyG5WK4e6LqypP8llX9E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738", + "rev": "b35586cc5abacd4eba9ead138b53e2a60920f781", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea6acc5c..552298bc 100644 --- a/flake.nix +++ b/flake.nix @@ -247,7 +247,7 @@ ({ config, ... }: { _module.args = { inherit hostRegistry inputs zentralwerk; - libz = nixos-modules.lib { inherit lib config; }; + libS = nixos-modules.lib { inherit lib config; }; }; nixpkgs.overlays = overlayList; diff --git a/hosts/auth/default.nix b/hosts/auth/default.nix index 0b4eea57..f0a828b4 100644 --- a/hosts/auth/default.nix +++ b/hosts/auth/default.nix @@ -1,4 +1,4 @@ -{ config, lib, libz, ... }: +{ config, lib, libS, ... }: { c3d2.deployment.server = "server10"; @@ -48,9 +48,9 @@ sops = { defaultSopsFile = ./secrets.yaml; - secrets."dex/environment" = libz.sops.permissionForUser "dex"; - secrets."portunus/users/admin-password" = libz.sops.permissionForUser "portunus"; - secrets."portunus/users/search-password" = libz.sops.permissionForUser "portunus"; + secrets."dex/environment" = libS.sops.permissionForUser "dex"; + secrets."portunus/users/admin-password" = libS.sops.permissionForUser "portunus"; + secrets."portunus/users/search-password" = libS.sops.permissionForUser "portunus"; }; systemd.services.dex.serviceConfig = { diff --git a/hosts/sshlog/default.nix b/hosts/sshlog/default.nix index 235e4f1b..5c451ffb 100644 --- a/hosts/sshlog/default.nix +++ b/hosts/sshlog/default.nix @@ -15,9 +15,6 @@ services.nginx = { enable = true; - recommendedOptimisation = true; - recommendedTlsSettings = true; - recommendedGzipSettings = true; additionalModules = [ pkgs.nginxModules.fancyindex ]; virtualHosts."${config.networking.hostName}.flpk.zentralwerk.org" = { default = true;