Website working.

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "nix-secrets"]
 	path = nix-secrets
-	url = gitea@git.vatthauer.xyz:leonv/nix-secrets.git
+	url = forgejo@git.vatthauer.xyz:leonv/nix-secrets.git
 [submodule "willem/services/resumee-website"]
 	path = willem/services/resumee-website
 	url = forgejo@git.vatthauer.xyz:leonv/resumee-website.git

flake.lock

@@ -20,11 +20,11 @@
     "cask-fonts": {
       "flake": false,
       "locked": {
-        "lastModified": 1712340494,
+        "lastModified": 1712395066,
-        "narHash": "sha256-Xq3YY66+LUxodhTnbALN6AmMnoVUEzBDiHV5NKMfQwA=",
+        "narHash": "sha256-UKzc0lFCMYMakD0pPqmfyVMGY3Ibjx/IxCdbcntKCPI=",
         "owner": "homebrew",
         "repo": "homebrew-cask-fonts",
-        "rev": "273b8c4573487b4c43ad4997dc9806cc8223b37c",
+        "rev": "b84143d3f249d4e9475ad3a7766f81a64e892724",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712317700,
+        "lastModified": 1712390667,
-        "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
+        "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
+        "rev": "b787726a8413e11b074cde42704b4af32d95545c",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1712374513,
+        "lastModified": 1712421408,
-        "narHash": "sha256-hrvNE6P0CZ+Mqx3kui6ceiCaKc0ZvtEyHp2VjlTMeAM=",
+        "narHash": "sha256-r9DUBMQ+00DrbzAf6ASgsPjt/IOX/EVhyFzml7v9kdU=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "dac61755c09ea59ca4c1f4872dd5bcbc737fcd36",
+        "rev": "0e98f655a97c1ca602f226dc4475c5c0046fb9fa",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1712377794,
+        "lastModified": 1712416518,
-        "narHash": "sha256-dQZMd6oYS4axXZglPHexD+wFUe69XIIGPZ2saB3GAdQ=",
+        "narHash": "sha256-0JscAhnrgVYNmq+xcP5lP4ci2/6sfKZr07L05oOhB5g=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "5414997e0a30b72ad44d9fb4257e71a95a5f3dc9",
+        "rev": "39dc7ab8487832cef395e96fceb32000a956aa8a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -54,7 +54,8 @@
       };
       willem = unstable.lib.nixosSystem {
         system = "aarch64-linux";
-	    modules = [ ./willem/configuration.nix ];
+        specialArgs = { inherit inputs; };
+        modules = [ ./willem/configuration.nix ];
       };
     };
     darwinConfigurations = {

willem/configuration.nix

@@ -2,8 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running 'nixos-help').
 
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
-
 {
   imports =
     [
@@ -45,6 +44,9 @@
     zsh
     oh-my-zsh
     restic
+    # for hugo website
+    hugo
+    go
   ];
   environment.variables = {
     EDITOR = "nvim";

willem/services/acme.nix

@@ -4,5 +4,6 @@
     "git.vatthauer.xyz".email = "leonvatthauer@outlook.com";
     "bitwarden.vatthauer.xyz".email = "leonvatthauer@outlook.com";
     "video.vatthauer.xyz".email = "leonvatthauer@outlook.com";
+    "vatthauer.xyz".email = "leonvatthauer@outlook.com";
   };
 }

willem/services/default.nix

@@ -1,3 +1,4 @@
+{ lib, pkgs, inputs, ... }:
 {
     imports = [
         ./acme.nix

willem/services/nginx.nix

@@ -1,3 +1,4 @@
+{ lib, pkgs, inputs, ... }:
 {
   services.nginx = {
     enable = true;
@@ -30,9 +31,9 @@
       proxyPass = "http://localhost:8096";
     };
   };
-  services.nginx.virtualHosts."blog.korfuri.fr" = {
+  services.nginx.virtualHosts."vatthauer.xyz" = {
     forceSSL = true;
     enableACME = true;
-    root = callPackage ./resumee-website.nix {};
+    root = pkgs.callPackage ./resumee-website.nix {};
   };
 }

willem/services/resumee-website

@@ -1 +0,0 @@
-Subproject commit da26393e34ba9178a5b55737f7616aa8be25b5b3

willem/services/resumee-website.nix

@@ -1,11 +1,16 @@
-{ stdenv, hugo }:
+{ stdenv, git, go, hugo }:
 stdenv.mkDerivation {
   name = "resumee-website";
-  src = ./resumee-website;
+  version = "1.0";
-  nativeBuildInputs = [ hugo ];
+  src = builtins.fetchGit {
-  phases = [ "unpackPhase" "buildPhase" ];
+    url = "https://git.vatthauer.xyz/leonv/resumee-website.git";
-  buildPhase = ''
+    rev = "9516643a88018050676dd1f57f5cc7e245e55591";
-    hugo -s . -d "$out"
+  };
-  '';
+  nativeBuildInputs = [ git go hugo ];
+  buildPhase = "hugo -d $out";
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "sha256-icJv4zvaioxj9Ego0rDIFSm1PXRhAMsxmtYJj0H0+8Y=";
+
 }