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

Compare commits

base: vinzenz:ef731dca1811fd9cefcf88aa5ab7b116c86690e3
Branches Tags
vinzenz:main
vinzenz:vpn1-wg
..
compare: vinzenz:417d65062bb098d2243e4c22f6de1db6604be95e
Branches Tags
vinzenz:main
vinzenz:vpn1-wg

No commits in common. "ef731dca1811fd9cefcf88aa5ab7b116c86690e3" and "417d65062bb098d2243e4c22f6de1db6604be95e" have entirely different histories.
ef731dca18 ... 417d65062b

5 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

33
flake.lock generated
View file

@ -503,6 +503,22 @@
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1764560356,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
@ -618,19 +634,14 @@
"nix-filter": [
"nix-filter"
],
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": [
"treefmt-nix"
]
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1764875421,
"narHash": "sha256-ZO9wiokPhropwsU3BfIgjm1bc59SIyqrfjfnFCM2Q68=",
"lastModified": 1757763404,
"narHash": "sha256-a1h+58wDOtbQXrHoZwLwB7PhXwFhBXRHhNRhAQGq/oY=",
"ref": "refs/heads/main",
"rev": "fa892558f123c5d5395663fa666466c73b997245",
"revCount": 48,
"rev": "07a5fbca27ec941c841ad93f2ac65bc529225a51",
"revCount": 46,
"type": "git",
"url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
},
@ -647,7 +658,7 @@
"nix-filter": [
"nix-filter"
],
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1757763091,

5
flake.nix
View file

@ -41,10 +41,10 @@
servicepoint-cli = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
inputs = {
nixpkgs.follows = "nixpkgs";
# TODO: update flake to 25.11
# nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
treefmt-nix.follows = "treefmt-nix";
};
};
servicepoint-simulator = {
@ -277,7 +277,6 @@
self.nixosModules.globalinstalls
self.nixosModules.lix-is-nix
self.nixosModules.openssh
self.nixosModules.prometheus-node
self.nixosModules.systemd-boot
self.nixosModules.tailscale
zerforschen-plus.nixosModules.default

2
nixosConfigurations/forgejo-runner-1/forgejo-runner.nix
View file

@ -8,7 +8,7 @@
# https://wiki.nixos.org/wiki/Forgejo
services.gitea-actions-runner = {
package = pkgs.forgejo-runner;
package = pkgs.forgejo-actions-runner;
instances.default = {
enable = true;
name = "cccb";

7
nixosConfigurations/hetzner-vpn2/nginx.nix
View file

@ -2,7 +2,6 @@
let
blog-domain-socket = "/run/nginx/blog.sock";
anubis-domain-socket = "/run/anubis/anubis-blog/anubis.sock";
anubis-metrics-socket = "/run/anubis/anubis-blog/anubis-metrics.sock";
in
{
security.acme = {
@ -27,9 +26,8 @@ in
"zerforschen.plus" = {
addSSL = true;
enableACME = true;
locations = {
"/".proxyPass = "http://unix:" + anubis-domain-socket;
"/_metrics".proxyPass = "http://unix:" + anubis-metrics-socket;
locations."/" = {
proxyPass = "http://unix:" + anubis-domain-socket;
};
};
@ -49,7 +47,6 @@ in
settings = {
BIND = anubis-domain-socket;
TARGET = "unix://" + blog-domain-socket;
METRICS_BIND = anubis-metrics-socket;
};
};
};

20
nixosModules/prometheus-node.nix
View file

@ -1,20 +0,0 @@
{
services.prometheus.exporters = {
node = {
enable = true;
openFirewall = true;
port = 9190;
enabledCollectors = [
# keep-sorted start
"cgroups"
"interrupts"
"softirqs"
"swap"
"systemd"
"tcpstat"
"wifi"
# keep-sorted end
];
};
};
}