Compare commits

..

No commits in common. "d41383887d541740681d30fb24538493e9049d97" and "23a5dbf2621ad051427fe8cfaa9c8229aa4a017d" have entirely different histories.

4 changed files with 9 additions and 9 deletions

View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718199808, "lastModified": 1717764638,
"narHash": "sha256-w6CguX9/wdsffneEXyLftPaZKwHU0w9Cc9aBExS9cAE=", "narHash": "sha256-gFq0wpux9QZi/oL02zCW5ci91D1GBC64nZTbt6lvdXo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "dd5c41f7175513be657367f6819fcdf4a64a0fb5", "rev": "65dc941852bc552755e6fc49e461b5d4391e2bad",
"revCount": 51, "revCount": 45,
"type": "git", "type": "git",
"url": "https://git.cherrykitten.dev/sammy/cherrykitten.dev" "url": "https://git.cherrykitten.dev/sammy/cherrykitten.dev"
}, },

View file

@ -4,7 +4,7 @@
virtualHosts = { virtualHosts = {
"cherrykitten.dev" = { "cherrykitten.dev" = {
extraConfig = "error_page 404 /404.html;"; extraConfig = "error_page 404 /404.html;";
addSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations = { locations = {
"/" = { "/" = {

View file

@ -1,10 +1,10 @@
final: prev: { final: prev: {
gotosocial = gotosocial =
let let
version = "0.16.0-rc3"; version = "0.16.0-rc2";
web-assets = prev.fetchurl { web-assets = prev.fetchurl {
url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v${version}/gotosocial_${version}_web-assets.tar.gz"; url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v${version}/gotosocial_${version}_web-assets.tar.gz";
hash = "sha256-HlpctwO58owAbPc3BJpid1LP8B956L7HqWI10iy3jOU="; hash = "sha256-fufQP9xaaaVBrgFSunDn9/jQd6eUMXqGL7TcoQHatnI=";
}; };
in in
prev.gotosocial.overrideAttrs { prev.gotosocial.overrideAttrs {
@ -14,7 +14,7 @@ final: prev: {
owner = "superseriousbusiness"; owner = "superseriousbusiness";
repo = "gotosocial"; repo = "gotosocial";
rev = "refs/tags/v${ version }"; rev = "refs/tags/v${ version }";
hash = "sha256-jmVOMuBaojoCVCXsvcfDSsj+Oy0gosk2QQr2Paa5qL0="; hash = "sha256-+H4rpUgjDlCc6tEIGTzkPYktwo9aCWgXr5sln8M6DNk=";
}; };
postInstall = '' postInstall = ''
tar xf ${web-assets} tar xf ${web-assets}

View file

@ -47,7 +47,7 @@
{ event = "lock"; command = lockCommand; } { event = "lock"; command = lockCommand; }
]; ];
timeouts = [ timeouts = [
{ timeout = 900; command = lockCommand; } { timeout = 300; command = lockCommand; }
{ timeout = 1800; command = "systemctl hybrid-sleep"; } { timeout = 1800; command = "systemctl hybrid-sleep"; }
]; ];
}; };