Compare commits
4 commits
2ccaffa97d
...
34998b908c
| Author | SHA1 | Date | |
|---|---|---|---|
34998b908c
|
|||
|
2e335daba8
|
|||
|
51457c2bee
|
|||
|
c776c47d8e
|
7 changed files with 63 additions and 41 deletions
Binary file not shown.
38
flake.lock
38
flake.lock
|
|
@ -300,11 +300,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695224363,
|
||||
"narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=",
|
||||
"lastModified": 1695495225,
|
||||
"narHash": "sha256-4i4XCjN60llr7U6/03bhPKsFoeKecLnW4WScQEc4n+A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00",
|
||||
"rev": "e0c70942c0e7178a56289adea20c056a3cda7c5e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -323,11 +323,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1695376565,
|
||||
"narHash": "sha256-q0g7lGEb+BmpyQ17Df2pbCxuYKT+RqufUJEXYmA5kwI=",
|
||||
"lastModified": 1695496686,
|
||||
"narHash": "sha256-y4Zcf+3L/52uarOpIrqskl/AczeeILxep4/RG/zS4f0=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "b7763d7f6b7fdcabe06658c664457df8bc147563",
|
||||
"rev": "01be28b370987447c78f313a65fdc289d79d4d8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -346,11 +346,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695379641,
|
||||
"narHash": "sha256-EK7PuIBOHiMKnc+Q2hquq/+WglpWllSk8kq3HTmSA78=",
|
||||
"lastModified": 1695497276,
|
||||
"narHash": "sha256-NeZxC1mXzim4cEe770CXU1vKwKRvzEaZJhQnPG8qZIE=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "5fd972331e96c63633c884b1edabaa9832de48d8",
|
||||
"revCount": 498,
|
||||
"rev": "78e441402fe085f2fa5ea4e210e08a76cdf7e55a",
|
||||
"revCount": 499,
|
||||
"type": "git",
|
||||
"url": "https://git.kempkens.io/daniel/nix-overlay"
|
||||
},
|
||||
|
|
@ -366,11 +366,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695114819,
|
||||
"narHash": "sha256-/aIfbZxP39QZ8m7qX2RzQTy5PWzz2e22cCcZ+AOO7lA=",
|
||||
"lastModified": 1695424346,
|
||||
"narHash": "sha256-jkjKhxaBpS7p//l90uz9lNdVK5imVe9eo+XH6zbfrJU=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "afeddc412b3a3b0e7c9ef7ea5fbdf2186781d102",
|
||||
"rev": "c286b23c7fd7f0622bc4af898c91f58b8d304ff1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -413,11 +413,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1695227375,
|
||||
"narHash": "sha256-76WTkeCu3npPZDkay2hB2Dj3cOuCiF0P41dbmXWUKtA=",
|
||||
"lastModified": 1695318763,
|
||||
"narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fe977679240ac2027b151ecca1bc6ce808c2e8af",
|
||||
"rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -465,11 +465,11 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1695389763,
|
||||
"narHash": "sha256-Gyw8E7dO8xGpQF0JpgvAuN10r0EM16CoqYH3/EXoVDo=",
|
||||
"lastModified": 1695495354,
|
||||
"narHash": "sha256-kY1ZKz1KLBWwasaxp87Q0Oa4nD94lmmIvXXUdLVCKQM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "624cc6cae600690f5ee5b3d47087b7b492fd438e",
|
||||
"rev": "1ff350f7b806e02c65c1bbc78b905b80244df5d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ in
|
|||
};
|
||||
nvim-web-devicons = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "2023-09-15";
|
||||
version = "2023-09-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-web-devicons";
|
||||
rev = "973ab742f143a796a779af4d786ec409116a0d87";
|
||||
sha256 = "1fmvym6ryxmff5559s6aw6nv4h5cgz2lnkjnhzbwws4iryvc90zl";
|
||||
rev = "b844d3da4affb77fb2ba56ed235946f0ba0ab200";
|
||||
sha256 = "0xr5i7rvfb7b74rl88wnrgkam20sa1b98zcd6kiqx777mmadym41";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -118,12 +118,12 @@ in
|
|||
};
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-09-22";
|
||||
version = "2023-09-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "fc93fa5c07df7cd578a3ea82d7c075c0460a6884";
|
||||
sha256 = "0dn3yfyb58kvdnmigw45j3c6mdvmzrf0d2qjfik2kg71xy2pbbd7";
|
||||
rev = "af6b3ecea9b3cff18b9244027e23e7f2c34ebdd5";
|
||||
sha256 = "1swad6y06a5xnib92ksqxqy794yvp5y1dgkbvbw5zsmxa844rigm";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -140,12 +140,12 @@ in
|
|||
};
|
||||
rainbow-delimiters-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "rainbow-delimiters.nvim";
|
||||
version = "2023-08-26";
|
||||
version = "2023-09-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HiPhish";
|
||||
repo = "rainbow-delimiters.nvim";
|
||||
rev = "9cbd3dc409af1f5531778ccd1ea6bce668241f39";
|
||||
sha256 = "0qz4my1xw1vww2109s8icscwfysa2aak3kjq2wym2smm259gd8g1";
|
||||
rev = "e9843e7ae870ec9a72b6816836dfcff8570f3381";
|
||||
sha256 = "0cdhwznyjw7ldqn88qfw85v3p36vv5j49ii617cqr0rl8hfkb4q1";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -242,12 +242,12 @@ in
|
|||
};
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-09-20";
|
||||
version = "2023-09-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "4266f9bb36b4fb09edd19b67d95043cf7ff88ddf";
|
||||
sha256 = "1fj81152cpcmbbc9vkbv7cr94i0y9hz4gi0bzsar632wrdsni5q0";
|
||||
rev = "ede4114e1fd41acb121c70a27e1b026ac68c42d6";
|
||||
sha256 = "0cgl3aw0caydzz796wg1ims1qcypnag792riaq92w5by5p15ni1m";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -462,12 +462,12 @@ in
|
|||
};
|
||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2023-09-19";
|
||||
version = "2023-09-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "7b3eb9b5813a22188c4dbb248475fcbaf9f4d195";
|
||||
sha256 = "1ml9r1n4yc4xzalphm33m66m46q8g0c54krd29rabi67ymcc7vr3";
|
||||
rev = "de4f7138a68d5d5063170f2182fd27faf06b0b54";
|
||||
sha256 = "0ppip04x0z98aq7b0zpg1yyy2cgqr94jgf5dy2dr1wvgrjh9lxhd";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -572,12 +572,12 @@ in
|
|||
};
|
||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2023-09-22";
|
||||
version = "2023-09-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "94656269a37957dd85c4bf760375002750f870c7";
|
||||
sha256 = "04n97idfa21smz8brifrp588bbfglvkp8gm4hhw8szm10w764d94";
|
||||
rev = "9bec6e1ef5542e33974e5b4f982c8c063b981974";
|
||||
sha256 = "0pm9nw0mrqmgyx3accy89x83rykaqy65syiwlfip8vadb89kifk1";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
networking.firewall.interfaces =
|
||||
let
|
||||
interfaces = lib.mapAttrsToList (_: lib.attrsets.attrByPath [ "matchConfig" "Name" ] null) config.systemd.network.networks;
|
||||
interfaces = lib.mapAttrsToList (_: lib.attrsets.attrByPath [ "matchConfig" "Name" ] null) config.systemd.network.networks ++ [ "tailscale0" ];
|
||||
in
|
||||
builtins.listToAttrs
|
||||
(builtins.map
|
||||
|
|
|
|||
|
|
@ -25,6 +25,17 @@ in
|
|||
|
||||
server_url = "https://${fqdn}";
|
||||
acl_policy_path = config.age.secrets.headscale-acls.path;
|
||||
|
||||
dns_config = {
|
||||
override_local_dns = false;
|
||||
|
||||
nameservers = [
|
||||
"100.64.10.1"
|
||||
"100.64.10.6"
|
||||
];
|
||||
|
||||
base_domain = "mesh.kempkens.network";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -30,12 +30,22 @@
|
|||
addr = "0.0.0.0";
|
||||
port = 9920;
|
||||
ssl = true;
|
||||
extraParameters = [
|
||||
"fastopen=63"
|
||||
"backlog=1023"
|
||||
"deferred"
|
||||
];
|
||||
}
|
||||
|
||||
{
|
||||
addr = "[::0]";
|
||||
port = 9920;
|
||||
ssl = true;
|
||||
extraParameters = [
|
||||
"fastopen=63"
|
||||
"backlog=1023"
|
||||
"deferred"
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,9 @@
|
|||
access_log /var/log/nginx/access.log combined_anon buffer=32k flush=5m;
|
||||
'';
|
||||
|
||||
appendConfig = ''
|
||||
worker_processes auto;
|
||||
'';
|
||||
# Currently breaks HTTP3
|
||||
# appendConfig = ''
|
||||
# worker_processes auto;
|
||||
# '';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue