erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:a8d7a0ea3574d62b0ff57e4f0e57468522e11413
Branches Tags
erwin:main
..
compare: erwin:aba9fe6fe98ff044c4ab9c5a6572c4ecad779ca6
Branches Tags
erwin:main

No commits in common. "a8d7a0ea3574d62b0ff57e4f0e57468522e11413" and "aba9fe6fe98ff044c4ab9c5a6572c4ecad779ca6" have entirely different histories.
a8d7a0ea35 ... aba9fe6fe9

13 changed files with 86 additions and 125 deletions
Show stats Expand all files Collapse all files

90
flake.lock
View file

@ -9,11 +9,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1717576207, "lastModified": 1717563631,
"narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", "narHash": "sha256-W22hMKD1Qa1ARgLS3zB4EIfOTmPvrAEfd+qZ71QgJyg=",
"owner": "Kirottu", "owner": "Kirottu",
"repo": "anyrun", "repo": "anyrun",
"rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", "rev": "8c1f7907a4ee51226b1fd20674086fe292e4136e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718047990, "lastModified": 1717533891,
"narHash": "sha256-eHTd7rasshvqnNNjfmB1A0rBchZfiF3M8vSorPuy/u0=", "narHash": "sha256-XzvSLzyVmaHjgjLastmsh7HD7QrQD8xOvV8yCTYyivw=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "55a2fe50f70a5dc7d4a9ee5e1d6ffc213c74291b", "rev": "9943c53a7012e1a571ed6a66c127884fa3249767",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717860777, "lastModified": 1713279563,
"narHash": "sha256-j3hBTCwO0T+fkSLm2jN1MhXuOYLtsLK5nGMz+z44L+g=", "narHash": "sha256-bTVj6mAr+NAqwzVhHBBhOszRpWiNYglp93aNIzukiYE=",
"owner": "eboskma", "owner": "eboskma",
"repo": "caddy-with-plugins", "repo": "caddy-with-plugins",
"rev": "c6ff99288a79ed98482759e4feea0b90ade9219b", "rev": "bb26c2e7fa43be39d4d184c0d443d649cda91897",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718008439, "lastModified": 1717490821,
"narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -220,11 +220,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1718096975, "lastModified": 1717552306,
"narHash": "sha256-Ud33Yz5o2OJ9mjH5rhbrdR+polxq9QyOLLNbtQ63s4E=", "narHash": "sha256-SI42G6mLxgn6vvSNxSuydQl0M41UZFh+Bx+ePjXbuyI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d2404a42ad3ae9c5ee5c481b7c7a4c91627d161f", "rev": "d619b5b5ba751d6e3c16da1ca8178a31ef130047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -564,11 +564,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717931644, "lastModified": 1717525419,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,11 +656,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717767239, "lastModified": 1717274471,
"narHash": "sha256-F/ZA/yhBg1XJYudA6b4ORt5CnEwOu4gR/UbMVq1UYMY=", "narHash": "sha256-mQEWQOak0r8YEXK5IzvSfScmndpdODBKNvN0T8QydEg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "3397956280fe8f555ffe11fe3a8115341a0ef460", "rev": "62d5a9eb8ba0feb1d62292ca29de98785bcef04a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,11 +671,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1717995329, "lastModified": 1717515267,
"narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -730,11 +730,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1717880976, "lastModified": 1717159533,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1717880976, "lastModified": 1717265169,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -778,11 +778,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1717974879, "lastModified": 1717196966,
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -830,11 +830,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1717664902, "lastModified": 1716213921,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -906,11 +906,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718072316, "lastModified": 1717553884,
"narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", "narHash": "sha256-+t3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU+pSE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", "rev": "8795c817dfab19243a33387a16c98d2df4075bb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -927,11 +927,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1718058322, "lastModified": 1717455931,
"narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=", "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f", "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1024,11 +1024,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717850719, "lastModified": 1717278143,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home-manager/modules/firefox/default.nix
View file

