From 0038d9c987c80355cd128ffefa410ce68ded3980 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sun, 20 Nov 2022 04:44:22 +0000 Subject: [PATCH] Update nixpkgs and home-manager --- flake.lock | 36 +++++++++---------- home-manager/modules/common.nix | 4 ++- .../vms/shill/containers/middleman/vhosts.nix | 3 +- .../colony/vms/shill/containers/toot.nix | 14 ++++---- nixos/boxes/colony/vms/shill/default.nix | 4 +-- 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e702e02..9377408 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1667677389, - "narHash": "sha256-y9Zdq8vtsn0T5TO1iTvWA7JndYIAGjzCjbYVi/hOSmA=", + "lastModified": 1667907331, + "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "owner": "nix-community", "repo": "home-manager", - "rev": "87d55517f6f36aa1afbd7a4a064869d5a1d405b8", + "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1667708081, - "narHash": "sha256-FChEy05x4ed/pttjfTeKxjPCnHknMYrUtDyBiYbreT4=", + "lastModified": 1668900402, + "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ef0da321217c6c19b7a30509631c080a19321e5", + "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1666466514, - "narHash": "sha256-9xglfRPdSBjrgMEBpI4nx2KOw+0ugH43GcJyNCC5lNw=", + "lastModified": 1668912601, + "narHash": "sha256-3NYOKMIy+9yZ0i79n7/gDOG4larQDyP93yhLvocAhLI=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "d104dc81f17093341988f3d93053ceac7a0a698c", + "rev": "b72bbaaf21d31f67df455e1584f2dff02d799896", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1666466537, - "narHash": "sha256-W94lIPqOQuFxQcZYrUjgto1f2vjEkarAArqHGs1UxiE=", + "lastModified": 1668912632, + "narHash": "sha256-Xv+VEgkAxDsj572ggD/KBDzkO6//ltLpH80fy0h2vNI=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "153b432268ffd9e095effa2c969184a9d5a2601a", + "rev": "3419fa265d67829f922d0dcbe865bc915f93f885", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1667653703, - "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", + "lastModified": 1668766498, + "narHash": "sha256-UjZlIrbHGlL3H3HZNPTxPSwJfr49jIfbPWCYxk0EQm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09ad462c5a121d0239fde645aacb2221553a217", + "rev": "f42a45c015f28ac3beeb0df360e50cdbf495d44b", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1667629849, - "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "type": "github" }, "original": { diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index 633f0ac..9cb94ce 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -46,7 +46,7 @@ in }; nix = { - package = pkgs.nix; + package = mkIf (!(versionAtLeast config.home.stateVersion "22.11")) pkgs.nix; settings = { experimental-features = [ "nix-command" "flakes" "ca-derivations" ]; max-jobs = mkDefault "auto"; @@ -242,6 +242,8 @@ in ssh.authKeys.files = [ lib.my.sshKeyFiles.me ]; }; + nix.package = mkIf (versionAtLeast config.home.stateVersion "22.05") pkgs.nix; + fonts.fontconfig.enable = true; home = { diff --git a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix index 125c8ad..ac816d4 100644 --- a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix +++ b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix @@ -191,8 +191,9 @@ in ${headers} ''; root = pkgs.element-web.override { + # Currently it seems like single quotes aren't escaped like they should be... conf = { - brand = "/dev/player0's Matrix"; + brand = "/dev/player0 Matrix"; showLabsSettings = true; disable_guests = true; default_server_config = { diff --git a/nixos/boxes/colony/vms/shill/containers/toot.nix b/nixos/boxes/colony/vms/shill/containers/toot.nix index 79e94e0..2b60f72 100644 --- a/nixos/boxes/colony/vms/shill/containers/toot.nix +++ b/nixos/boxes/colony/vms/shill/containers/toot.nix @@ -17,7 +17,7 @@ configuration = { lib, pkgs, config, assignments, allAssignments, ... }: let - inherit (lib) mkMerge mkIf genAttrs; + inherit (lib) mkMerge mkIf genAttrs mkBefore; inherit (lib.my) networkdAssignment; in { @@ -61,6 +61,9 @@ mastodon-init-dirs.script = '' echo "AWS_SECRET_ACCESS_KEY=\""$(< ${config.age.secrets."toot/s3-secret-key.txt".path})"\"" >> /var/lib/mastodon/.secrets_env ''; + mastodon-init-db = { + after = [ "systemd-networkd-wait-online.service" ]; + }; # Can't use the extraConfig because these services expect a different format for the both family bind address... mastodon-streaming.environment.BIND = "::"; @@ -108,11 +111,10 @@ redis.createLocally = true; - # TODO: Re-enable when nixpkgs is updated - #mediaAutoRemove = { - # enable = true; - # olderThanDays = 30; - #}; + mediaAutoRemove = { + enable = true; + olderThanDays = 30; + }; } { extraConfig = { diff --git a/nixos/boxes/colony/vms/shill/default.nix b/nixos/boxes/colony/vms/shill/default.nix index c394e13..8a0735e 100644 --- a/nixos/boxes/colony/vms/shill/default.nix +++ b/nixos/boxes/colony/vms/shill/default.nix @@ -42,8 +42,8 @@ kernelParams = [ "console=ttyS0,115200n8" ]; # Stolen from nixos/modules/services/torrent/transmission.nix kernel.sysctl = { - "net.core.rmem_max" = "4194304"; # 4MB - "net.core.wmem_max" = "1048576"; # 1MB + "net.core.rmem_max" = 4194304; # 4MB + "net.core.wmem_max" = 1048576; # 1MB "net.ipv4.ip_local_port_range" = "16384 65535"; #"net.netfilter.nf_conntrack_generic_timeout" = 60; #"net.netfilter.nf_conntrack_tcp_timeout_established" = 600;