diff --git a/flake.lock b/flake.lock index da4a576..fca5f33 100644 --- a/flake.lock +++ b/flake.lock @@ -69,25 +69,6 @@ "type": "github" } }, - "gakuen-cosplay": { - "inputs": { - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1742093995, - "narHash": "sha256-9xjCwI87xXYO7FG+Jc9abERmZ3RyECDx8caBIOK/PTw=", - "ref": "refs/heads/main", - "rev": "6ad26e18a52e0141824014936a5574dfd91ff6f4", - "revCount": 32, - "type": "git", - "url": "file:///mnt/internal/shared/work/gakuen/projects/cosplayer_submission" - }, - "original": { - "type": "git", - "url": "file:///mnt/internal/shared/work/gakuen/projects/cosplayer_submission" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -133,8 +114,8 @@ "hydractify-bot": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_3", - "utils": "utils_2" + "nixpkgs": "nixpkgs_2", + "utils": "utils" }, "locked": { "lastModified": 1736510643, @@ -218,9 +199,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -411,7 +392,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1721727458, @@ -429,19 +410,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", - "path": "/nix/store/jk6xpbfh10gz6q5cqw8b2f7xk0pl7hkv-source", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 0, "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", @@ -453,7 +421,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1729850857, "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", @@ -469,7 +437,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1739020877, "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", @@ -485,7 +453,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1741010256, "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", @@ -527,11 +495,10 @@ "root": { "inputs": { "clipboard-sync": "clipboard-sync", - "gakuen-cosplay": "gakuen-cosplay", "home-manager": "home-manager", "hydractify-bot": "hydractify-bot", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "spicetify-nix": "spicetify-nix" } }, @@ -540,7 +507,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1740889006, @@ -572,21 +539,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -601,7 +553,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -620,24 +572,6 @@ "inputs": { "systems": "systems" }, - "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" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", diff --git a/flake.nix b/flake.nix index b528923..661af19 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,6 @@ hyprland.url = "github:hyprwm/Hyprland"; hydractify-bot.url = "github:hydractify/hydractify-bot"; - - gakuen-cosplay.url = "git+file:///mnt/internal/shared/work/gakuen/projects/cosplayer_submission"; }; outputs = diff --git a/hosts/wizdesk/services/home-manager/default.nix b/hosts/wizdesk/services/home-manager/default.nix index 9cc2172..20b08f2 100644 --- a/hosts/wizdesk/services/home-manager/default.nix +++ b/hosts/wizdesk/services/home-manager/default.nix @@ -2,7 +2,6 @@ { imports = [ - ./gakuen-cosplay-api.nix ./hydractify-bot.nix ./openttd.nix ./terraria.nix diff --git a/hosts/wizdesk/services/home-manager/gakuen-cosplay-api.nix b/hosts/wizdesk/services/home-manager/gakuen-cosplay-api.nix deleted file mode 100644 index c28a96e..0000000 --- a/hosts/wizdesk/services/home-manager/gakuen-cosplay-api.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ gakuen-cosplay, pkgs, ... }: - -{ - systemd.user.services.gakuen-cosplay-api = { - Install.WantedBy = [ "default.target" ]; - - Unit.Description = "Gakuen Cosplay API"; - - Service = { - ExecStart = "${gakuen-cosplay.packages.${pkgs.system}.backend}/bin/animegakuen-cosplay-backend"; - Restart = "on-failure"; - Type = "simple"; - WorkingDirectory = "/srv/gakuen_api"; - }; - }; -} diff --git a/hosts/wizdesk/services/nixos/caddy.nix b/hosts/wizdesk/services/nixos/caddy.nix index 7fbce66..c421273 100644 --- a/hosts/wizdesk/services/nixos/caddy.nix +++ b/hosts/wizdesk/services/nixos/caddy.nix @@ -42,16 +42,5 @@ virtualHosts."shoko.thewizard.link".extraConfig = '' reverse_proxy 127.0.0.1:8111 ''; - - virtualHosts."api.cosplay.thewizard.link".extraConfig = '' - reverse_proxy 127.0.0.1:3000 - ''; - - virtualHosts."cosplay.thewizard.link".extraConfig = '' - root * /srv/cosplay - encode - try_files {path} /index.html - file_server - ''; }; }