diff --git a/configuration.nix b/configuration.nix index 6964446..00d8e64 100644 --- a/configuration.nix +++ b/configuration.nix @@ -43,6 +43,8 @@ # KEEP UNTIL 2028 ./services/caddy_senior_project.nix + + ./services/graphing-calculator.nix ]; services.kmscon.enable = true; diff --git a/flake.lock b/flake.lock index b032a4b..3c22474 100644 --- a/flake.lock +++ b/flake.lock @@ -186,6 +186,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -375,6 +393,22 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -414,7 +448,8 @@ "srvos": "srvos", "trackerlist": "trackerlist", "vpn-confinement": "vpn-confinement", - "website": "website" + "website": "website", + "ytbn-graphing-software": "ytbn-graphing-software" } }, "rust-overlay": { @@ -438,6 +473,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "ytbn-graphing-software", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "senior_project-website": { "flake": false, "locked": { @@ -519,6 +575,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "trackerlist": { "flake": false, "locked": { @@ -583,6 +654,26 @@ "type": "git", "url": "https://git.gardling.com/titaniumtown/website" } + }, + "ytbn-graphing-software": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1764788919, + "narHash": "sha256-ssFiVs95TfYSypd9z0DOfg9Uxca95gS5YRIk/smOzis=", + "ref": "refs/heads/main", + "rev": "a21fc048ad7fd54947ee62c3d8e2d5c4371121dd", + "revCount": 1079, + "type": "git", + "url": "https://git.gardling.com/titaniumtown/YTBN-Graphing-Software" + }, + "original": { + "type": "git", + "url": "https://git.gardling.com/titaniumtown/YTBN-Graphing-Software" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7e28d5e..54f8dfe 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,10 @@ url = "github:ngosang/trackerslist"; flake = false; }; + + ytbn-graphing-software = { + url = "git+https://git.gardling.com/titaniumtown/YTBN-Graphing-Software"; + }; }; outputs = diff --git a/services/graphing-calculator.nix b/services/graphing-calculator.nix new file mode 100644 index 0000000..51bd6d9 --- /dev/null +++ b/services/graphing-calculator.nix @@ -0,0 +1,15 @@ +{ + service_configs, + inputs, + pkgs, + ... +}: +let + graphing-calculator = inputs.ytbn-graphing-software.packages.${pkgs.system}.web; +in +{ + services.caddy.virtualHosts."graphing.${service_configs.https.domain}".extraConfig = '' + root * ${graphing-calculator} + file_server browse + ''; +}