diff --git a/flake.lock b/flake.lock index 2a91989..d7c350a 100644 --- a/flake.lock +++ b/flake.lock @@ -100,11 +100,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1724426642, - "narHash": "sha256-DlW/MK7fq5G0qjYdNVP4CmRIHZY0auplLPlDBdMt7z8=", + "lastModified": 1724499372, + "narHash": "sha256-xUaqVgunsc7x9iQWozV+I+spSnGLUDwzNL9uHqtJCqg=", "ref": "refs/heads/svelte", - "rev": "b5fda85147a84df98c6de82b75a638d16ad09ae6", - "revCount": 101, + "rev": "4f8160830325cc0d03f6cf8cd1d52f650a1d58e2", + "revCount": 118, "type": "git", "url": "https://git.gaze.systems/dusk/website.git" }, @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1721379485, - "narHash": "sha256-Pcfv3IB4yGiSC4N5BqD6T9u+YYBiwjJ+VGzg0WGCjK8=", + "lastModified": 1724351785, + "narHash": "sha256-LyW+qD+k32iTzv9rqauasykzzSwNs8ryHzE2ISV7Bwc=", "owner": "famedly", "repo": "conduit", - "rev": "44dd21f432a22c82adab77c25469c336976f4081", + "rev": "a9c386728767ac9295ba6c362a68364f0a322fbd", "type": "gitlab" }, "original": { @@ -775,11 +775,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723657484, - "narHash": "sha256-oSxczvhDKCc/ilTPiMz46RmTLhyBoVxhGWhp7Ee54eA=", + "lastModified": 1724401716, + "narHash": "sha256-LXTYUVhv6Kz9Iy9DxXSI0J+2/hunUj2fj0Kvw2eDarQ=", "owner": "helix-editor", "repo": "helix", - "rev": "ff33b07756548935577aefc15cf48a1beb27b162", + "rev": "620dfceb849d6b68d41d4f7678bb4675009fef4d", "type": "github" }, "original": { @@ -795,11 +795,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -1037,11 +1037,11 @@ ] }, "locked": { - "lastModified": 1723021300, - "narHash": "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=", + "lastModified": 1724141100, + "narHash": "sha256-SDj8ZMeDZtVBu8EZV/Ul2Im77kyWJRQ2KJX0Sd7Cu1M=", "owner": "viperML", "repo": "nh", - "rev": "ea9053852f8575f650ca0080b2cac6735c7447f7", + "rev": "3dc7cdc5d17cccf2e81540e320f4faa95020767b", "type": "github" }, "original": { @@ -1075,11 +1075,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723381807, - "narHash": "sha256-tBvNlNvI3xRjmfUuzwgwWFrk+SO50wlrmAGRuG3Yzi4=", + "lastModified": 1724296831, + "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=", "owner": "nix-community", "repo": "nixd", - "rev": "c9d8970a646dbaa82981d050d905637a29bbdd21", + "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88", "type": "github" }, "original": { @@ -1110,11 +1110,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724067415, + "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "type": "github" }, "original": { @@ -1125,11 +1125,11 @@ }, "nixos-persistence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1724146542, + "narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "03fe473c731cda2900bae9894b8dfc68e3492db5", "type": "github" }, "original": { @@ -1147,11 +1147,11 @@ ] }, "locked": { - "lastModified": 1723124175, - "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", + "lastModified": 1724065442, + "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", + "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2", "type": "github" }, "original": { @@ -1220,11 +1220,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1723709699, - "narHash": "sha256-CqYRTfFF1g/hc0qDAwAuxVzhrZsobkvS+M8HYxl2a5c=", + "lastModified": 1724458654, + "narHash": "sha256-3xLUbzQrr1x1SsH2neYOYdry3uN/mZVEVaCKfR1ehIs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "28241a6d6fd474626497282de7edf10b56961441", + "rev": "a2f47ce51ce3b17fcdcb5e5142c8e82069814978", "type": "github" }, "original": { @@ -1300,11 +1300,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -1324,11 +1324,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1722338736, - "narHash": "sha256-bSnWgJ7eXgHZ/pwL7+NTDGfOzsbOiw899BV3k7TawWE=", + "lastModified": 1724368485, + "narHash": "sha256-/MzkcvJN8zN+y5vevpT6OQJXTb+sSpxQA0iywn9CD+A=", "owner": "oddlama", "repo": "nix-topology", - "rev": "870dcc9074077a327220b36597098c295944a47d", + "rev": "1826fe50f19dd076f13ede0254e170247e0afb06", "type": "github" }, "original": { @@ -1339,11 +1339,11 @@ }, "nur": { "locked": { - "lastModified": 1723710354, - "narHash": "sha256-y235fl/DUuGZk2Bs+WV5M0NMu7v6dfnSmY1dxGxD3hg=", + "lastModified": 1724445072, + "narHash": "sha256-TgsUi8yQMbCwPgnkCwtp6Zz9m1uUcjnGVFH5MxPo99Q=", "owner": "nix-community", "repo": "NUR", - "rev": "4e8eca8729026d62258146706bd40ec237b4fa86", + "rev": "32938b2196ffbd94c848d0ebab5a027829c3080e", "type": "github" }, "original": { @@ -1797,11 +1797,11 @@ "src": "src_2" }, "locked": { - "lastModified": 1723616811, - "narHash": "sha256-jmLwO02XNaV6GW8jct9b0A1jBHcRMrb3L67JVjAZptQ=", + "lastModified": 1724394407, + "narHash": "sha256-1Tui9GpnOA/W/OpZYP9hYHoerM5obs9hbZ9luCIRSfw=", "owner": "yusdacra", "repo": "s3s-flake", - "rev": "c0d7504df87115e6ce5af1d298a07e782af26345", + "rev": "bd5d67e891477f8bd367c75956ed5be7b437b298", "type": "github" }, "original": { @@ -2223,11 +2223,11 @@ ] }, "locked": { - "lastModified": 1723685172, - "narHash": "sha256-TXrwOBvk9yQnfS9zgyG6jWJA7bK+UVfnSoGX1Gp4/uU=", + "lastModified": 1724432994, + "narHash": "sha256-mGzDkfXE6cVrHcQsYOA+16FXfwkef6f5Gjh0YVLCHoY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e470c879f34c9f3915d7f1fe95c33f9a958f8c10", + "rev": "2c15c14f9d4485b18d7cec54081bdfd76335cfc8", "type": "github" }, "original": { diff --git a/hosts/wolumonde/modules/blog.nix b/hosts/wolumonde/modules/blog.nix index 0e1242e..9be581b 100644 --- a/hosts/wolumonde/modules/blog.nix +++ b/hosts/wolumonde/modules/blog.nix @@ -1,4 +1,5 @@ { + config, pkgs, inputs, ... @@ -20,17 +21,18 @@ in { description = "website"; wantedBy = ["multi-user.target"]; after = ["network.target" "guestbook.service"]; + environment = { + HOME = "/var/lib/website"; + ORIGIN = PUBLIC_BASE_URL; + PORT = toString port; + }; serviceConfig = { User = "website"; ExecStart = "${pkg}/bin/website"; Restart = "on-failure"; RestartSec = 5; WorkingDirectory = "/var/lib/website"; - Environment = "HOME=/var/lib/website"; - EnvironmentFile = pkgs.writeText "website-env" '' - ORIGIN="${PUBLIC_BASE_URL}" - PORT=${toString port} - ''; + EnvironmentFile = config.age.secrets.websiteConfig.path; }; }; diff --git a/hosts/wolumonde/modules/secrets.nix b/hosts/wolumonde/modules/secrets.nix index 0c82edb..78e19d0 100644 --- a/hosts/wolumonde/modules/secrets.nix +++ b/hosts/wolumonde/modules/secrets.nix @@ -8,4 +8,5 @@ }; age.secrets.musikquadConfig.file = ../../../secrets/musikquadConfig.age; age.secrets.tmodloaderServerPass.file = ../../../secrets/tmodloaderServerPass.age; + age.secrets.websiteConfig.file = ../../../secrets/websiteConfig.age; } diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix index 1eb68dd..be55ff6 100644 --- a/hosts/wsl/default.nix +++ b/hosts/wsl/default.nix @@ -24,7 +24,7 @@ environment.systemPackages = [pkgs.wget]; environment.sessionVariables = { - FLAKE = "/home/firewatch/conf"; + FLAKE = "/home/firewatch/ark"; }; # for tailscale diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 025d33c..a056d21 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -9,4 +9,5 @@ in { "nixGithubAccessToken.age".publicKeys = [yusdacra]; "nixBuildKey.age".publicKeys = [yusdacra]; "tmodloaderServerPass.age".publicKeys = [yusdacra wolumonde]; + "websiteConfig.age".publicKeys = [yusdacra wolumonde]; } diff --git a/secrets/websiteConfig.age b/secrets/websiteConfig.age new file mode 100644 index 0000000..f45fdba Binary files /dev/null and b/secrets/websiteConfig.age differ