feat(thinkrac): Add docker #91

Merged
DarkKirb merged 1 commit from add-docker-thinkpad into main 2022-12-08 11:30:37 +00:00
5 changed files with 45 additions and 44 deletions

View file

@ -1,3 +1,4 @@
{ {
"python.formatting.provider": "yapf" "python.formatting.provider": "yapf",
"conventionalCommits.scopes": ["thinkrac"]
} }

View file

@ -17,6 +17,7 @@ in {
./services/pipewire.nix ./services/pipewire.nix
./desktop-secrets.nix ./desktop-secrets.nix
./services/cups.nix ./services/cups.nix
./services/docker.nix
]; ];
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
noto-fonts noto-fonts

View file

@ -19,7 +19,6 @@
nixos-hardware.nixosModules.common-gpu-amd nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./services/postgres.nix ./services/postgres.nix
./services/docker.nix
./services/drone-runner-docker.nix ./services/drone-runner-docker.nix
./services/gitlab-runner ./services/gitlab-runner
]; ];

View file

@ -45,27 +45,27 @@ with dns.lib.combinators; let
} }
]; ];
/* /*
subdomains = { subdomains = {
_tcp.subdomains."*".TLSA = [ _tcp.subdomains."*".TLSA = [
{ {
certUsage = "dane-ee"; certUsage = "dane-ee";
selector = "spki"; selector = "spki";
match = "sha256"; match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f"; certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL; ttl = zoneTTL;
} }
]; ];
_udp.subdomains."*".TLSA = [ _udp.subdomains."*".TLSA = [
{ {
certUsage = "dane-ee"; certUsage = "dane-ee";
selector = "spki"; selector = "spki";
match = "sha256"; match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f"; certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL; ttl = zoneTTL;
} }
]; ];
}; };
*/ */
HTTPS = [ HTTPS = [
{ {
svcPriority = 1; svcPriority = 1;

View file

@ -76,27 +76,27 @@ in {
} }
]; ];
/* /*
subdomains = { subdomains = {
_tcp.subdomains."*".TLSA = [ _tcp.subdomains."*".TLSA = [
{ {
certUsage = "dane-ee"; certUsage = "dane-ee";
selector = "spki"; selector = "spki";
match = "sha256"; match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f"; certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL; ttl = zoneTTL;
} }
]; ];
_udp.subdomains."*".TLSA = [ _udp.subdomains."*".TLSA = [
{ {
certUsage = "dane-ee"; certUsage = "dane-ee";
selector = "spki"; selector = "spki";
match = "sha256"; match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f"; certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL; ttl = zoneTTL;
} }
]; ];
}; };
*/ */
HTTPS = [ HTTPS = [
{ {
svcPriority = 1; svcPriority = 1;