WIP

flake.nix

@@ -74,11 +74,10 @@
           osds-site = {
             layers = [
               {
-                # path = ./nixos-apps/ewanick.com;
-                # pathString = "nixos-apps/ewanick.com";
+                path = ./nixos-apps/ewanick.com;
+                pathString = "nixos-apps/ewanick.com";
               }
             ];
-            baseUrl = "ewanick.com";
             port = 5567;
           };
         };

nixos-apps/default.nix

@@ -5,11 +5,12 @@
 
     ./cutesealfanpage.love.nix
 
-    # ./ewanick.com.nix
+    ./ewanick.com.nix
     ./git.ewanick.com.nix
-    # ./paperless.ewanick.com.nix
 
     ./fancytypist.com.nix
+
+    # ./paperless.ewanick.com.nix
   ];
 
   # when in doubt, clear away the certs with

nixos-apps/ewanick.com.nix

@@ -3,7 +3,7 @@
   PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com";
   HOST = "localhost";
   PORT = 5567;
-  emanote-version = "1.4.0";
+  emanote-version = "1.4.0.0";
 in {
   services.caddy = {
     enable = true;
@@ -17,17 +17,18 @@ in {
     };
   };
 
-  systemd.services = {
+  systemd.user.services = {
     ewanick-site = {
       enable = true;
       description = "A blog powered by Emanote running solely on Markdown files.";
-      path = with pkgs; [
-        nix
-        git
-      ];
+      path = with pkgs; [nix git];
+      wantedBy = ["multi-user.target"];
       script = ''
         cd ${PROJECT_ROOT}
-        nix run github:srid/emanote/${emanote-version} -- run --port ${PORT} --host ${HOST}
+        nix run github:srid/emanote/${emanote-version} \
+          -- run \
+            --port ${toString PORT} \
+            --host ${HOST}
       '';
     };
   };

nixos-apps/fancytypist.com.nix

@@ -35,7 +35,7 @@ in {
     };
   };
 
-  systemd.services = {
+  systemd.user.services = {
     fancyTypistDotDev-site = {
       enable = false;
       description = "The Haskell Servant executable server that hosts my FancyTypist.dev site.";