vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-split direcories #1

Merged
vinzenz merged 28 commits from modules into main 2025-09-15 19:44:30 +02:00
Conversation 0 Commits 28 Files changed 94 +17 -17
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ecc65f071d - Show all commits

10
flake.nix
View file

@ -49,7 +49,7 @@
}; };
outputs = outputs =
inputs@{ {
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
@ -58,7 +58,6 @@
nixpkgs-unstable, nixpkgs-unstable,
servicepoint-cli, servicepoint-cli,
servicepoint-simulator, servicepoint-simulator,
naersk,
nix-vscode-extensions, nix-vscode-extensions,
... ...
}: }:
@ -95,7 +94,7 @@
device: system: device: system:
let let
specialArgs = { specialArgs = {
inherit inputs device; inherit device;
}; };
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
@ -112,6 +111,7 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
overlays.unstable-packages overlays.unstable-packages
overlays.zerforschen
]; ];
} }
] ]
@ -129,6 +129,10 @@
config = prev.config; config = prev.config;
}; };
}; };
zerforschen = final: prev: {
zerforschen-plus-content = zerforschen-plus.packages."${prev.system}".zerforschen-plus-content;
};
}; };
nixosModules = { nixosModules = {

16
hosts/hetzner-vpn2/nginx.nix
View file

@ -1,4 +1,4 @@
{ inputs, pkgs, ... }: { pkgs, ... }:
let let
blog-domain-socket = "/run/nginx/blog.sock"; blog-domain-socket = "/run/nginx/blog.sock";
anubis-domain-socket = "/run/anubis/anubis-blog.sock"; anubis-domain-socket = "/run/anubis/anubis-blog.sock";
@ -77,7 +77,7 @@ in
}; };
"blog-in-anubis" = { "blog-in-anubis" = {
root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content; root = pkgs.zerforschen-plus-content;
listen = [ listen = [
{ {
addr = ("unix:" + blog-domain-socket); addr = ("unix:" + blog-domain-socket);
@ -87,13 +87,11 @@ in
}; };
}; };
anubis = { anubis.instances.main = {
instances.main = { enable = true;
enable = true; settings = {
settings = { BIND = anubis-domain-socket;
BIND = anubis-domain-socket; TARGET = "unix://" + blog-domain-socket;
TARGET = "unix://" + blog-domain-socket;
};
}; };
}; };
}; };

4
hosts/vinzenz-lpt2/nginx.nix
View file

@ -1,4 +1,4 @@
{ inputs, pkgs, ... }: { pkgs, ... }:
let let
blog-domain-socket = "/run/nginx/blog.sock"; blog-domain-socket = "/run/nginx/blog.sock";
anubis-domain-socket = "/run/anubis/anubis-blog.sock"; anubis-domain-socket = "/run/anubis/anubis-blog.sock";
@ -34,7 +34,7 @@ in
}; };
"vinzenz-lpt2-in-anubis" = { "vinzenz-lpt2-in-anubis" = {
root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content; root = pkgs.zerforschen-plus-content;
listen = [ listen = [
{ {
addr = ("unix:" + blog-domain-socket); addr = ("unix:" + blog-domain-socket);

4
hosts/vinzenz-lpt2/zerforschen-plus.nix
View file

@ -1,7 +1,5 @@
{ {
pkgs, pkgs,
system,
inputs,
... ...
}: }:
{ {
@ -28,7 +26,7 @@
"zerforschen.plus" = { "zerforschen.plus" = {
#addSSL = true; #addSSL = true;
#enableACME = true; #enableACME = true;
root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content; root = pkgs.zerforschen-plus-content;
}; };
}; };
}; };