@ -20,6 +20,7 @@ let
"browser.tabs.crashReporting.sendReport" = false; "browser.tabs.crashReporting.sendReport" = false;
"browser.translations.enable" = false; "browser.translations.enable" = false;
"browser.urlbar.trimURLs" = false; "browser.urlbar.trimURLs" = false;
"dom.event.contextmenu.enabled" = false;
"devtools.theme" = "dark"; "devtools.theme" = "dark";
"experiments.activeExperiment" = false; "experiments.activeExperiment" = false;
"experiments.enabled" = false; "experiments.enabled" = false;

2
home-manager/modules/nushell/default.nix
View file

@ -17,6 +17,7 @@ in
programs = { programs = {
nushell = { nushell = {
enable = true; enable = true;
package = pkgs.nushellFull;
configFile.source = ./config.nu; configFile.source = ./config.nu;
envFile.source = ./env.nu; envFile.source = ./env.nu;
@ -34,7 +35,6 @@ in
register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query
register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats
register ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars
use kink.nu use kink.nu

2
home-manager/modules/vscode/default.nix
View file

@ -35,6 +35,7 @@ in
# EugenWiens.bitbake # EugenWiens.bitbake
elixir-lsp.vscode-elixir-ls # this is the one by Jake Becker, not the deprecated one elixir-lsp.vscode-elixir-ls # this is the one by Jake Becker, not the deprecated one
# kumar-harsh.graphql-for-vscode # kumar-harsh.graphql-for-vscode
matklad.rust-analyzer
# monokai.theme-monokai-pro-vscode # monokai.theme-monokai-pro-vscode
ms-azuretools.vscode-docker ms-azuretools.vscode-docker
ms-python.python ms-python.python
@ -51,7 +52,6 @@ in
# pgourlain.erlang # pgourlain.erlang
# phoenixframework.phoenix # phoenixframework.phoenix
rubymaniac.vscode-paste-and-indent rubymaniac.vscode-paste-and-indent
rust-lang.rust-analyzer
# surajbarkale.ninja # surajbarkale.ninja
timonwong.shellcheck timonwong.shellcheck
tuttieee.emacs-mcx tuttieee.emacs-mcx

1
machines/default.nix
View file

@ -141,6 +141,7 @@ inputs: {
# host = "10.0.0.207"; # host = "10.0.0.207";
host = "unifi.barn-beaver.ts.net"; host = "unifi.barn-beaver.ts.net";
targetUser = "erwin"; targetUser = "erwin";
tags = [ "container" ];
}; };
}; };
valkyrie = { valkyrie = {

15
machines/gitea/configuration.nix
View file

@ -1,5 +1,5 @@
{ self, caddy-with-plugins, ... }: { self, ... }:
{ pkgs, modulesPath, ... }: { modulesPath, ... }:
{ {
imports = [ imports = [
(modulesPath + "/virtualisation/lxc-container.nix") (modulesPath + "/virtualisation/lxc-container.nix")
@ -8,6 +8,7 @@
../../users/erwin ../../users/erwin
./backup.nix ./backup.nix
./forgejo ./forgejo
./caddy.nix
]; ];
eboskma = { eboskma = {
@ -15,16 +16,6 @@
enable = true; enable = true;
server = true; server = true;
}; };
caddy-proxy = {
enable = true;
package = caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare;
proxyHosts = [
{
externalHostname = "git.datarift.nl";
proxyAddress = "localhost:3000";
}
];
};
nix-common = { nix-common = {
enable = true; enable = true;
remote-builders = true; remote-builders = true;

5
machines/odin/configuration.nix
View file

@ -112,11 +112,6 @@
enabledCollectors = [ "systemd" ]; enabledCollectors = [ "systemd" ];
}; };
}; };
iperf3 = {
enable = true;
openFirewall = true;
};
}; };
system.stateVersion = "24.05"; system.stateVersion = "24.05";

20
machines/saga/configuration.nix
View file

@ -1,6 +1,5 @@
{ self, caddy-with-plugins, ... }: { self, ... }:
{ {
pkgs,
modulesPath, modulesPath,
lib, lib,
config, config,
@ -23,16 +22,6 @@
enable = true; enable = true;
server = true; server = true;
}; };
caddy-proxy = {
enable = true;
package = caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare;
proxyHosts = [
{
externalHostname = "saga.datarift.nl";
proxyAddress = "localhost:3000";
}
];
};
nix-common = { nix-common = {
enable = true; enable = true;
remote-builders = true; remote-builders = true;
@ -59,8 +48,7 @@
firewall.trustedInterfaces = [ "tailscale0" ]; firewall.trustedInterfaces = [ "tailscale0" ];
}; };
systemd = { systemd.network = {
network = {
enable = true; enable = true;
wait-online.anyInterface = true; wait-online.anyInterface = true;
@ -81,9 +69,6 @@
}; };
}; };
services.logrotate-checkconf.enable = false;
};
security = { security = {
sudo-rs = { sudo-rs = {
enable = true; enable = true;
@ -95,7 +80,6 @@
sops.defaultSopsFile = ./secrets.yaml; sops.defaultSopsFile = ./secrets.yaml;
sops.secrets = { sops.secrets = {
caddy-env = { };
metrics_ca = { metrics_ca = {
owner = config.systemd.services.prometheus.serviceConfig.User; owner = config.systemd.services.prometheus.serviceConfig.User;
}; };

5
machines/saga/secrets.yaml
View file

@ -2,7 +2,6 @@ metrics_cert: ENC[AES256_GCM,data:hxI6B6h1eOaHlYpUeHcsXMAEPZwuKpAgZ9gYkkqK73guUy
metrics_key: ENC[AES256_GCM,data:fGpIg3k/PBcq4dVdLL5oNEdbrPTFarDAi9QLw7ViEfzG4jdxOec8rdFNtECX3IdtGIFZ7VtLd7hTISYrklafBqYMyBw0y3dxmbQaG7CQoIPoxnoJlbwAxofjfgFyVa69V6/o1mvCBfw3Tv8akRQel+3lTTB7RgqBsd+JNjiIsrC5r4JAr6KJCkKKLbNJZ79W1PGdKb2VEeVwGmdfWcvKz4TN6Za4cwhc51IAnZBH+2QnNNCYM6JnT0LVIzERS6ljF8MOb2Xmaqb9w6QxxTLX4nheEceWpOMLc71nIGtMSsU+SiRiZtHEdcUsDGBUdriqQ2mP5Q10Yz0K0u1wqXiLiz/wfeFGIvRPNOpP/b/cSFQSp494ZnMdO2bsnXOKQNFVBkkIO2jvB2SOlIJwC329n9vG,iv:jktiYgPJluYrQOpOOTwwpQ9SDJVvsO4lEwDe+l2cn3Q=,tag:rduGq7/XVShG9SqQeWl19g==,type:str] metrics_key: ENC[AES256_GCM,data:fGpIg3k/PBcq4dVdLL5oNEdbrPTFarDAi9QLw7ViEfzG4jdxOec8rdFNtECX3IdtGIFZ7VtLd7hTISYrklafBqYMyBw0y3dxmbQaG7CQoIPoxnoJlbwAxofjfgFyVa69V6/o1mvCBfw3Tv8akRQel+3lTTB7RgqBsd+JNjiIsrC5r4JAr6KJCkKKLbNJZ79W1PGdKb2VEeVwGmdfWcvKz4TN6Za4cwhc51IAnZBH+2QnNNCYM6JnT0LVIzERS6ljF8MOb2Xmaqb9w6QxxTLX4nheEceWpOMLc71nIGtMSsU+SiRiZtHEdcUsDGBUdriqQ2mP5Q10Yz0K0u1wqXiLiz/wfeFGIvRPNOpP/b/cSFQSp494ZnMdO2bsnXOKQNFVBkkIO2jvB2SOlIJwC329n9vG,iv:jktiYgPJluYrQOpOOTwwpQ9SDJVvsO4lEwDe+l2cn3Q=,tag:rduGq7/XVShG9SqQeWl19g==,type:str]
metrics_ca: ENC[AES256_GCM,data:nMocCNsco+iYrrZbJxuoWhQ5ytDyy+JjaRTbalTof4CPK3CtWpu2KhHhVJNN+XaThns3jzBEjEDyuPqhb27CaUG871Z8O8BGAEtYWUa886sIdgPgOkL3rsDCELxnnEkCKIcyfu3DZFIcs+hWQGOVQ3KBY44dpwJzm5xm/PbbpiPo7QawAzEhOynmRz1eN+At+aDgBNMRJ9fWg5qaImf6iFL804M7q6mjVAOopvL+I5vMAn4FODWWn93Vm0edHWjhIDb2NHuwSL0WRdt74GMES+ZPvBjpnGsMFteCC1sWGuAMY9S78V54+o95Ijf6j8yzPadyayZb51K2/qGWas/wpaQlmva2mQvv/y1jpDfewLt4ZstzqCamVhhXzZfguf7F+MpbEGpNUl7SvCnS6BtNU7XCaV5bEp8vTKfhYVh+/AqBPYG2BpLB0N/Q198/nTkW82CgP1V4BJ8HD8FiWympZjhLjdglkMZ3h1u9k6VQIAZ9kQS3B60kKBq1mWhDVmZmNTSMf85zfV48XrBPF/ttCfCjd33gxopok5OLMZqVHNKY4PxCLI6e5FKOwwEmrzf6MffGiDWZWMgTaz3OM+d9Yv8yjNDeboGb6TGRn4yXfKlcsl4mYZi+C3IJ0BkmUA9BXaLXhhWKl/e5Xs5Ajtgf3fwSVEgsQ8G3kC2OQT0qoIMKx37K4YmABYVFx0qcJy2diQ3ZoFmvGAwvYb5vKtlyJHnbDz6OyXWfYc1UkAG4mtHNMrsgSL7ruju4QvIeZPwXDsNazI9R3dWaLbnz041JQNRvA0Kpwg3LxHaf4D0Ln7nBokEmvRycuBXljPk35B3CuGoj2qnCJzx057MTQoX/UKtQ/KRbGP0Dmmu+s1cH9dHw8l3ya+zZEKBJHt2w7rmmMiYVXMetjoPIHevePumDeXFRyCvU3mWwj7xUtzbrpTwY0zSYi5brdMRe4NBtmYJsMmH7Jgc+HOgtbm8MC++FApxiKpV2,iv:08lM7WQLcnuC7DvTZ1999sOojo9l35gAZpp4oIMuJBY=,tag:YW0xjTJkycV7xJHZuhE0uQ==,type:str] metrics_ca: ENC[AES256_GCM,data:nMocCNsco+iYrrZbJxuoWhQ5ytDyy+JjaRTbalTof4CPK3CtWpu2KhHhVJNN+XaThns3jzBEjEDyuPqhb27CaUG871Z8O8BGAEtYWUa886sIdgPgOkL3rsDCELxnnEkCKIcyfu3DZFIcs+hWQGOVQ3KBY44dpwJzm5xm/PbbpiPo7QawAzEhOynmRz1eN+At+aDgBNMRJ9fWg5qaImf6iFL804M7q6mjVAOopvL+I5vMAn4FODWWn93Vm0edHWjhIDb2NHuwSL0WRdt74GMES+ZPvBjpnGsMFteCC1sWGuAMY9S78V54+o95Ijf6j8yzPadyayZb51K2/qGWas/wpaQlmva2mQvv/y1jpDfewLt4ZstzqCamVhhXzZfguf7F+MpbEGpNUl7SvCnS6BtNU7XCaV5bEp8vTKfhYVh+/AqBPYG2BpLB0N/Q198/nTkW82CgP1V4BJ8HD8FiWympZjhLjdglkMZ3h1u9k6VQIAZ9kQS3B60kKBq1mWhDVmZmNTSMf85zfV48XrBPF/ttCfCjd33gxopok5OLMZqVHNKY4PxCLI6e5FKOwwEmrzf6MffGiDWZWMgTaz3OM+d9Yv8yjNDeboGb6TGRn4yXfKlcsl4mYZi+C3IJ0BkmUA9BXaLXhhWKl/e5Xs5Ajtgf3fwSVEgsQ8G3kC2OQT0qoIMKx37K4YmABYVFx0qcJy2diQ3ZoFmvGAwvYb5vKtlyJHnbDz6OyXWfYc1UkAG4mtHNMrsgSL7ruju4QvIeZPwXDsNazI9R3dWaLbnz041JQNRvA0Kpwg3LxHaf4D0Ln7nBokEmvRycuBXljPk35B3CuGoj2qnCJzx057MTQoX/UKtQ/KRbGP0Dmmu+s1cH9dHw8l3ya+zZEKBJHt2w7rmmMiYVXMetjoPIHevePumDeXFRyCvU3mWwj7xUtzbrpTwY0zSYi5brdMRe4NBtmYJsMmH7Jgc+HOgtbm8MC++FApxiKpV2,iv:08lM7WQLcnuC7DvTZ1999sOojo9l35gAZpp4oIMuJBY=,tag:YW0xjTJkycV7xJHZuhE0uQ==,type:str]
grafana-oauth2-secret: ENC[AES256_GCM,data:D4f/MxiIGaeKD5DNXiCLg2IeFMX0TAkxIR1BY+1z89w=,iv:XNrRSwipAbpQFnXG94zke28gTL22zNf/HfGriChaRgA=,tag:6tsqNc68wHujtlmV4plwPQ==,type:str] grafana-oauth2-secret: ENC[AES256_GCM,data:D4f/MxiIGaeKD5DNXiCLg2IeFMX0TAkxIR1BY+1z89w=,iv:XNrRSwipAbpQFnXG94zke28gTL22zNf/HfGriChaRgA=,tag:6tsqNc68wHujtlmV4plwPQ==,type:str]
caddy-env: ENC[AES256_GCM,data:ntuUzIevCFYT6pUmVzcbvaHTdCIhpdtlYHhQynojNI77JqnF3o/OJVugXI0O4DqRLVkzaKcQ,iv:XqWjxR1PrwN/pO3Nh/TLdDlpcm2QfdVIVCACfrsCwEk=,tag:d8FFJ+P4hFrNp/tBckPteQ==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -36,8 +35,8 @@ sops:
K1FHaGVOQlo2cjBTQ3ZIYXZ5ZzNsNlEKLZWrUkNXTv8ECwXz1aPdnrpMs6r9Q+yI K1FHaGVOQlo2cjBTQ3ZIYXZ5ZzNsNlEKLZWrUkNXTv8ECwXz1aPdnrpMs6r9Q+yI
k5rFkaa+ylIk4OqouKRxxlNFdgcdqqYdZEqLrfuLnamzr6LNaoL1dQ== k5rFkaa+ylIk4OqouKRxxlNFdgcdqqYdZEqLrfuLnamzr6LNaoL1dQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-06-10T09:03:14Z" lastmodified: "2024-02-29T15:40:45Z"
mac: ENC[AES256_GCM,data:5M837MDd/9ZPyoczsKQ0UJVtFxcX+DsKxZplsZgQA2iKhgzKtWsrz/HciYUnDsYqlTswDWPZhcMpEAhzozUxuKJEoWswmwuKAEBLn5zb6fcvy3H8oMDELR/e3IFZ+5dpxeaWrJwx2mXHdk/aW1AiWjtSpcNlNlF1QM8oFvwjlbA=,iv:h+uRWTlMZlkatS6zBLa9znGb77o8oPA2KC2C/rrVnGw=,tag:8/hTW2BDdTN8V36gSXFMEg==,type:str] mac: ENC[AES256_GCM,data:+gH5ZcPlJ1ESdo93Td9BfuMKB1la18ER8OnA65/WERL5bjFai0GRjLxUGOLiJF5ApIj1JMfoqd08awvS8xUVM/4zccYXTeHtngVw2Ra9q3wcvFK4VzQ7kIO0btd6+YSdGGFpWLwBvErsn1yUs67sl69qr4qz0BxMrFn3zac3aQU=,iv:4fxThNrDrOsNNSykVVEmAHfl2VpcZVA58E5lZ+krEpE=,tag:RFigNQQzcZBMiCky5nL3Wg==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

13
machines/valkyrie/blocky/default.nix
View file

@ -9,7 +9,7 @@
}; };
upstreams = { upstreams = {
groups = { groups = {
default = [ "127.0.0.1:5455" ]; default = [ "127.0.0.1:5335" ];
"100.64.0.0/10" = [ "127.0.0.1:5454" ]; "100.64.0.0/10" = [ "127.0.0.1:5454" ];
"fd7a:115c:a1e0::/96" = [ "127.0.0.1:5454" ]; "fd7a:115c:a1e0::/96" = [ "127.0.0.1:5454" ];
"fd7a:115c:a1e0:ab12::/64" = [ "127.0.0.1:5454" ]; "fd7a:115c:a1e0:ab12::/64" = [ "127.0.0.1:5454" ];
@ -35,6 +35,17 @@
customDNS = { customDNS = {
mapping = { mapping = {
"home.datarift.nl" = "10.0.0.251";
"frigate.datarift.nl" = "10.0.0.251";
"git.datarift.nl" = "10.0.0.203";
"loki.datarift.nl" = "10.0.0.4";
"minio.datarift.nl" = "10.0.0.251";
"minio-admin.datarift.nl" = "10.0.0.251";
"mqtt.datarift.nl" = "10.0.0.254";
"nix-cache.datarift.nl" = "10.0.0.209";
"saga.datarift.nl" = "10.0.0.251";
"vidz.datarift.nl" = "10.0.0.211";
# Horus # Horus
"vaultserver.horus.nu" = "192.168.4.32"; "vaultserver.horus.nu" = "192.168.4.32";
}; };

14
machines/valkyrie/coredns/datarift.zone
View file

@ -1,14 +0,0 @@
$ORIGIN datarift.nl.
$TTL 3600
@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 3 3600 900 86400 1800
home IN A 10.0.0.251
frigate IN A 10.0.0.251
git IN A 10.0.0.203
loki IN A 10.0.0.4
minio IN A 10.0.0.251
minio-admin IN A 10.0.0.251
mqtt IN A 10.0.0.254
nix-cache IN A 10.0.0.209
saga IN A 10.0.0.251
vidz IN A 10.0.0.211

15
machines/valkyrie/coredns/default.nix
View file

@ -4,28 +4,21 @@
enable = true; enable = true;
config = '' config = ''
.:5454 { datarift.nl:5454 {
bind lo bind 127.0.0.1 ::1
reload 5s
tailscale datarift.nl { tailscale datarift.nl {
authkey {$TS_AUTHKEY} authkey {$TS_AUTHKEY}
fallthrough fallthrough
} }
forward . 127.0.0.1:5335 forward . 127.0.0.1:5335
log log
debug
errors errors
} }
.:5455 { .:5454 {
bind lo bind 127.0.0.1 ::1
reload 5s
file ${./datarift.zone} datarift.nl {
reload 10s
}
forward . 127.0.0.1:5335 forward . 127.0.0.1:5335
log log
debug
errors errors
} }
''; '';

4
modules/keycloak/keycloak-admin-ui.nix
View file

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak"; owner = "keycloak";
repo = "keycloak"; repo = "keycloak";
rev = version; rev = version;
sha256 = "ZbI0ekuYOl7SSzoGHGOTs/u3hRHfh9qFH0FB953YxP0="; sha256 = "+T8Y3/CkWFslhzGH+5uceb7hYJioxivMkLHTBYvq7KM=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-Cru48OGrrBSjfHzPrEbRRZXxB75tIn5URw0fFILcTf0="; mvnHash = "sha256-6vlH568z0oeBZQu953DNMkpneqzwFh9o7wmG1iOaoxA=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''