1
0
Fork 0

Update deps

This commit is contained in:
Daniel Kempkens 2023-07-04 19:38:57 +02:00
parent 2fa64cdfe7
commit 97c0ea0cd5
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 33 additions and 21 deletions

View file

@ -152,11 +152,11 @@
]
},
"locked": {
"lastModified": 1687968164,
"narHash": "sha256-L9jr2zCB6NIaBE3towusjGBigsnE2pMID8wBGkYbTS4=",
"lastModified": 1688486545,
"narHash": "sha256-rtFPwSOpqmf1PZgx7w0vgjOI/RI8b1AHdVZN1WQqilA=",
"owner": "nix-community",
"repo": "disko",
"rev": "8002e7cb899bc2a02a2ebfb7f999fcd7c18b92a1",
"rev": "15c4d57b41b6b57024aec015e5d30a4ed4713034",
"type": "github"
},
"original": {
@ -276,11 +276,11 @@
]
},
"locked": {
"lastModified": 1688409282,
"narHash": "sha256-nnVCN5QiZ5+DEc70PRQLEcxqlxtsmeBU1BnpsRPUJlA=",
"lastModified": 1688467264,
"narHash": "sha256-AUQP1WtmBb36bRc41p5ieTwq6Y8pgiKurbdrsPeP3fg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c24deeca64538dcbc589ed8da9146e4ca9eb85b7",
"rev": "b406b8d1bc90f6cd3e120d189b3e929f17ca4aea",
"type": "github"
},
"original": {
@ -355,11 +355,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1688403656,
"narHash": "sha256-zmNai3dKWUCKpKubPWsEJ1Q7od96KebWVDJNCnk+fr0=",
"lastModified": 1688465017,
"narHash": "sha256-xzFcCnzPOgQaX7Acprfqo+tqHJ2UKWC38pXrcqvdXHU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "453da3c28f7a95374b73d1f3fd665dd40e6049e9",
"rev": "0d5682acc109add20f70440269587a1b169cc2fe",
"type": "github"
},
"original": {

View file

@ -85,12 +85,12 @@ in
};
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-07-03";
version = "2023-07-04";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "108222ea59109e9b5e4d76930842ddc8d60d8e9e";
sha256 = "0gl7ql5pixzzq64z67dps74zp2ki3ls0c8nkq32zy88xlyr4y7xb";
rev = "8facf2eb6a378fd7691dce8c8a7b2726823e2408";
sha256 = "185zil8r41dz981qjmj241zri5iswfafqsx9racvsg87gcvysggn";
fetchSubmodules = false;
};
};
@ -111,8 +111,8 @@ in
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "c9bb5a5a7f960294cf1b3fb12a33949c04634456";
sha256 = "16fqdpknvj1pzdpnzlr1qxpcr9qq2067w8gmwkrk3f51wgwkjz40";
rev = "896f2c76229f03d6978d29fa7b12421d7c18102f";
sha256 = "1rapiq1vcggz3m5i1gcl2d7a2sl1w0qayx06j4s7yl99340xdllq";
fetchSubmodules = false;
};
};
@ -539,12 +539,12 @@ in
};
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2023-06-20";
version = "2023-07-04";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "a36bc3360d584d39b4fb076d855c4180842d4444";
sha256 = "1kq2ykmpagan4d4anjv8s8dp2gi22n8paqzkk933zr5azd9q6pjp";
rev = "dc2962f7fce953a2a98e7c6d3d7fc4c1d1f66758";
sha256 = "17rbsnfdrjfni1nc7say8yy9z1nc7agz8f5484wg3bhlbh28x28n";
fetchSubmodules = false;
};
};

View file

@ -48,7 +48,7 @@ rec {
};
deployment = {
hostname = "94.130.142.168";
hostname = "tanker";
sshUser = "root";
remoteBuild = true;
autoRollback = false;

View file

@ -11,8 +11,8 @@ in
systemd.services.fedifetcher = {
description = "FediFetcher";
wants = [ "mastodon-web.service" ];
after = [ "mastodon-web.service" ];
wants = [ "mastodon-web.service" "mastodon-wait-for-available.service" ];
after = [ "mastodon-web.service" "mastodon-wait-for-available.service" ];
# wantedBy = [ "multi-user.target" ];
startAt = "*:0/25";

View file

@ -1,4 +1,4 @@
{ config, ... }:
{ pkgs, config, ... }:
let
web-domain = "mastodon.kempkens.io";
@ -63,6 +63,18 @@ in
extraEnvFiles = [ config.age.secrets.mastodon-extra-config.path ];
};
# For services that connect to Mastodon
systemd.services.mastodon-wait-for-available = {
description = "Wait for Mastodon to be available";
after = [ "mastodon-web.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.bash}/bin/bash -c 'until ${pkgs.curl}/bin/curl --fail --silent https://${web-domain} > /dev/null; do sleep 1; done'";
};
};
services.nginx.virtualHosts."${web-domain}" = {
quic = true;
http3 = true;