Compare commits

..

No commits in common. "2c95c1fb55f9baa6fbb4e5f23a4db49da70b3566" and "a8372897206d97ef82bed710f9be8c8cf1ea25a2" have entirely different histories.

32 changed files with 581 additions and 1097 deletions

View file

@ -3,21 +3,6 @@
zones = { zones = {
"gmem.ca" = "gmem.ca" =
{ {
"_minecraft._tcp.mc" = {
srv.data = [
{
port = 25565;
priority = 10;
weight = 5;
target = "mc-real.gmem.ca";
}
];
};
"mc".cname = {
ttl = 0;
data = "e9195a3e-6f24-4cdb-be6d-237199d9a258.cfargotunnel.com";
};
"grafana" = { "grafana" = {
a.data = ["91.107.206.145"]; a.data = ["91.107.206.145"];
aaaa.data = ["2a01:4f8:c012:5ec6::"]; aaaa.data = ["2a01:4f8:c012:5ec6::"];
@ -104,9 +89,6 @@
a.data = ["100.116.48.47"]; a.data = ["100.116.48.47"];
aaaa.data = ["fd7a:115c:a1e0:ab12:4843:cd96:6274:302f"]; aaaa.data = ["fd7a:115c:a1e0:ab12:4843:cd96:6274:302f"];
}; };
"plex" = {
cname.data = "vancouver.gmem.ca";
};
"" = { "" = {
aaaa.data = ["100::"]; aaaa.data = ["100::"];
@ -165,7 +147,6 @@
"ntfy" "ntfy"
"metube" "metube"
"search" "search"
"red"
] (name: {cname.data = "cluster.gmem.ca";}) ] (name: {cname.data = "cluster.gmem.ca";})
// lib.attrsets.genAttrs [ // lib.attrsets.genAttrs [
# Externally hosted applications with Tunnels # Externally hosted applications with Tunnels
@ -180,8 +161,6 @@
"tokyo" "tokyo"
"ci" "ci"
"paste" "paste"
"e6"
"minecraft-invites"
] (name: { ] (name: {
cname = { cname = {
ttl = 0; ttl = 0;

View file

@ -10,8 +10,6 @@
"tokyo" "tokyo"
"nitter" "nitter"
"paste" "paste"
"e6"
"minecraft-invites"
] (name: { ] (name: {
name = name + ".gmem.ca"; name = name + ".gmem.ca";
content = "newcluster.gmem.ca"; content = "newcluster.gmem.ca";
@ -43,16 +41,13 @@
"metube" "metube"
"search" "search"
"paste" "paste"
"e6"
"red"
"minecraft-invites"
] (name: { ] (name: {
name = name + ".gmem.ca"; name = name + ".gmem.ca";
content = "homelab.gmem.ca"; content = "homelab.gmem.ca";
}); });
in { in {
data = { data = {
"bcee89" = home; "xxxxxx" = home;
"74c6db" = tailscale; "xxxxxx" = tailscale;
}; };
} }

View file

@ -94,26 +94,6 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1717664893,
"narHash": "sha256-k79hmHv7Q1/FZSqBzNqmLAU6WGICKPFN6QcCX0QM8Og=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "28779a7abf781d387806f2567b578af6fd165705",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -148,11 +128,11 @@
}, },
"flake-compat_3": { "flake-compat_3": {
"locked": { "locked": {
"lastModified": 1717312683, "lastModified": 1688025799,
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -200,7 +180,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -218,7 +198,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -235,24 +215,6 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"locked": { "locked": {
"lastModified": 1634851050, "lastModified": 1634851050,
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
@ -310,11 +272,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717525419, "lastModified": 1715930644,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,16 +288,16 @@
"kubenix": { "kubenix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"systems": "systems_2", "systems": "systems",
"treefmt": "treefmt" "treefmt": "treefmt"
}, },
"locked": { "locked": {
"lastModified": 1717524369, "lastModified": 1715211269,
"narHash": "sha256-OR0IaHPh6dHrpwTJJdq9IMvJyY6/OQWmS4FEk38Qlm4=", "narHash": "sha256-bO1n41QjfdFNoEih0csMe/MUB42DdOuwlT+6LGpUCSc=",
"owner": "hall", "owner": "hall",
"repo": "kubenix", "repo": "kubenix",
"rev": "b5dc95c847893857f02579118f7dfb37b580746e", "rev": "060f4757292e1e7172cc9ebcb16f38d89cb707ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,15 +308,15 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1717330178, "lastModified": 1715515815,
"narHash": "sha256-rRZjmC3xcPpHTJHnEy3T99O86Ecjao5YhakzaoNiRcs=", "narHash": "sha256-yaLScMHNFCH6SbB0HSA/8DWDgK0PyOhCXoFTdHlWkhk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7", "rev": "09883ca828e8cfaacdb09e29190a7b84ad1d9925",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,7 +344,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [ "lix": [
"lix" "lix"
@ -392,11 +354,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717647344, "lastModified": 1715885250,
"narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=", "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4e25f1ab68f2270f9cff59216056c21073db0164", "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5",
"revCount": 87, "revCount": 81,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -409,7 +371,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
@ -450,7 +412,7 @@
}, },
"nixinate": { "nixinate": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1708891350, "lastModified": 1708891350,
@ -487,7 +449,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4", "systems": "systems_3",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@ -512,11 +474,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716210724, "lastModified": 1713783234,
"narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +489,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1717574423, "lastModified": 1716034089,
"narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", "narHash": "sha256-QBfab6V4TeQ6Y4NiXVrEATdQuhCNFNaXt/L1K/Zw+zc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", "rev": "b55712de78725c8fcde422ee0a0fe682046e73c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -559,11 +521,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1717289404, "lastModified": 1715474941,
"narHash": "sha256-4q6ZO3BqHgdd3Aacb/xiQXB4g9TQKpQg/praTpD9vbI=", "narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "e090cb30ae82f4b4461aafdb808847c6c97b08c2", "rev": "58e03b95f65dfdca21979a081aa62db0eed6b1d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -572,22 +534,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1717530100,
"narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a2e1d0414259a144ebdc048408a807e69e0565af",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -598,11 +544,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717669106, "lastModified": 1716052422,
"narHash": "sha256-C7jLK3KgTbGBQcpRsu1qivSoSfkp7PaWI+tLfo9qHHY=", "narHash": "sha256-9zObaIzZ3OnW4nMdNzMmrjUrGhqhAZhn1VQnxWUlKts=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "27f970b56d7de3b7214b6017cec7f149656448a1", "rev": "0c6afa4c3c068730a90ce20762bf0fdfac23e64b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -628,22 +574,6 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1717196966,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1686488075, "lastModified": 1686488075,
"narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=", "narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=",
@ -659,7 +589,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1653060744, "lastModified": 1653060744,
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
@ -675,13 +605,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1717459389, "lastModified": 1715996989,
"narHash": "sha256-I8/plBsua4/NZ5bKgj+z7/ThiWuud1YFwLsn1QQ5PgE=", "narHash": "sha256-ObD9YSelkwCAylEXJHcNjrn3hLOfIVScB1tPz9zeDN8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b01abcc24846ae49957b30f4345bab4b3f1d14b", "rev": "63d3e5d82edf5a138e7d0872231cc23ed4e740fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -691,7 +621,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1715037484, "lastModified": 1715037484,
"narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
@ -707,7 +637,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1636823747, "lastModified": 1636823747,
"narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=",
@ -726,7 +656,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"alertmanager-ntfy": "alertmanager-ntfy", "alertmanager-ntfy": "alertmanager-ntfy",
"emacs-overlay": "emacs-overlay",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"kubenix": "kubenix", "kubenix": "kubenix",
"lix": "lix", "lix": "lix",
@ -735,7 +664,7 @@
"nixos-dns": "nixos-dns", "nixos-dns": "nixos-dns",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"terranix": "terranix" "terranix": "terranix"
} }
@ -750,9 +679,8 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "id": "systems",
"repo": "default", "type": "indirect"
"type": "github"
} }
}, },
"systems_2": { "systems_2": {
@ -765,26 +693,12 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "systems", "owner": "nix-systems",
"type": "indirect" "repo": "default",
"type": "github"
} }
}, },
"systems_3": { "systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -798,7 +712,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"systems_5": { "systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -817,8 +731,8 @@
"inputs": { "inputs": {
"bats-assert": "bats-assert", "bats-assert": "bats-assert",
"bats-support": "bats-support", "bats-support": "bats-support",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"terranix-examples": "terranix-examples" "terranix-examples": "terranix-examples"
}, },
"locked": { "locked": {

View file

@ -31,7 +31,6 @@
inputs.lix.follows = "lix"; inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay.url = "github:nix-community/emacs-overlay";
}; };
outputs = { outputs = {
@ -48,14 +47,9 @@
kubenix, kubenix,
nixos-dns, nixos-dns,
nixos-hardware, nixos-hardware,
emacs-overlay,
... ...
} @ inputs: let } @ inputs: let
system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.x86_64-linux;
pkgs = import nixpkgs {
inherit system;
overlays = [emacs-overlay.overlays.default];
};
tf = terranix.lib.terranixConfiguration { tf = terranix.lib.terranixConfiguration {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./terraform/main.nix]; modules = [./terraform/main.nix];
@ -102,7 +96,6 @@
kubernetes-helm kubernetes-helm
nil nil
talosctl talosctl
dogdns
(octodns.withProviders (ps: [ (octodns.withProviders (ps: [
octodns-providers.bind octodns-providers.bind
octodns-cloudflare octodns-cloudflare
@ -419,22 +412,6 @@
} }
]; ];
}; };
minecraft-server = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
agenix.nixosModules.default
(import ./nix/minecraft-server/configuration.nix)
{
_module.args.nixinate = {
host = "192.168.50.13";
sshUser = "root";
buildOn = "remote";
substituteOnTarget = true;
hermetic = false;
};
}
];
};
}; };
}; };
} }

