dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: website shit part 2

Browse Source
This commit is contained in:
dusk 2024-08-24 14:40:13 +03:00
parent e93c846eda
commit 0b7be99858
Signed by: dusk
SSH Key Fingerprint: SHA256:Abmvag+juovVufZTxyWY8KcVgrznxvBjQpJesv071Aw
6 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
flake.lock
View File

@ -100,11 +100,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1724426642, "lastModified": 1724499372,
"narHash": "sha256-DlW/MK7fq5G0qjYdNVP4CmRIHZY0auplLPlDBdMt7z8=", "narHash": "sha256-xUaqVgunsc7x9iQWozV+I+spSnGLUDwzNL9uHqtJCqg=",
"ref": "refs/heads/svelte", "ref": "refs/heads/svelte",
"rev": "b5fda85147a84df98c6de82b75a638d16ad09ae6", "rev": "4f8160830325cc0d03f6cf8cd1d52f650a1d58e2",
"revCount": 101, "revCount": 118,
"type": "git", "type": "git",
"url": "https://git.gaze.systems/dusk/website.git" "url": "https://git.gaze.systems/dusk/website.git"
}, },
@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721379485, "lastModified": 1724351785,
"narHash": "sha256-Pcfv3IB4yGiSC4N5BqD6T9u+YYBiwjJ+VGzg0WGCjK8=", "narHash": "sha256-LyW+qD+k32iTzv9rqauasykzzSwNs8ryHzE2ISV7Bwc=",
"owner": "famedly", "owner": "famedly",
"repo": "conduit", "repo": "conduit",
"rev": "44dd21f432a22c82adab77c25469c336976f4081", "rev": "a9c386728767ac9295ba6c362a68364f0a322fbd",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1723657484, "lastModified": 1724401716,
"narHash": "sha256-oSxczvhDKCc/ilTPiMz46RmTLhyBoVxhGWhp7Ee54eA=", "narHash": "sha256-LXTYUVhv6Kz9Iy9DxXSI0J+2/hunUj2fj0Kvw2eDarQ=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "ff33b07756548935577aefc15cf48a1beb27b162", "rev": "620dfceb849d6b68d41d4f7678bb4675009fef4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -795,11 +795,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1724435763,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1037,11 +1037,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723021300, "lastModified": 1724141100,
"narHash": "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=", "narHash": "sha256-SDj8ZMeDZtVBu8EZV/Ul2Im77kyWJRQ2KJX0Sd7Cu1M=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "ea9053852f8575f650ca0080b2cac6735c7447f7", "rev": "3dc7cdc5d17cccf2e81540e320f4faa95020767b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1075,11 +1075,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1723381807, "lastModified": 1724296831,
"narHash": "sha256-tBvNlNvI3xRjmfUuzwgwWFrk+SO50wlrmAGRuG3Yzi4=", "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "c9d8970a646dbaa82981d050d905637a29bbdd21", "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1110,11 +1110,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1723310128, "lastModified": 1724067415,
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1125,11 +1125,11 @@
}, },
"nixos-persistence": { "nixos-persistence": {
"locked": { "locked": {
"lastModified": 1719091691, "lastModified": 1724146542,
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "rev": "03fe473c731cda2900bae9894b8dfc68e3492db5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1147,11 +1147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723124175, "lastModified": 1724065442,
"narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1220,11 +1220,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1723709699, "lastModified": 1724458654,
"narHash": "sha256-CqYRTfFF1g/hc0qDAwAuxVzhrZsobkvS+M8HYxl2a5c=", "narHash": "sha256-3xLUbzQrr1x1SsH2neYOYdry3uN/mZVEVaCKfR1ehIs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "28241a6d6fd474626497282de7edf10b56961441", "rev": "a2f47ce51ce3b17fcdcb5e5142c8e82069814978",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1300,11 +1300,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1724224976,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1324,11 +1324,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1722338736, "lastModified": 1724368485,
"narHash": "sha256-bSnWgJ7eXgHZ/pwL7+NTDGfOzsbOiw899BV3k7TawWE=", "narHash": "sha256-/MzkcvJN8zN+y5vevpT6OQJXTb+sSpxQA0iywn9CD+A=",
"owner": "oddlama", "owner": "oddlama",
"repo": "nix-topology", "repo": "nix-topology",
"rev": "870dcc9074077a327220b36597098c295944a47d", "rev": "1826fe50f19dd076f13ede0254e170247e0afb06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1339,11 +1339,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1723710354, "lastModified": 1724445072,
"narHash": "sha256-y235fl/DUuGZk2Bs+WV5M0NMu7v6dfnSmY1dxGxD3hg=", "narHash": "sha256-TgsUi8yQMbCwPgnkCwtp6Zz9m1uUcjnGVFH5MxPo99Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4e8eca8729026d62258146706bd40ec237b4fa86", "rev": "32938b2196ffbd94c848d0ebab5a027829c3080e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1797,11 +1797,11 @@
"src": "src_2" "src": "src_2"
}, },
"locked": { "locked": {
"lastModified": 1723616811, "lastModified": 1724394407,
"narHash": "sha256-jmLwO02XNaV6GW8jct9b0A1jBHcRMrb3L67JVjAZptQ=", "narHash": "sha256-1Tui9GpnOA/W/OpZYP9hYHoerM5obs9hbZ9luCIRSfw=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "s3s-flake", "repo": "s3s-flake",
"rev": "c0d7504df87115e6ce5af1d298a07e782af26345", "rev": "bd5d67e891477f8bd367c75956ed5be7b437b298",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2223,11 +2223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723685172, "lastModified": 1724432994,
"narHash": "sha256-TXrwOBvk9yQnfS9zgyG6jWJA7bK+UVfnSoGX1Gp4/uU=", "narHash": "sha256-mGzDkfXE6cVrHcQsYOA+16FXfwkef6f5Gjh0YVLCHoY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "e470c879f34c9f3915d7f1fe95c33f9a958f8c10", "rev": "2c15c14f9d4485b18d7cec54081bdfd76335cfc8",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
hosts/wolumonde/modules/blog.nix
View File

@ -1,4 +1,5 @@
{ {
config,
pkgs, pkgs,
inputs, inputs,
... ...
@ -20,17 +21,18 @@ in {
description = "website"; description = "website";
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
after = ["network.target" "guestbook.service"]; after = ["network.target" "guestbook.service"];
environment = {
HOME = "/var/lib/website";
ORIGIN = PUBLIC_BASE_URL;
PORT = toString port;
};
serviceConfig = { serviceConfig = {
User = "website"; User = "website";
ExecStart = "${pkg}/bin/website"; ExecStart = "${pkg}/bin/website";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 5; RestartSec = 5;
WorkingDirectory = "/var/lib/website"; WorkingDirectory = "/var/lib/website";
Environment = "HOME=/var/lib/website"; EnvironmentFile = config.age.secrets.websiteConfig.path;
EnvironmentFile = pkgs.writeText "website-env" ''
ORIGIN="${PUBLIC_BASE_URL}"
PORT=${toString port}
'';
}; };
}; };

1
hosts/wolumonde/modules/secrets.nix
View File

@ -8,4 +8,5 @@
}; };
age.secrets.musikquadConfig.file = ../../../secrets/musikquadConfig.age; age.secrets.musikquadConfig.file = ../../../secrets/musikquadConfig.age;
age.secrets.tmodloaderServerPass.file = ../../../secrets/tmodloaderServerPass.age; age.secrets.tmodloaderServerPass.file = ../../../secrets/tmodloaderServerPass.age;
age.secrets.websiteConfig.file = ../../../secrets/websiteConfig.age;
} }

2
hosts/wsl/default.nix
View File

@ -24,7 +24,7 @@
environment.systemPackages = [pkgs.wget]; environment.systemPackages = [pkgs.wget];
environment.sessionVariables = { environment.sessionVariables = {
FLAKE = "/home/firewatch/conf"; FLAKE = "/home/firewatch/ark";
}; };
# for tailscale # for tailscale

1
secrets/secrets.nix
View File

@ -9,4 +9,5 @@ in {
"nixGithubAccessToken.age".publicKeys = [yusdacra]; "nixGithubAccessToken.age".publicKeys = [yusdacra];
"nixBuildKey.age".publicKeys = [yusdacra]; "nixBuildKey.age".publicKeys = [yusdacra];
"tmodloaderServerPass.age".publicKeys = [yusdacra wolumonde]; "tmodloaderServerPass.age".publicKeys = [yusdacra wolumonde];
"websiteConfig.age".publicKeys = [yusdacra wolumonde];
} }

BIN
secrets/websiteConfig.age Normal file
View File

Binary file not shown.