From 51328b664d466795e5ae1fb3e446fb4708c0e96d Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sat, 10 Feb 2024 21:19:45 +0100
Subject: [PATCH] Flake build

---
 .gitignore |  1 +
 flake.lock | 27 ++++++++++++++++++++++-----
 flake.nix  | 14 +++++++++-----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e820acc..e77242b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 public
 voidcruiser.nl
 .direnv
+result
diff --git a/flake.lock b/flake.lock
index 6ccd9e6..886e55b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696983906,
-        "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
+        "lastModified": 1707347730,
+        "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=",
         "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
+        "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6",
         "type": "github"
       },
       "original": {
         "owner": "NixOs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -37,7 +37,8 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "themes": "themes"
       }
     },
     "systems": {
@@ -54,6 +55,22 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "themes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1707594839,
+        "narHash": "sha256-VeoBv8LfsTLGSoGpiNlC8gd79xd4InG+bAC6TkBCSHw=",
+        "owner": "EternalWanderer",
+        "repo": "themes",
+        "rev": "53560c95d3bd33362e5552cb9efeaf8234724868",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "EternalWanderer",
+        "repo": "themes",
+        "type": "gitlab"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index df41ed1..139c49c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,13 @@
-{ description = "Website flake";
+{ description = "Voidcruiser website";
   inputs = {
-    nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
+    themes = {
+      url = "gitlab:EternalWanderer/themes";
+      flake = false;
+    };
   };
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, themes }:
   flake-utils.lib.eachDefaultSystem (system:
   let
     pkgs = import nixpkgs { inherit system; };
@@ -13,12 +17,12 @@
 
         pname = "voidcruiser";
         version = "1.3";
-        src = ./.;
+        src = ./src;
 
         buildInputs = [ pkgs.hugo ];
 
         buildPhase = ''
-          hugo
+          hugo --themesDir="${themes.outPath}"
         '';
 
         installPhase = ''