merge
This commit is contained in:
commit
92ef42073c
7 changed files with 34 additions and 4 deletions
5
.gitmodules
vendored
5
.gitmodules
vendored
|
@ -1,3 +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
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
};
|
||||
willem = unstable.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [ ./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";
|
||||
|
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
{ lib, pkgs, inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./acme.nix
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
{ lib, pkgs, inputs, ... }:
|
||||
{
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
|
@ -30,4 +31,9 @@
|
|||
proxyPass = "http://localhost:8096";
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts."vatthauer.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
root = pkgs.callPackage ./resumee-website.nix {};
|
||||
};
|
||||
}
|
||||
|
|
16
willem/services/resumee-website.nix
Normal file
16
willem/services/resumee-website.nix
Normal file
|
@ -0,0 +1,16 @@
|
|||
{ stdenv, git, go, hugo }:
|
||||
stdenv.mkDerivation {
|
||||
name = "resumee-website";
|
||||
version = "1.0";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://git.vatthauer.xyz/leonv/resumee-website.git";
|
||||
rev = "9516643a88018050676dd1f57f5cc7e245e55591";
|
||||
};
|
||||
nativeBuildInputs = [ git go hugo ];
|
||||
buildPhase = "hugo -d $out";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-icJv4zvaioxj9Ego0rDIFSm1PXRhAMsxmtYJj0H0+8Y=";
|
||||
|
||||
}
|
||||
|
Loading…
Reference in a new issue