leonv/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: leonv:7a1ae0d0d7a8f1367fb145cb45596f94fc6677b8
Branches Tags
leonv:main
leonv:raspberrypi
leonv:nixos-darwin
..
compare: leonv:dde5d3a0b38583dee4ce58a3183260963596638a
Branches Tags
leonv:main
leonv:raspberrypi
leonv:nixos-darwin

No commits in common. "7a1ae0d0d7a8f1367fb145cb45596f94fc6677b8" and "dde5d3a0b38583dee4ce58a3183260963596638a" have entirely different histories.
7a1ae0d0d7 ... dde5d3a0b3

9 changed files with 26 additions and 36 deletions
Show stats Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "nix-secrets"]
path = nix-secrets
url = forgejo@git.vatthauer.xyz:leonv/nix-secrets.git
url = gitea@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

24
flake.lock
View file

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

3
flake.nix
View file

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

6
willem/configuration.nix
View file

@ -2,7 +2,8 @@
# 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, inputs, ... }:
{ config, pkgs, lib, ... }:
{
imports =
[
@ -44,9 +45,6 @@
zsh
oh-my-zsh
restic
# for hugo website
hugo
go
];
environment.variables = {
EDITOR = "nvim";

1
willem/services/acme.nix
View file

@ -4,6 +4,5 @@
"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
willem/services/default.nix
View file

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

5
willem/services/nginx.nix
View file

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

1
willem/services/resumee-website Submodule

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

19
willem/services/resumee-website.nix
View file

@ -1,16 +1,11 @@
{ stdenv, git, go, hugo }:
{ stdenv, 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=";
src = ./resumee-website;
nativeBuildInputs = [ hugo ];
phases = [ "unpackPhase" "buildPhase" ];
buildPhase = ''
hugo -s . -d "$out"
'';
}