From 6a5514c2ee1622cc20a7f7c5c33728d563e72955 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sat, 23 Sep 2023 13:30:25 -0400 Subject: [PATCH] Switch from elm site to emanote --- nixos-apps/ewanick.com.nix | 24 +++++++-- nixos-apps/ewanick.com/index.html | 23 -------- nixos-apps/ewanick.com/index.md | 4 ++ nixos-apps/ewanick.com/main.css | 86 ------------------------------ nixos-apps/ewanick.com/main.min.js | 1 - 5 files changed, 25 insertions(+), 113 deletions(-) delete mode 100644 nixos-apps/ewanick.com/index.html create mode 100644 nixos-apps/ewanick.com/index.md delete mode 100644 nixos-apps/ewanick.com/main.css delete mode 100644 nixos-apps/ewanick.com/main.min.js diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index aef065d..8780d25 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -1,5 +1,9 @@ +{ pkgs, ... }: + let - PROJECT_ROOT = builtins.toString ./.; + PROJECT_ROOT = /workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com; + PORT = "5567"; + HOST = "localhost"; in { services.caddy = { @@ -8,10 +12,24 @@ in "ewanick.com" = { serverAliases = [ "www.ewanick.com" ]; extraConfig = '' - root * ${PROJECT_ROOT}/ewanick.com/ - file_server + reverse_proxy ${HOST}:${PORT} ''; }; }; }; + + systemd.services = { + ewanick-site = { + enable = true; + description = "The hakyll executable that rebuilds the site when a new blog post is created."; + path = with pkgs; [ + nix + git + ]; + script = '' + cd ${PROJECT_ROOT} + nix run github:srid/emanote -- run --port ${PORT} --host ${HOST} + ''; + }; + }; } diff --git a/nixos-apps/ewanick.com/index.html b/nixos-apps/ewanick.com/index.html deleted file mode 100644 index 5c4e05b..0000000 --- a/nixos-apps/ewanick.com/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - Elm App using Nix Starter Template - - - - - - - -
- - - - \ No newline at end of file diff --git a/nixos-apps/ewanick.com/index.md b/nixos-apps/ewanick.com/index.md new file mode 100644 index 0000000..c36e9c9 --- /dev/null +++ b/nixos-apps/ewanick.com/index.md @@ -0,0 +1,4 @@ +# Test Site + +This is my test blog +Does it work!? diff --git a/nixos-apps/ewanick.com/main.css b/nixos-apps/ewanick.com/main.css deleted file mode 100644 index 2575f99..0000000 --- a/nixos-apps/ewanick.com/main.css +++ /dev/null @@ -1,86 +0,0 @@ -html, -body { - height: 100%; -} - -body { - background-color: #fff1e5; - font-size: 20px; - color: #070707; - margin: 0px; - font-family: 'IBM Plex Sans', sans-serif; -} - -h1 { - display: block; - font-size: 2em; - font-weight: bold; - margin: 0em 0em 1em 0em; -} - -a { - color: #070707; - border-bottom: 1px dashed #070707; - padding-bottom: 0px; - text-decoration: none; - transition: padding 0.25s; -} - -a:hover { - padding-bottom: 2px; -} - -#hwaet { - padding: 2em; - max-width: 1000px; - margin-right: auto; - margin-left: auto; -} - -#controls { - display: flex -} - -.control { - margin-right: 1em; - display: flex; - flex-direction: column; - width: 10em; - font-size: 0.75em; - text-align: center; -} - - -input[type="range"] { - width: 100%; - margin-bottom: 1em; -} - -input[type=range] { - -webkit-appearance: none; -} - -input[type=range]::-webkit-slider-runnable-track { - height: .35em; - background: #070707; - border: none; - border-radius: 3px; -} - -input[type=range]::-webkit-slider-thumb { - -webkit-appearance: none; - border: none; - height: 1.1em; - width: 1.1em; - border-radius: 50%; - background: #070707; - margin-top: -4px; -} - -input[type=range]:focus { - outline: none; -} - -#footer { - font-size: 0.8em; -} \ No newline at end of file diff --git a/nixos-apps/ewanick.com/main.min.js b/nixos-apps/ewanick.com/main.min.js deleted file mode 100644 index 18c9cd0..0000000 --- a/nixos-apps/ewanick.com/main.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(S){"use strict";function n(n,r,t){return t.a=n,t.f=r,t}function f(t){return n(2,t,function(r){return function(n){return t(r,n)}})}function r(u){return n(3,u,function(t){return function(r){return function(n){return u(t,r,n)}}})}function t(e){return n(4,e,function(u){return function(t){return function(r){return function(n){return e(u,t,r,n)}}}})}function u(o){return n(5,o,function(e){return function(u){return function(t){return function(r){return function(n){return o(e,u,t,r,n)}}}}})}function e(i){return n(6,i,function(o){return function(e){return function(u){return function(t){return function(r){return function(n){return i(o,e,u,t,r,n)}}}}}})}function q(f){return n(7,f,function(i){return function(o){return function(e){return function(u){return function(t){return function(r){return function(n){return f(i,o,e,u,t,r,n)}}}}}}})}function J(c){return n(8,c,function(f){return function(i){return function(o){return function(e){return function(u){return function(t){return function(r){return function(n){return c(f,i,o,e,u,t,r,n)}}}}}}}})}function F(a){return n(9,a,function(c){return function(f){return function(i){return function(o){return function(e){return function(u){return function(t){return function(r){return function(n){return a(c,f,i,o,e,u,t,r,n)}}}}}}}}})}function b(n,r,t){return 2===n.a?n.f(r,t):n(r)(t)}function v(n,r,t,u){return 3===n.a?n.f(r,t,u):n(r)(t)(u)}function l(n,r,t,u,e){return 4===n.a?n.f(r,t,u,e):n(r)(t)(u)(e)}function c(n,r,t,u,e,o){return 5===n.a?n.f(r,t,u,e,o):n(r)(t)(u)(e)(o)}function R(n,r,t,u,e,o,i){return 6===n.a?n.f(r,t,u,e,o,i):n(r)(t)(u)(e)(o)(i)}function z(n,r){for(var t,u=[],e=D(n,r,0,u);e&&(t=u.pop());e=D(t.a,t.b,0,u));return e}function D(n,r,t,u){if(n===r)return!0;if("object"!=typeof n||null===n||null===r)return"function"==typeof n&&h(5),!1;if(100"),r});function h(n){throw Error("https://github.com/elm/core/blob/1.0.0/hints/"+n+".md")}f(function(n,r){return n+r}),f(function(n,r){return n-r}),f(function(n,r){return n*r}),f(function(n,r){return n/r}),f(function(n,r){return n/r|0}),f(Math.pow),f(function(n,r){return r%n}),f(function(n,r){r%=n;return 0===n?h(11):0o||o>56319?(u[e]=n(r[e]),e++):(u[e]=n(r[e]+r[e+1]),e+=2)}return u.join("")}),f(function(n,r){for(var t=[],u=r.length,e=0;ei)return e}var l=t.$;if(4===l){for(var s=t.k;4===s.$;)s=s.k;return n(r,s,u,e,o+1,i,r.elm_event_node_ref)}var d=t.e;var h=r.childNodes;for(var $=0;$i))return e;o=p}return e}(n,r,t,0,0,r.b,u)}function Gn(n,r,t,u){return 0===t.length?n:(Yn(n,r,t,u),Un(n,t))}function Un(n,r){for(var t=0;t=1)return t;var u=n,e=r-1,o=b(k,r,t);n=u,r=e,t=o}}),Er=f(function(n,r){return v(Nr,n,r,s)}),Or=f(function(n,r){return v(Cr,n,b(Er,0,er(r)-1),r)}),Lr=function(n){var r=n.charCodeAt(0);return r<55296||56319