View file

@ -93,31 +93,25 @@ data:
credentials-file: /etc/cloudflared/creds/credentials.json credentials-file: /etc/cloudflared/creds/credentials.json
metrics: 0.0.0.0:2000 metrics: 0.0.0.0:2000
no-autoupdate: true no-autoupdate: true
warp-routing:
enabled: true
ingress: ingress:
- hostname: photos.gmem.ca - hostname: photos.gmem.ca
service: https://homelab.gmem.ca service: http://immich-server.immich.svc.cluster.local:3001
- hostname: pw.gmem.ca - hostname: pw.gmem.ca
service: https://homelab.gmem.ca service: http://vaultwarden.vaultwarden.svc.cluster.local:80
- hostname: authentik.gmem.ca - hostname: authentik.gmem.ca
service: https://homelab.gmem.ca service: http://authentik-server.authentik.svc.cluster.local:80
- hostname: nitter.gmem.ca - hostname: nitter.gmem.ca
service: https://homelab.gmem.ca service: http://nitter.nitter.svc.cluster.local:8081
- hostname: git.gmem.ca - hostname: git.gmem.ca
service: https://homelab.gmem.ca service: http://192.168.50.229
- hostname: proxmox.gmem.ca - hostname: proxmox.gmem.ca
service: https://homelab.gmem.ca service: http://proxmox.endpoints.svc.cluster.local:8006
- hostname: tokyo.gmem.ca - hostname: tokyo.gmem.ca
service: https://homelab.gmem.ca service: http://tokyo.endpoints.svc.cluster.local:8000
- hostname: ibiza.gmem.ca - hostname: ibiza.gmem.ca
service: https://homelab.gmem.ca service: http://ibiza.endpoints.svc.cluster.local:8000
- hostname: chat.gmem.ca - hostname: chat.gmem.ca
service: https://homelab.gmem.ca service: tcp://192.168.50.45:443
- hostname: paste.gmem.ca - hostname: paste.gmem.ca
service: https://homelab.gmem.ca service: http://tclip.tclip.svc.cluster.local:8080
- hostname: e6.gmem.ca
service: https://homelab.gmem.ca
- hostname: minecraft-invites.gmem.ca
service: https://homelab.gmem.ca
- service: http_status:404 - service: http_status:404

