Noratrieb/vps
1
0
Fork 0
mirror of https://github.com/Noratrieb/vps.git synced 2026-03-16 06:06:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: Noratrieb:2bd8830cd0827d55acc36abd261f658912f0adae
Branches Tags
Noratrieb:main
Noratrieb:dynamic-dns-updates
Noratrieb:ipv6
Noratrieb:mail
Noratrieb:nixos
Noratrieb:email
..
compare: Noratrieb:57d022390915d70d101ce7dd47251dc919e85f19
Branches Tags
Noratrieb:main
Noratrieb:dynamic-dns-updates
Noratrieb:ipv6
Noratrieb:mail
Noratrieb:nixos
Noratrieb:email

No commits in common. "2bd8830cd0827d55acc36abd261f658912f0adae" and "57d022390915d70d101ce7dd47251dc919e85f19" have entirely different histories.
2bd8830cd0 ... 57d0223909

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

5
newinfra/nix/hive.nix
View file

@ -2,8 +2,7 @@
meta = meta =
let let
my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json); my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json);
nixpkgs-hash = "50ab793786d9de88ee30ec4e4c24fb4236fc2674"; # nixos-24.11 2025-07-27 nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7105ae3957700a9646cc4b766f5815b23ed0c682.tar.gz");
nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-hash}.tar.gz");
in in
{ {
# Override to pin the Nixpkgs version (recommended). This option # Override to pin the Nixpkgs version (recommended). This option
@ -11,7 +10,7 @@
# - A path to a Nixpkgs checkout # - A path to a Nixpkgs checkout
# - The Nixpkgs lambda (e.g., import <nixpkgs>) # - The Nixpkgs lambda (e.g., import <nixpkgs>)
# - An initialized Nixpkgs attribute set # - An initialized Nixpkgs attribute set
nixpkgs = import nixpkgs-path; nixpkgs = import nixpkgs-path; # nixos-24.11 2025-03-21
specialArgs = { specialArgs = {
website = import (fetchTarball "https://github.com/Noratrieb/website/archive/${my-projects-versions.website}.tar.gz"); website = import (fetchTarball "https://github.com/Noratrieb/website/archive/${my-projects-versions.website}.tar.gz");

1
newinfra/nix/modules/caddy/default.nix
View file

@ -30,7 +30,6 @@ in
age.secrets.caddy_s3_key_secret.file = ../../secrets/caddy_s3_key_secret.age; age.secrets.caddy_s3_key_secret.file = ../../secrets/caddy_s3_key_secret.age;
systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.caddy_s3_key_secret.path; systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.caddy_s3_key_secret.path;
systemd.services.caddy.after = [ "garage.service" ]; # the cert store depends on garage
services.caddy = { services.caddy = {
enable = true; enable = true;
package = caddy; package = caddy;

4
newinfra/nix/modules/dns/noratrieb.dev.nix
View file

@ -72,7 +72,9 @@ let
git = vps1; git = vps1;
olat = vps1; olat = vps1;
std.CNAME = [ (cname "noratrieb.github.io.") ]; yeet = {
A = [ (a "5.75.137.171") ];
};
# --- fun shit # --- fun shit
localhost.A = [ (a "127.0.0.1") ]; localhost.A = [ (a "127.0.0.1") ];