Compare commits
6 commits
fc7edd3193
...
bfd306b9d2
| Author | SHA1 | Date | |
|---|---|---|---|
bfd306b9d2
|
|||
|
36a1d89286
|
|||
|
16ef686afe
|
|||
|
369cc8e26c
|
|||
|
d1d7e15dbf
|
|||
|
62011456e8
|
8 changed files with 105 additions and 61 deletions
98
flake.lock
98
flake.lock
|
|
@ -56,11 +56,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719438880,
|
||||
"narHash": "sha256-9gDzIzM5eQ35vrzekK8mebo/9LXavQ8Am5pduUvUbSE=",
|
||||
"lastModified": 1719991445,
|
||||
"narHash": "sha256-0zSXPres0wlhS9n6h44ZzV0TOeWdMsICMlHAGjqkWGE=",
|
||||
"owner": "atuinsh",
|
||||
"repo": "atuin",
|
||||
"rev": "8eab351fca92e00b46e92a5e7bc1dda1647637df",
|
||||
"rev": "a67cfc82fe0dc907a01f07a0fd625701e062a33b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -197,11 +197,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719640067,
|
||||
"narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=",
|
||||
"lastModified": 1719864345,
|
||||
"narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "423b86a7f756421325e71663ada79a199bf13408",
|
||||
"rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -221,11 +221,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719625994,
|
||||
"narHash": "sha256-DbB/SQVaF+B+I5KAU7+c/8tvlg86ZJ7X0IDSTPuIXec=",
|
||||
"lastModified": 1719937143,
|
||||
"narHash": "sha256-1E5AX/Si2p2yXuMX5yixQ+P1AeVcrV0+2gfuBrTRkgY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "012409732a53433d75db7bb2e06dd0bdaf8ca7ea",
|
||||
"rev": "bbe883e60c65dd9254d010e98a1a8a654a26f9d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -267,11 +267,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717827974,
|
||||
"narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=",
|
||||
"lastModified": 1719728857,
|
||||
"narHash": "sha256-TW68WegsA2KLjQMHTaP2//tLgXSaFiRdZKxKUc7vEtY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8",
|
||||
"rev": "2c06f54eb102f325f88472a9713f6d779726c2f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -418,11 +418,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717285511,
|
||||
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -587,11 +587,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719588253,
|
||||
"narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=",
|
||||
"lastModified": 1719992360,
|
||||
"narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e",
|
||||
"rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -679,11 +679,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719655605,
|
||||
"narHash": "sha256-J86zYcke2RUKGGKFWDkRUxJoPAuvpQ4xHilVkSxwb6s=",
|
||||
"lastModified": 1719829515,
|
||||
"narHash": "sha256-dBWcpHCVDi58lnVEPaYgRiQnlqcfbnTNGMLVOpDWq38=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-ld-rs",
|
||||
"rev": "b2f0f998b5391e827615be1441787573da1bf342",
|
||||
"rev": "594465d9e48c86038d4833125067cc7af143bd3a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -694,11 +694,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1719647737,
|
||||
"narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=",
|
||||
"lastModified": 1719895800,
|
||||
"narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "231274268ff2250d4730e274b808f66ef91b6381",
|
||||
"rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -725,14 +725,14 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1717284937,
|
||||
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
|
||||
"lastModified": 1719876945,
|
||||
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -753,11 +753,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1719234068,
|
||||
"narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=",
|
||||
"lastModified": 1719837636,
|
||||
"narHash": "sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "90bd1b26e23760742fdcb6152369919098f05417",
|
||||
"rev": "28f8f3531ebdbea069995c20bd946a295699f275",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -785,11 +785,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1719099622,
|
||||
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
|
||||
"lastModified": 1719663039,
|
||||
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
|
||||
"rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -801,11 +801,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1719506693,
|
||||
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
|
||||
"lastModified": 1719848872,
|
||||
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
|
||||
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -897,11 +897,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1717583671,
|
||||
"narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
|
||||
"lastModified": 1719576535,
|
||||
"narHash": "sha256-YzF4P6YVInAjcR5eJHWefkKEu5t70KYVZMvdLODv8CM=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
|
||||
"rev": "9463d9eea4b87e651e7d8ed8425a9c92f23b1cdf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -943,11 +943,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719627476,
|
||||
"narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=",
|
||||
"lastModified": 1719973106,
|
||||
"narHash": "sha256-IGCdN/m7DfwUfxZjFnlTiTtpwSHCb01P/LWavAKD2jw=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f",
|
||||
"rev": "fb733500aead50880b9b301f34a0061bf997d6f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -964,11 +964,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719268571,
|
||||
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
|
||||
"lastModified": 1719873517,
|
||||
"narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
|
||||
"rev": "a11224af8d824935f363928074b4717ca2e280db",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1061,11 +1061,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719243788,
|
||||
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
|
||||
"lastModified": 1719887753,
|
||||
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
|
||||
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -270,6 +270,7 @@
|
|||
|
||||
packages = {
|
||||
coredns = pkgs.callPackage ./pkgs/coredns { };
|
||||
dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
|
||||
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
|
||||
gitu = pkgs.callPackage ./pkgs/gitu { };
|
||||
headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { };
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
blackLists = {
|
||||
ads = [
|
||||
"https://big.oisd.nl/domainswild"
|
||||
"https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt" # AdAway
|
||||
"https://adguardteam.github.io/HostlistsRegistry/assets/filter_8.txt" # browser-based crypto miners
|
||||
"https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews/hosts"
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,20 +4,12 @@
|
|||
enable = true;
|
||||
|
||||
config = ''
|
||||
datarift.nl:5454 {
|
||||
bind lo
|
||||
reload 5s
|
||||
tailscale datarift.nl {
|
||||
authkey {$TS_AUTHKEY}
|
||||
fallthrough
|
||||
}
|
||||
log
|
||||
debug
|
||||
errors
|
||||
}
|
||||
.:5454 {
|
||||
bind lo
|
||||
reload 5s
|
||||
file ${./tailscale.zone} datarift.nl {
|
||||
reload 10s
|
||||
}
|
||||
forward . 127.0.0.1:5335
|
||||
log
|
||||
debug
|
||||
|
|
|
|||
19
machines/valkyrie/coredns/tailscale.zone
Normal file
19
machines/valkyrie/coredns/tailscale.zone
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
$TTL 3600
|
||||
@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 10 3600 900 86400 1800
|
||||
|
||||
home.datarift.nl. IN CNAME proxy.barn-beaver.ts.net.
|
||||
frigate.datarift.nl. IN CNAME frigate.barn-beaver.ts.net.
|
||||
git.datarift.nl. IN CNAME gitea.barn-beaver.ts.net.
|
||||
loki.datarift.nl. IN CNAME loki.barn-beaver.ts.net.
|
||||
minio.datarift.nl. IN CNAME minio.barn-beaver.ts.net.
|
||||
minio-admin.datarift.nl. IN CNAME minio.barn-beaver.ts.net.
|
||||
mqtt.datarift.nl. IN CNAME homeassistant.barn-beaver.ts.net.
|
||||
nix-cache.datarift.nl. IN CNAME nix-cache.barn-beaver.ts.net.
|
||||
saga.datarift.nl. IN CNAME saga.barn-beaver.ts.net.
|
||||
vidz.datarift.nl. IN CNAME vidz.barn-beaver.ts.net.
|
||||
heimdall.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net.
|
||||
meili.datarift.nl. IN CNAME meili.barn-beaver.ts.net.
|
||||
odin.datarift.nl. IN CNAME odin.barn-beaver.ts.net.
|
||||
id.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net.
|
||||
garfield.datarift.nl. IN CNAME heimdall.barn-beaver.ns.net.
|
||||
|
||||
|
|
@ -47,5 +47,4 @@ _final: prev: {
|
|||
gitu = prev.pkgs.callPackage ../pkgs/gitu { };
|
||||
zed = prev.pkgs.callPackage ../pkgs/zed { };
|
||||
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
|
||||
coredns = prev.pkgs.callPackage ../pkgs/coredns { };
|
||||
}
|
||||
|
|
|
|||
30
pkgs/dnspyre/default.nix
Normal file
30
pkgs/dnspyre/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
system,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnspyre";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tantalor93";
|
||||
repo = "dnspyre";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lz175AijiF3GXVV6RqAPI/W5rKKQLNwF80One89l3A4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EfsjJKhZp8Dz1EZz0K8iZ4zjsJxV+O/QXwrDSsx5bzU=";
|
||||
|
||||
ldflags = [ "-X=github.com/tantalor93/dnspyre/v3/cmd.Version=${version}-${system}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for a high QPS DNS benchmark";
|
||||
homepage = "https://github.com/Tantalor93/dnspyre";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "dnspyre";
|
||||
};
|
||||
}
|
||||
|
|
@ -196,6 +196,7 @@ in
|
|||
bottom
|
||||
dconf
|
||||
dbeaver-bin
|
||||
doggo
|
||||
easyeffects
|
||||
element-desktop
|
||||
fd
|
||||
|
|
|
|||
Loading…
Reference in a new issue