diff --git a/flake.lock b/flake.lock index 2defcc6683bc4cbfa3115f156950cb219437607e..caed64fb06ded0aefadf768fe4944ef4d91d5b74 100644 --- a/flake.lock +++ b/flake.lock @@ -206,8 +206,7 @@ "jolheiser-nur": "jolheiser-nur", "nixpkgs": "nixpkgs", "nixpkgs-py36": "nixpkgs-py36", "nur": "nur", - "tclip": "tclip", - "website": "website" + "tclip": "tclip" } }, "systems": { @@ -247,29 +246,6 @@ "original": { "owner": "tailscale-dev", "repo": "tclip", "type": "github" - } - }, - "website": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695536112, - "narHash": "sha256-JjK9NnrTtSXtN5FkLoEe/M5pzShwpwYOHkUQ2horf2U=", - "ref": "refs/heads/main", - "rev": "789d6e79164d617ebdcab3de53fc79457025edcc", - "revCount": 6, - "type": "git", - "url": "https://git.jojodev.com/jolheiser/jolheiser.com" - }, - "original": { - "type": "git", - "url": "https://git.jojodev.com/jolheiser/jolheiser.com" } } }, diff --git a/flake.nix b/flake.nix index 08ab5eeae5ada198a20b0313cafc06e31bd36782..914093eec477016ed2618df3ecc219e864272784 100644 --- a/flake.nix +++ b/flake.nix @@ -28,13 +28,6 @@ helix = { url = "git+https://git.jojodev.com/jolheiser/helix.drv"; inputs.nixpkgs.follows = "nixpkgs"; }; - website = { - url = "git+https://git.jojodev.com/jolheiser/jolheiser.com"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; # Other flakes golink = { @@ -61,8 +54,6 @@ agenix, jolheiser-nur, helix, inputs = { -{ - inputs = { description = "jolheiser's nixos config"; golink, tclip, @@ -77,7 +68,6 @@ }; jolheiser = inputs.jolheiser-nur.packages.${prev.system}; tclip = inputs.tclip.packages.${prev.system}.tclip; jolheiser-helix = inputs.helix.packages.${prev.system}.default; - jolheiser-website = inputs.website.packages.${prev.system}.default; }) golink.overlay ]; diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 8a73b15ee8474d949a1da28f68e7b6cd6cf13061..1cb602eb562d9adbb8de0025115efb518c1c86a5 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... }: let packages = ["tmpl" "git-age" "ffmd"]; in { services.caddy = { @@ -27,7 +22,7 @@ root * /srv/bennet/src file_server } handle { - root * ${pkgs.jolheiser-website} + root * /srv/jolheiser.com/dist file_server } '';