diff --git a/default.nix b/default.nix
index 98167eb2b..991f2ab3e 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 e3baf3fbd..ebe79e096 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
similarity index 100%
rename from covid-uk/default.nix
rename to sandbox/covid-uk/default.nix
diff --git a/covid-uk/index.html b/sandbox/covid-uk/index.html
similarity index 100%
rename from covid-uk/index.html
rename to sandbox/covid-uk/index.html
diff --git a/covid-uk/output.css b/sandbox/covid-uk/output.css
similarity index 100%
rename from covid-uk/output.css
rename to sandbox/covid-uk/output.css
diff --git a/covid-uk/package.json b/sandbox/covid-uk/package.json
similarity index 100%
rename from covid-uk/package.json
rename to sandbox/covid-uk/package.json
diff --git a/covid-uk/shell.nix b/sandbox/covid-uk/shell.nix
similarity index 100%
rename from covid-uk/shell.nix
rename to sandbox/covid-uk/shell.nix
diff --git a/covid-uk/styles.css b/sandbox/covid-uk/styles.css
similarity index 100%
rename from covid-uk/styles.css
rename to sandbox/covid-uk/styles.css
diff --git a/covid-uk/tailwind.config.js b/sandbox/covid-uk/tailwind.config.js
similarity index 100%
rename from covid-uk/tailwind.config.js
rename to sandbox/covid-uk/tailwind.config.js
diff --git a/covid-uk/yarn.lock b/sandbox/covid-uk/yarn.lock
similarity index 100%
rename from covid-uk/yarn.lock
rename to sandbox/covid-uk/yarn.lock
diff --git a/sandbox/default.nix b/sandbox/default.nix
new file mode 100644
index 000000000..ccaa7ff9a
--- /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 000000000..b549bf443
--- /dev/null
+++ b/sandbox/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+ sandbox.wpcarro.dev
+
+
+ Projects
+
+
+
diff --git a/website/default.nix b/website/default.nix
new file mode 100644
index 000000000..485f3af34
--- /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 000000000..b5eeb3fd6
--- /dev/null
+++ b/website/index.html
@@ -0,0 +1,30 @@
+
+
+
+
+ wpcarro.dev
+
+
+ Sitemap
+
+
+