diff options
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | nixos/socrates/configuration.nix | 9 | ||||
| -rw-r--r-- | sandbox/covid-uk/default.nix (renamed from covid-uk/default.nix) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/index.html (renamed from covid-uk/index.html) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/output.css (renamed from covid-uk/output.css) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/package.json (renamed from covid-uk/package.json) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/shell.nix (renamed from covid-uk/shell.nix) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/styles.css (renamed from covid-uk/styles.css) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/tailwind.config.js (renamed from covid-uk/tailwind.config.js) | 0 | ||||
| -rw-r--r-- | sandbox/covid-uk/yarn.lock (renamed from covid-uk/yarn.lock) | 0 | ||||
| -rw-r--r-- | sandbox/default.nix | 15 | ||||
| -rw-r--r-- | sandbox/index.html | 15 | ||||
| -rw-r--r-- | website/default.nix | 11 | ||||
| -rw-r--r-- | website/index.html | 30 |
14 files changed, 79 insertions, 4 deletions
diff --git a/default.nix b/default.nix index 98167eb2beb3..991f2ab3e297 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,8 @@ in { utils = readTree ./utils; emacs = readTree ./emacs; learn = readTree ./learn; - covid-uk = readTree ./covid-uk; + sandbox = readTree ./sandbox; + website = readTree ./website; blog = readTree ./blog; lisp = readTree ./lisp; gopkgs = readTree ./gopkgs; diff --git a/nixos/socrates/configuration.nix b/nixos/socrates/configuration.nix index e3baf3fbdc93..ebe79e096c63 100644 --- a/nixos/socrates/configuration.nix +++ b/nixos/socrates/configuration.nix @@ -154,6 +154,11 @@ in { ''; virtualHosts = { + "wpcarro.dev" = { + addSSL = true; + enableACME = true; + root = briefcase.website; + }; "learn.wpcarro.dev" = { addSSL = true; enableACME = true; @@ -167,9 +172,7 @@ in { "sandbox.wpcarro.dev" = { addSSL = true; enableACME = true; - locations."/covid-19/" = { - alias = "${briefcase.covid-uk}/"; - }; + root = briefcase.sandbox; }; }; }; diff --git a/covid-uk/default.nix b/sandbox/covid-uk/default.nix index 0f5545c2f75d..0f5545c2f75d 100644 --- a/covid-uk/default.nix +++ b/sandbox/covid-uk/default.nix diff --git a/covid-uk/index.html b/sandbox/covid-uk/index.html index 15769f7490e0..15769f7490e0 100644 --- a/covid-uk/index.html +++ b/sandbox/covid-uk/index.html diff --git a/covid-uk/output.css b/sandbox/covid-uk/output.css index 9c1c7f945105..9c1c7f945105 100644 --- a/covid-uk/output.css +++ b/sandbox/covid-uk/output.css diff --git a/covid-uk/package.json b/sandbox/covid-uk/package.json index 939506c8cce1..939506c8cce1 100644 --- a/covid-uk/package.json +++ b/sandbox/covid-uk/package.json diff --git a/covid-uk/shell.nix b/sandbox/covid-uk/shell.nix index 38df7d4e8508..38df7d4e8508 100644 --- a/covid-uk/shell.nix +++ b/sandbox/covid-uk/shell.nix diff --git a/covid-uk/styles.css b/sandbox/covid-uk/styles.css index 1f48906d8ffc..1f48906d8ffc 100644 --- a/covid-uk/styles.css +++ b/sandbox/covid-uk/styles.css diff --git a/covid-uk/tailwind.config.js b/sandbox/covid-uk/tailwind.config.js index af829e20f9cb..af829e20f9cb 100644 --- a/covid-uk/tailwind.config.js +++ b/sandbox/covid-uk/tailwind.config.js diff --git a/covid-uk/yarn.lock b/sandbox/covid-uk/yarn.lock index 3e66831c9e82..3e66831c9e82 100644 --- a/covid-uk/yarn.lock +++ b/sandbox/covid-uk/yarn.lock diff --git a/sandbox/default.nix b/sandbox/default.nix new file mode 100644 index 000000000000..ccaa7ff9afa3 --- /dev/null +++ b/sandbox/default.nix @@ -0,0 +1,15 @@ +{ pkgs, briefcase, ... }: + +let + covid-uk = briefcase.sandbox.covid-uk; +in pkgs.stdenv.mkDerivation { + name = "covid-uk"; + buildInputs = []; + src = ./.; + buildPhase = '' + mkdir -p $out + cp $src/index.html $out + cp -r ${briefcase.sandbox.covid-uk} $out/covid-uk + ''; + dontInstall = true; +} diff --git a/sandbox/index.html b/sandbox/index.html new file mode 100644 index 000000000000..b549bf443e07 --- /dev/null +++ b/sandbox/index.html @@ -0,0 +1,15 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="UTF-8"> + <title>sandbox.wpcarro.dev</title> + </head> + <body> + <h1>Projects</h1> + <ul> + <li> + <a href="/covid-uk">COVID-19 in the UK</a> + </li> + </ul> + </body> +</html> diff --git a/website/default.nix b/website/default.nix new file mode 100644 index 000000000000..485f3af34a4f --- /dev/null +++ b/website/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: + +pkgs.stdenv.mkDerivation { + name = "wpcarro.dev"; + src = ./.; + buildPhase = '' + mkdir -p $out + cp $src/index.html $out + ''; + dontInstall = true; +} diff --git a/website/index.html b/website/index.html new file mode 100644 index 000000000000..b5eeb3fd61c6 --- /dev/null +++ b/website/index.html @@ -0,0 +1,30 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="UTF-8"> + <title>wpcarro.dev</title> + </head> + <body> + <h1>Sitemap</h1> + <ul> + <li> + <a href="https://blog.wpcarro.dev">blog.wpcarro.dev</a> + </li> + <li> + <a href="https://learn.wpcarro.dev">learn.wpcarro.dev</a> + </li> + <li> + <a href="https://sandbox.wpcarro.dev">sandbox.wpcarro.dev</a> + </li> + <li> + <a href="https://twitter.com/wpcarro">Twitter</a> + </li> + <li> + <a href="https://github.com/wpcarro">Github</a> + </li> + <li> + <a href="https://linkedin.com/in/williampatrickcarroll">LinkedIn</a> + </li> + </ul> + </body> +</html> |