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

Compare commits

base: vinzenz:3670cc23eb206f2b411d96514bf28d988033f017
Branches Tags
vinzenz:main
vinzenz:vpn1-wg
..
compare: vinzenz:5fc8fe8ac64ec3b29fda34b8cfe4130e24543d68
Branches Tags
vinzenz:main
vinzenz:vpn1-wg

No commits in common. "3670cc23eb206f2b411d96514bf28d988033f017" and "5fc8fe8ac64ec3b29fda34b8cfe4130e24543d68" have entirely different histories.
3670cc23eb ... 5fc8fe8ac6

5 changed files with 27 additions and 104 deletions
Show stats Expand all files Collapse all files

67
flake.lock
View file

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1726560853,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,15 +57,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1729298361,
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "079528098f5998ba13c88821a2eca1005c1695de", "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -78,15 +78,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742943028, "lastModified": 1729360442,
"narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
} }
}, },
"niri": { "niri": {
@ -103,11 +103,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1743943715, "lastModified": 1743791363,
"narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=", "narHash": "sha256-hGETu0Ilugf0f7S5fFETUP+sS0ATrKcm+7YHs7GBwx4=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0", "rev": "f160e322673614c928e1187c268add9ef038a513",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,11 +136,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1743923080, "lastModified": 1743774669,
"narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", "narHash": "sha256-xrg3m1RP7mvBi0sLPJjnn9UiCqN+NKqU94DZJMoaXZU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "430b155929a60644ea223012ee0c1389fc5e3755", "rev": "e8da89a430f4af0accfe80efe286b2cffd20a4aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,11 +151,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743813633, "lastModified": 1743703532,
"narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,8 +170,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module", "lix-module": "lix-module",
"niri": "niri", "niri": "niri",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"zerforschen-plus": "zerforschen-plus"
} }
}, },
"systems": { "systems": {
@ -221,26 +220,6 @@
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
},
"zerforschen-plus": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1744047745,
"narHash": "sha256-hde60MbFtTb4IR6D2fMkyYZmN/fXGk7/Jc7DK/6LTTk=",
"ref": "refs/heads/main",
"rev": "f739fdfd3b6184cb489910492ff3bc99d319f64d",
"revCount": 6,
"type": "git",
"url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus"
},
"original": {
"type": "git",
"url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus"
}
} }
}, },
"root": "root", "root": "root",

14
flake.nix
View file

@ -1,6 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
# nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-24.11";
@ -8,7 +9,7 @@
}; };
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -17,21 +18,15 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs";
}; };
zerforschen-plus = {
url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
inputs@{ {
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
lix-module, lix-module,
niri, niri,
zerforschen-plus,
}: }:
let let
devices = { devices = {
@ -51,9 +46,6 @@
device: system: device: system:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = {
inherit inputs;
};
modules = modules =
[ [
lix-module.nixosModules.default lix-module.nixosModules.default

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

@ -45,12 +45,6 @@
# (mkServiceConfig pc2 8542) # (mkServiceConfig pc2 8542)
# { locations."/".proxyWebsockets = true; } # { locations."/".proxyWebsockets = true; }
#]; #];
"zerforschen.plus" = {
addSSL = true;
enableACME = true;
root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content;
};
}; };
}; };

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

@ -1,6 +1,6 @@
{ ... }: { ... }:
{ {
imports = [ ./zerforschen-plus.nix ]; imports = [ ./nginx.nix ];
config = { config = {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -37,7 +37,5 @@
}; };
}; };
}; };
networking.firewall.allowedTCPPorts = [ 8776 ];
}; };
} }

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

@ -1,40 +0,0 @@
{
pkgs,
system,
inputs,
...
}:
{
security.acme = {
acceptTerms = true;
defaults.email = "acme@zerforschen.plus";
};
security.pam.services.nginx.setEnvironment = false;
systemd.services.nginx.serviceConfig = {
SupplementaryGroups = [ "shadow" ];
};
services.nginx = {
enable = true;
additionalModules = [ pkgs.nginxModules.pam ];
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
virtualHosts = {
"zerforschen.plus" = {
#addSSL = true;
#enableACME = true;
root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content;
};
};
};
#networking.firewall.allowedTCPPorts = [
# 80
# 443
#];
}