Compare commits

...

7 commits

Author SHA1 Message Date
d41383887d
update screen lock timer 2024-06-17 09:39:15 +02:00
152d1866d7
update gts 2024-06-17 09:38:58 +02:00
f30a09130f
allow plain http on website 2024-06-17 09:38:42 +02:00
4e7b4bd1c0
flake.lock: Update
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=d70ce45178e075ab92f94f006441af3811d00e93' (2024-06-12)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=dd5c41f7175513be657367f6819fcdf4a64a0fb5' (2024-06-12)
2024-06-12 15:43:58 +02:00
ac59c4a4f3
flake.lock: Update
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=c0c6a0d319fea9c14da44e72abec12ba278092e7' (2024-06-12)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=d70ce45178e075ab92f94f006441af3811d00e93' (2024-06-12)
2024-06-12 15:39:58 +02:00
2f43746855
flake.lock: Update
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=25db84eb151eb602360b0ef0c550f230a14425df' (2024-06-12)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=c0c6a0d319fea9c14da44e72abec12ba278092e7' (2024-06-12)
2024-06-12 15:35:59 +02:00
bf67907e23
flake.lock: Update
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=65dc941852bc552755e6fc49e461b5d4391e2bad' (2024-06-07)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=25db84eb151eb602360b0ef0c550f230a14425df' (2024-06-12)
2024-06-12 15:15:25 +02:00
4 changed files with 9 additions and 9 deletions

View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717764638, "lastModified": 1718199808,
"narHash": "sha256-gFq0wpux9QZi/oL02zCW5ci91D1GBC64nZTbt6lvdXo=", "narHash": "sha256-w6CguX9/wdsffneEXyLftPaZKwHU0w9Cc9aBExS9cAE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "65dc941852bc552755e6fc49e461b5d4391e2bad", "rev": "dd5c41f7175513be657367f6819fcdf4a64a0fb5",
"revCount": 45, "revCount": 51,
"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;";
forceSSL = true; addSSL = 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-rc2"; version = "0.16.0-rc3";
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-fufQP9xaaaVBrgFSunDn9/jQd6eUMXqGL7TcoQHatnI="; hash = "sha256-HlpctwO58owAbPc3BJpid1LP8B956L7HqWI10iy3jOU=";
}; };
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-+H4rpUgjDlCc6tEIGTzkPYktwo9aCWgXr5sln8M6DNk="; hash = "sha256-jmVOMuBaojoCVCXsvcfDSsj+Oy0gosk2QQr2Paa5qL0=";
}; };
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 = 300; command = lockCommand; } { timeout = 900; command = lockCommand; }
{ timeout = 1800; command = "systemctl hybrid-sleep"; } { timeout = 1800; command = "systemctl hybrid-sleep"; }
]; ];
}; };