Merge branch 'blog'

ocfox · Jan 31, 2024 · 20d2ae6 · 20d2ae6
2 parents 7bb6309 + ed0aa7e
commit 20d2ae6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/blog.yml b/.github/workflows/blog.yml
@@ -2,10 +2,6 @@ name: Deploy Blog Pages
 
 on:
   push:
-    paths:
-      - blog
-
-concurrency: pages
 
 jobs:
   build:
@@ -18,13 +14,9 @@ jobs:
       - name: Install nix
         uses: cachix/install-nix-action@v21
 
-      - name: Setup pages
-        uses: actions/configure-pages@v3
-
       - name: Build docs
         run: |
-          nix build .#blog
-          cp -r --no-preserve=all result/ _site
+          nix build
 
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@v4

diff --git a/blog/static/CNAME b/blog/static/CNAME
@@ -0,0 +1 @@
+ocfox.me
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -52,8 +52,8 @@
     };
 
   inputs = {
-    # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nixpkgs.url = "git+file:///home/ocfox/dev/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    # nixpkgs.url = "git+file:///home/ocfox/dev/nixpkgs";
     minegrub.url = "github:ocfox/minegrub-theme";
     agenix.url = "github:ryantm/agenix";
     factorio-versions.url = "github:ocfox/factorio-versions";