View file

@ -1,11 +1,5 @@
let let
endpoints = { endpoints = {
"git" = {
location = "192.168.50.229";
host = "git.gmem.ca";
port = 443;
protocol = "HTTPS";
};
"proxmox" = { "proxmox" = {
location = "192.168.50.3"; location = "192.168.50.3";
host = "proxmox.gmem.ca"; host = "proxmox.gmem.ca";

View file

@ -147,7 +147,6 @@ in {
listen ircs:// listen ircs://
listen unix+admin:///app/admin listen unix+admin:///app/admin
listen ws+insecure:// listen ws+insecure://
listen http+prometheus://localhost:9090
hostname irc.gmem.ca hostname irc.gmem.ca
title irc.gmem.ca title irc.gmem.ca
db postgres "dbname=soju" db postgres "dbname=soju"

View file

@ -28,7 +28,5 @@
# (import ./snikket.nix) # (import ./snikket.nix)
(import ./metube.nix) (import ./metube.nix)
(import ./searxng.nix) (import ./searxng.nix)
(import ./redlib.nix)
(import ./minecraft-invites.nix)
]; ];
} }

View file

@ -60,4 +60,5 @@ in {
]; ];
}; };
}; };
} }

View file

@ -1,125 +0,0 @@
let
appName = "whitelistmanager";
appImage = "git.gmem.ca/arch/whitelistmanager";
frontendImage = "git.gmem.ca/arch/whitelistmanager-frontend";
in
{
lib,
config,
kubenix,
...
}: {
kubernetes.resources.deployments.whitelistmanager = {
metadata.namespace = "minecraft-invites";
spec = {
selector.matchLabels.app = appName;
template = {
metadata.labels.app = appName;
spec = {
containers = {
whitelistmanager = {
image = appImage;
envFrom = [{secretRef.name = "whitelistmanager";}];
resources = {
requests = {
cpu = "1m";
memory = "256Mi";
};
limits = {
cpu = "1";
memory = "512Mi";
};
};
ports.http.containerPort = 8080;
};
};
};
};
};
};
kubernetes.resources.deployments.whitelistmanager-frontend = {
metadata.namespace = "minecraft-invites";
spec = {
selector.matchLabels.app = appName + "-frontend";
template = {
metadata.labels.app = appName + "-frontend";
spec = {
containers = {
whitelistmanager = {
image = frontendImage;
resources = {
requests = {
cpu = "1m";
memory = "256Mi";
};
limits = {
cpu = "1";
memory = "512Mi";
};
};
ports.http.containerPort = 3000;
};
};
};
};
};
};
kubernetes.resources.services.whitelistmanager = {
metadata.namespace = "minecraft-invites";
metadata.labels.app = appName;
spec = {
selector.app = appName;
ports.http = {
port = 8080;
targetPort = 8080;
};
};
};
kubernetes.resources.services.whitelistmanager-frontend = {
metadata.namespace = "minecraft-invites";
metadata.labels.app = appName + "-frontend";
spec = {
selector.app = appName + "-frontend";
ports.http = {
port = 3000;
targetPort = 3000;
};
};
};
kubernetes.resources.ingresses.whitelistmanager = {
metadata.namespace = "minecraft-invites";
metadata.annotations = {
"cert-manager.io/cluster-issuer" = "le-issuer";
};
spec = {
tls = [
{
hosts = ["minecraft-invites.gmem.ca"];
}
];
rules = [
{
host = "minecraft-invites.gmem.ca";
http.paths = [
{
path = "/";
pathType = "Prefix";
backend.service = {
name = "whitelistmanager-frontend";
port.number = 3000;
};
}
{
path = "/api";
pathType = "Prefix";
backend.service = {
name = "whitelistmanager";
port.number = 8080;
};
}
];
}
];
};
};
}

View file

@ -2,12 +2,12 @@ let
appName = "miniflux"; appName = "miniflux";
appImage = "docker.io/miniflux/miniflux"; appImage = "docker.io/miniflux/miniflux";
in in
{ {
lib, lib,
config, config,
kubenix, kubenix,
... ...
}: { }: {
kubernetes.resources.deployments.miniflux = { kubernetes.resources.deployments.miniflux = {
metadata.namespace = "miniflux"; metadata.namespace = "miniflux";
spec = { spec = {
@ -18,10 +18,8 @@ in
containers = { containers = {
miniflux = { miniflux = {
image = appImage; image = appImage;
envFrom = [ envFrom = [{secretRef.name = "miniflux";}
{secretRef.name = "miniflux";} {configMapRef.name = "miniflux";}];
{configMapRef.name = "miniflux";}
];
resources = { resources = {
requests = { requests = {
cpu = "1m"; cpu = "1m";
@ -102,4 +100,4 @@ in
BASE_URL = "https://rss.gmem.ca/"; BASE_URL = "https://rss.gmem.ca/";
}; };
}; };
} }

View file

@ -32,7 +32,6 @@
]; ];
ingressClassResource.default = true; ingressClassResource.default = true;
publishService.enabled = true; publishService.enabled = true;
service.type = "NodePort";
service.externalTrafficPolicy = "Local"; service.externalTrafficPolicy = "Local";
hostNetwork = true; hostNetwork = true;
extraArgs.default-ssl-certificate = "cert-manager/gmem-ca-wildcard"; extraArgs.default-ssl-certificate = "cert-manager/gmem-ca-wildcard";

View file

@ -2,12 +2,12 @@ let
appName = "nitter-bot"; appName = "nitter-bot";
appImage = "git.gmem.ca/arch/nitter-bot:latest"; appImage = "git.gmem.ca/arch/nitter-bot:latest";
in in
{ {
lib, lib,
config, config,
kubenix, kubenix,
... ...
}: { }: {
kubernetes.resources.statefulSets.nitter-bot = { kubernetes.resources.statefulSets.nitter-bot = {
metadata.namespace = "nitter"; metadata.namespace = "nitter";
spec = { spec = {
@ -19,10 +19,8 @@ in
containers = { containers = {
nitter-bot = { nitter-bot = {
image = appImage; image = appImage;
envFrom = [ envFrom = [{secretRef.name = "nitter-bot";}
{secretRef.name = "nitter-bot";} {configMapRef.name = "nitter-bot";}];
{configMapRef.name = "nitter-bot";}
];
resources = { resources = {
requests = { requests = {
cpu = "1m"; cpu = "1m";
@ -47,4 +45,4 @@ in
NITTER_EXTERNAL_URL = "https://nitter.gmem.ca"; NITTER_EXTERNAL_URL = "https://nitter.gmem.ca";
}; };
}; };
} }

View file

@ -25,10 +25,8 @@ in {
containers = { containers = {
jellyseerr = { jellyseerr = {
image = appImage; image = appImage;
envFrom = [ envFrom = [{secretRef.name = "jellyseerr";}
{secretRef.name = "jellyseerr";} {configMapRef.name = "jellyseerr";}];
{configMapRef.name = "jellyseerr";}
];
volumeMounts = [ volumeMounts = [
{ {
name = "config"; name = "config";

View file

@ -1,85 +0,0 @@
let
appName = "redlib";
appImage = "git.gmem.ca/arch/redlib:latest";
in
{
lib,
config,
kubenix,
...
}: {
kubernetes.resources.services.redlib = {
metadata.namespace = "redlib";
metadata.labels.app = appName;
spec = {
selector.app = appName;
ports.http = {
port = 8080;
targetPort = 8080;
};
};
};
kubernetes.resources.deployments.redlib = {
metadata.namespace = "redlib";
spec = {
selector.matchLabels.app = appName;
replicas = 2;
template = {
metadata.labels.app = appName;
spec = {
volumes = {
config.configMap.name = "redlib";
};
containers = {
redlib = {
image = appImage;
imagePullPolicy = "Always";
ports.http.containerPort = 8080;
resources = {
requests = {
cpu = "100m";
memory = "64Mi";
};
limits = {
memory = "128Mi";
};
};
};
};
};
};
};
};
kubernetes.resources.ingresses.redlib = {
metadata = {
name = appName;
namespace = "redlib";
annotations = {
"cert-manager.io/cluster-issuer" = "le-issuer";
};
};
spec = {
tls = [
{
hosts = ["red.gmem.ca"];
}
];
rules = [
{
host = "red.gmem.ca";
http.paths = [
{
path = "/";
pathType = "Prefix";
backend.service = {
name = appName;
port.name = "http";
};
}
];
}
];
};
};
}

View file

@ -2,7 +2,7 @@ let
appName = "searxng"; appName = "searxng";
appImage = "docker.io/searxng/searxng:latest"; appImage = "docker.io/searxng/searxng:latest";
in in
{ {
lib, lib,
config, config,
kubenix, kubenix,
@ -82,15 +82,14 @@ in
'(.*\.)?youtube-noocookie\.com$': 'piped.gmem.ca' '(.*\.)?youtube-noocookie\.com$': 'piped.gmem.ca'
'(www\.)?twitter\.com$': 'nitter.gmem.ca' '(www\.)?twitter\.com$': 'nitter.gmem.ca'
'(www\.)?x\.com$': 'nitter.gmem.ca' '(www\.)?x\.com$': 'nitter.gmem.ca'
'(.*\.)?reddit\.com$': 'red.gmem.ca'
''; '';
data."limiter.toml" = '' data."limiter.toml" = ''
# This configuration file updates the default configuration file # This configuration file updates the default configuration file
# See https://github.com/searxng/searxng/blob/master/searx/botdetection/limiter.toml # See https://github.com/searxng/searxng/blob/master/searx/botdetection/limiter.toml
[botdetection.ip_limit] [botdetection.ip_limit]
# activate link_token method in the ip_limit method # activate link_token method in the ip_limit method
link_token = true link_token = true
''; '';
}; };
kubernetes.helm.releases.searxng-redis = { kubernetes.helm.releases.searxng-redis = {
@ -138,4 +137,4 @@ in
]; ];
}; };
}; };
} }

View file

@ -3,12 +3,12 @@ let
snikketImage = "git.gmem.ca/arch/snikket-server:latest"; snikketImage = "git.gmem.ca/arch/snikket-server:latest";
snikketPortalImage = "snikket/snikket-web-portal:stable"; snikketPortalImage = "snikket/snikket-web-portal:stable";
in in
{ {
lib, lib,
config, config,
kubenix, kubenix,
... ...
}: { }: {
kubernetes.resources.services.snikket = { kubernetes.resources.services.snikket = {
metadata.namespace = "snikket"; metadata.namespace = "snikket";
spec = { spec = {
@ -114,8 +114,7 @@ in
rules = [ rules = [
{ {
host = "chat.gmem.ca"; host = "chat.gmem.ca";
http.paths = http.paths = [
[
{ {
path = "/"; path = "/";
pathType = "Prefix"; pathType = "Prefix";
@ -147,4 +146,4 @@ in
]; ];
}; };
}; };
} }

View file

@ -20,7 +20,7 @@ in
kernelModules = ["kvm-amd" "vfio_pci" "vfio" "vfio_iommu_type1" "kvmfr"]; kernelModules = ["kvm-amd" "vfio_pci" "vfio" "vfio_iommu_type1" "kvmfr"];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
# Until https://github.com/NixOS/nixpkgs/pull/305018 is merged. # Until https://github.com/NixOS/nixpkgs/pull/305018 is merged.
(pkgs.linuxPackages_latest.kvmfr.overrideAttrs ({...}: { (pkgs.linuxPackages_latest.kvmfr.overrideAttrs({ ... }: {
patches = []; patches = [];
})) }))
]; ];

View file

@ -11,8 +11,8 @@
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
''${builtins.fetchTarball { ''${builtins.fetchTarball {
url = "https://github.com/nix-community/disko/archive/refs/tags/v1.6.1.tar.gz"; url = "https://github.com/nix-community/disko/archive/master.tar.gz";
sha256 = "1p9vsml07bm3riw703dv83ihlmgyc11qv882qa6bqzqdgn86y8z4"; sha256 = "1wg3nnh8lrc8q8q4qyk9yynsa24qqj9126h3cy0ijq93mz46i1k7";
}}/module.nix'' }}/module.nix''
./disk-config.nix ./disk-config.nix
]; ];

View file

@ -11,8 +11,8 @@
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
''${builtins.fetchTarball { ''${builtins.fetchTarball {
url = "https://github.com/nix-community/disko/archive/refs/tags/v1.6.1.tar.gz"; url = "https://github.com/nix-community/disko/archive/master.tar.gz";
sha256 = "1p9vsml07bm3riw703dv83ihlmgyc11qv882qa6bqzqdgn86y8z4"; sha256 = "1wg3nnh8lrc8q8q4qyk9yynsa24qqj9126h3cy0ijq93mz46i1k7";
}}/module.nix'' }}/module.nix''
./disk-config.nix ./disk-config.nix
]; ];

View file

@ -9,8 +9,23 @@
config.allowUnfreePredicate = pkg: config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [
"parsec-bin" "parsec-bin"
"discord"
]; ];
config.allowUnfree = true; config.allowUnfree = true;
overlays = let
discordOverlay = self: super: {
discord = super.discord.override {
withVencord = true;
withOpenASAR = true;
};
};
in [
(import (builtins.fetchTarball {
url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
sha256 = "09rsdkn16al5qsyrl5fjrljw7ff0z5yb9ihskbipcdiffcn11kax";
}))
discordOverlay
];
}; };
home = { home = {
username = "gsimmer"; username = "gsimmer";
@ -115,13 +130,12 @@
atuin atuin
age-plugin-yubikey age-plugin-yubikey
rage rage
vesktop discord
mangohud mangohud
comma comma
transmission_4-qt transmission_4-qt
ungoogled-chromium ungoogled-chromium
looking-glass-client looking-glass-client
senpai
]; ];
# This value determines the Home Manager release that your # This value determines the Home Manager release that your

View file

@ -30,7 +30,7 @@
fileSystems."/tmp" = { fileSystems."/tmp" = {
device = "tmpfs"; device = "tmpfs";
fsType = "tmpfs"; fsType = "tmpfs";
options = ["size=4G" "mode=777"]; # mode=755 so only root can write to those files options = [ "size=4G" "mode=777" ]; # mode=755 so only root can write to those files
}; };
swapDevices = [ swapDevices = [

View file

@ -1,84 +0,0 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{
config,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
age.secrets.cloudflared = {
file = ../../secrets/minecraft-server-cloudflared.age;
owner = "cloudflared";
};
nixpkgs.config.allowUnfree = true;
nix = {
settings = {
auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"];
};
};
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking = {
hostName = "minecraft-server"; # Define your hostname.
useDHCP = true;
firewall = {
enable = true;
allowedUDPPorts = [];
allowedTCPPorts = [22 80 443];
trustedInterfaces = ["enp6s18"];
checkReversePath = "loose";
};
nftables.enable = true;
};
services = {
openssh.enable = true;
minecraft-server = {
enable = true;
openFirewall = true;
eula = true;
#package = pkgs.papermc;
};
bluemap = {
enable = true;
eula = true;
defaultWorld = "${config.services.minecraft-server.dataDir}/world";
host = "mc.gmem.ca";
};
cloudflared = {
enable = true;
tunnels.minecraft = {
credentialsFile = config.age.secrets.cloudflared.path;
default = "http_status:404";
ingress = {
"mc.gmem.ca" = "http://localhost:80";
};
warp-routing.enabled = true;
};
};
# nginx reverse proxy
nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedBrotliSettings = true;
recommendedZstdSettings = true;
recommendedOptimisation = true;
recommendedTlsSettings = true;
recommendedProxySettings = true;
};
qemuGuest.enable = true;
};
system.stateVersion = "23.11"; # Did you read the comment?
}

View file

@ -1,32 +0,0 @@
{
disko.devices = {
disk = {
my-disk = {
device = "/dev/vda";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "500M";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
}

View file

@ -1,33 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
''${builtins.fetchTarball {
url = "https://github.com/nix-community/disko/archive/refs/tags/v1.6.1.tar.gz";
sha256 = "1p9vsml07bm3riw703dv83ihlmgyc11qv882qa6bqzqdgn86y8z4";
}}/module.nix''
./disk-config.nix
];
boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -301,22 +301,6 @@
recommendedZstdSettings = true; recommendedZstdSettings = true;
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts."plex.gmem.ca" = {
enableACME = true;
forceSSL = true;
acmeRoot = null;
locations."/" = {
extraConfig = ''
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
client_max_body_size 500M;
'';
proxyPass = "http://127.0.0.1:32400/";
};
};
virtualHosts."git.gmem.ca" = { virtualHosts."git.gmem.ca" = {
enableACME = true; enableACME = true;
addSSL = true; addSSL = true;
@ -567,17 +551,12 @@
security.acme.acceptTerms = true; security.acme.acceptTerms = true;
security.acme.defaults.email = "acme@gmem.ca"; security.acme.defaults.email = "acme@gmem.ca";
security.acme.certs."git.gmem.ca" = { security.acme.certs."git.gmem.ca" = {
domain = "git.gmem.ca"; domain = "*.gmem.ca";
dnsProvider = "cloudflare"; dnsProvider = "cloudflare";
credentialsFile = config.age.secrets.cloudflare-dns.path; credentialsFile = config.age.secrets.cloudflare-dns.path;
}; };
security.acme.certs."docs.gmem.ca" = { security.acme.certs."docs.gmem.ca" = {
domain = "docs.gmem.ca"; domain = "*.gmem.ca";
dnsProvider = "cloudflare";
credentialsFile = config.age.secrets.cloudflare-dns.path;
};
security.acme.certs."plex.gmem.ca" = {
domain = "plex.gmem.ca";
dnsProvider = "cloudflare"; dnsProvider = "cloudflare";
credentialsFile = config.age.secrets.cloudflare-dns.path; credentialsFile = config.age.secrets.cloudflare-dns.path;
}; };

View file

@ -44,7 +44,7 @@
} }
{ {
from = 8000; from = 8000;
to = 8900; to = 8010;
} }
]; ];
allowedUDPPorts = [41641 1935]; allowedUDPPorts = [41641 1935];
@ -81,23 +81,12 @@
openssh.enable = true; openssh.enable = true;
tailscale.enable = true; tailscale.enable = true;
owncast = { owncast = {
enable = false; enable = true;
port = 8080; port = 8080;
openFirewall = false; openFirewall = false;
}; };
mediamtx = {
enable = true;
settings = {
rtmp = false;
pathDefaults.srtPublishPassphrase = "thisisntforyoutouse";
paths = {
eufuria = {
srtPublishPassphrase = "beckiiscute";
};
};
};
};
nginx = { nginx = {
additionalModules = [pkgs.nginxModules.rtmp];
enable = true; enable = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
@ -120,6 +109,29 @@
}; };
}; };
}; };
appendConfig = ''
rtmp {
server {
listen 1936;
chunk_size 4096;
application live {
live on;
allow publish 127.0.0.1;
allow publish 100.110.180.123;
allow publish fd7a:115c:a1e0::246e:b47b;
deny publish all;
allow play all;
record off;
hls on;
hls_path /tmp/hls;
dash on;
dash_path /tmp/dash;
}
}
}
'';
}; };
}; };

View file

@ -8,8 +8,6 @@ let
dnsmasq = [dnsmasq-cache dnsmasq-cache-floof]; dnsmasq = [dnsmasq-cache dnsmasq-cache-floof];
minecraft-server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINkLMVdCnjFsZ3tg7s3fE64VBw4QIekgMt2fAY1E79wv";
proxmox-k3s-node = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB1KEjdFl0UmuKfESJTMZdKR2H9a405z0SSlt75NKKht"; proxmox-k3s-node = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB1KEjdFl0UmuKfESJTMZdKR2H9a405z0SSlt75NKKht";
seattle = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF9pTEqeVljLq0ctFgDn25Q76mCqpddkSNN9kd3IQXd1"; seattle = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF9pTEqeVljLq0ctFgDn25Q76mCqpddkSNN9kd3IQXd1";
glasgow = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMgZSpfnx/4kfE4P1tFpq047IZkF2Q0UYahputnWxtEJ"; glasgow = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMgZSpfnx/4kfE4P1tFpq047IZkF2Q0UYahputnWxtEJ";
@ -35,6 +33,4 @@ in {
"secrets/paperless-oauth.age".publicKeys = [vancouver] ++ users; "secrets/paperless-oauth.age".publicKeys = [vancouver] ++ users;
"secrets/dnsmasq-nextdns-profile.age".publicKeys = dnsmasq ++ users; "secrets/dnsmasq-nextdns-profile.age".publicKeys = dnsmasq ++ users;
"secrets/minecraft-server-cloudflared.age".publicKeys = [minecraft-server] ++ users;
} }

Binary file not shown.