Compare commits
13 commits
a1626ac867
...
883e69214b
| Author | SHA1 | Date | |
|---|---|---|---|
| 883e69214b | |||
| 79ff9db5a9 | |||
|
|
6819cd0d61 | ||
|
|
b3106107f2 | ||
|
|
429507dd33 | ||
|
|
0a3216d6bf | ||
|
|
cc40910a40 | ||
|
|
4f6a254620 | ||
|
|
697156e262 | ||
|
|
412b8423e6 | ||
|
|
a774b32321 | ||
|
|
4297dfe3e7 | ||
| d53de15a3f |
5 changed files with 85 additions and 57 deletions
114
flake.lock
generated
114
flake.lock
generated
|
|
@ -267,11 +267,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774261302,
|
||||
"narHash": "sha256-P5noO+IXXDBL7l8dEVcig94OXfzLiN1K1KT0COjPcTU=",
|
||||
"lastModified": 1774475276,
|
||||
"narHash": "sha256-z4erC+oMEuBHtox+B46FCv77IPvNy4SyXw/EeBxsD4I=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "406f2ed97937995234c5d3de43cf77f31c42ca2b",
|
||||
"rev": "f8ca2c061ec2feceee1cf1c5e52c92f58b6aec9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1010,11 +1010,11 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774028838,
|
||||
"narHash": "sha256-1zylMvReaWs4ICEq773PvJFXglsEq5BC2YKv0fNa81k=",
|
||||
"lastModified": 1774418580,
|
||||
"narHash": "sha256-M/s/XF7FRsKU8TjkjnE/5u7HOwv9QqXaARxUbIZfSoM=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "3d68e0a32617d1844543219f6790a2b3fa169170",
|
||||
"rev": "33d0bca24d216dfffe2e57a5a91a0176feec2f07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1030,11 +1030,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774274572,
|
||||
"narHash": "sha256-YtpNRYSv0CQn+MjhHHqFcIR5L0Urex2tTwS42kP6nuc=",
|
||||
"lastModified": 1774379316,
|
||||
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "90913f831383a599c556cba59eac8cae9b5195a9",
|
||||
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1092,11 +1092,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773946232,
|
||||
"narHash": "sha256-GMghkvx6E+klBk3Q1S9DvL2+WAvM1J15eBPU+oJnA2Q=",
|
||||
"lastModified": 1774491453,
|
||||
"narHash": "sha256-Tzc69nLM3JeJkowFVMo0hCtGydn1ftj/1jS0pk75t4o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "hydra",
|
||||
"rev": "aedf068ef3f4319d690dd57a9a1ccb4391756ea3",
|
||||
"rev": "ca52f9498932f9a4b2d92182b453478907276f4c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1211,11 +1211,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774270522,
|
||||
"narHash": "sha256-v3+29zRU210u9LB4eDc4iLE9+jN4xsRgmZKyOjufoaw=",
|
||||
"lastModified": 1774487183,
|
||||
"narHash": "sha256-RYDRTvWDVVQwufg67AAyDM0v2A0D8v+1QWYUWBWiw3M=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "64a2e4e26388f017fd9198a6d70424f1f251a5a0",
|
||||
"rev": "eb141a6cd068f1319cb7caa1d3ad40f4957f65b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1594,11 +1594,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773947929,
|
||||
"narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=",
|
||||
"lastModified": 1774383212,
|
||||
"narHash": "sha256-PyF1nTQp+q5oUYk05yjZMOFvd/rT43mMN1zXyycivBw=",
|
||||
"owner": "JPyke3",
|
||||
"repo": "hytale-launcher-nix",
|
||||
"rev": "a8d0a974b187f0997c03c23000dea552194edf39",
|
||||
"rev": "f9392e30a2e74e502116eec6c7d42da7be87de0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1678,11 +1678,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774283383,
|
||||
"narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=",
|
||||
"lastModified": 1774489385,
|
||||
"narHash": "sha256-xGyog2cPoxTo8O6vW0CiCCUhkt866qpI3PN2su9XjV0=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28",
|
||||
"rev": "11fe033ac3d0a97c1e62ffb33f9a6a1852fedab1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1773,11 +1773,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774233978,
|
||||
"narHash": "sha256-rT9wnIfbI1gjl0gq4nN8/5ZvFWn+K6QLwlyy6Gx8FDc=",
|
||||
"lastModified": 1774493390,
|
||||
"narHash": "sha256-aBSOcFXiEbDYJDDkzwLEBvnegqeb+sieLm6HwfNOnWw=",
|
||||
"owner": "fufexan",
|
||||
"repo": "nix-gaming",
|
||||
"rev": "4a583dd427ccf7d912282909a2702a6a547d8560",
|
||||
"rev": "745921bfb8d18daf16134433e70ce2460d9d7589",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1863,11 +1863,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1774018263,
|
||||
"narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
|
||||
"lastModified": 1774465523,
|
||||
"narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
|
||||
"rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1989,11 +1989,11 @@
|
|||
},
|
||||
"nixpkgs-latest-factorio": {
|
||||
"locked": {
|
||||
"lastModified": 1774288423,
|
||||
"narHash": "sha256-09tqm1iAn76U3w/wtrtLIjCJ6jqTmM3mA+AS4GSZBaM=",
|
||||
"lastModified": 1774502759,
|
||||
"narHash": "sha256-2UE1o2sjpuit4XDNO9lE7k83Uy0Lqxgo0xCElLz8R6k=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "62fa25e532e628fda6fb64f52f7fb27fae2dcb5b",
|
||||
"rev": "50e6e147d704e1f510c85093b548fd8d7301f7f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2005,11 +2005,11 @@
|
|||
},
|
||||
"nixpkgs-latest-minecraft": {
|
||||
"locked": {
|
||||
"lastModified": 1774288423,
|
||||
"narHash": "sha256-09tqm1iAn76U3w/wtrtLIjCJ6jqTmM3mA+AS4GSZBaM=",
|
||||
"lastModified": 1774502759,
|
||||
"narHash": "sha256-2UE1o2sjpuit4XDNO9lE7k83Uy0Lqxgo0xCElLz8R6k=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "62fa25e532e628fda6fb64f52f7fb27fae2dcb5b",
|
||||
"rev": "50e6e147d704e1f510c85093b548fd8d7301f7f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2051,11 +2051,11 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1774288423,
|
||||
"narHash": "sha256-09tqm1iAn76U3w/wtrtLIjCJ6jqTmM3mA+AS4GSZBaM=",
|
||||
"lastModified": 1774502759,
|
||||
"narHash": "sha256-2UE1o2sjpuit4XDNO9lE7k83Uy0Lqxgo0xCElLz8R6k=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "62fa25e532e628fda6fb64f52f7fb27fae2dcb5b",
|
||||
"rev": "50e6e147d704e1f510c85093b548fd8d7301f7f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2148,11 +2148,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1774106199,
|
||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||
"lastModified": 1774386573,
|
||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2295,11 +2295,11 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1773821835,
|
||||
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
||||
"lastModified": 1774106199,
|
||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2311,11 +2311,11 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1774106199,
|
||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||
"lastModified": 1774386573,
|
||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2538,11 +2538,11 @@
|
|||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774268581,
|
||||
"narHash": "sha256-azZqiV4L+Ef3Mu4M0NAObAfNIn8rDlsTcfti2W5/oZ4=",
|
||||
"lastModified": 1774459974,
|
||||
"narHash": "sha256-kBurUjRtZ3L9w/hKqEU/7uE3E71/jkeVp4gbzkarg8Q=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "86d256870b3a18ac751e12936419bf697d3544e8",
|
||||
"rev": "0e176193a249023ac48494dcfe879ee64b23a30d",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2556,11 +2556,11 @@
|
|||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774154798,
|
||||
"narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
|
||||
"lastModified": 1774303811,
|
||||
"narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
|
||||
"rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2750,11 +2750,11 @@
|
|||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774242250,
|
||||
"narHash": "sha256-pchbnY7KVnH26g4O3LZO8vpshInqNj937gAqlPob1Mk=",
|
||||
"lastModified": 1774478219,
|
||||
"narHash": "sha256-WyPQoYBde7TSCR45ZgofzBqvVo/MpH3Vkh8YMj9OZC0=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "f19c3e6683c2d2f3fcfcb88fb691931a104bc47c",
|
||||
"rev": "2e49c5278af6ef5f1e17e0fd27c2e22b1a7edc38",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2772,11 +2772,11 @@
|
|||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774140580,
|
||||
"narHash": "sha256-4V/DZzhyomuNjIIr0OFLUUf0TdgYWo7H6TZeF5op4Nc=",
|
||||
"lastModified": 1774441590,
|
||||
"narHash": "sha256-8cMeRjQOqOzwYmZdH7cV75PeXOGf74RDGR9IsFX+7j0=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "487e301b84fdf86d5561f4aa24e50c5308004b67",
|
||||
"rev": "e8d24a6b03faf3824103b6fc986c1afa7c90c7c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -263,6 +263,9 @@
|
|||
}
|
||||
{
|
||||
matches = [
|
||||
{
|
||||
app-id = "Element";
|
||||
}
|
||||
{
|
||||
app-id = "discord";
|
||||
}
|
||||
|
|
@ -295,6 +298,9 @@
|
|||
{
|
||||
app-id = "discord";
|
||||
}
|
||||
{
|
||||
app-id = "Element";
|
||||
}
|
||||
{
|
||||
app-id = "steam";
|
||||
title = "Friends List.*";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
discord
|
||||
teamspeak6-client
|
||||
element-desktop
|
||||
];
|
||||
|
||||
programs.obs-studio = {
|
||||
|
|
|
|||
|
|
@ -59,6 +59,22 @@
|
|||
};
|
||||
};
|
||||
|
||||
"cholli.de" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "cholli.de";
|
||||
globalRedirect = domainName;
|
||||
};
|
||||
|
||||
"~^(?<subdomain>.+)\\.cholli\\.de$" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "cholli.de";
|
||||
locations."/" = {
|
||||
extraConfig = ''
|
||||
return 301 https://$subdomain.${domainName}$request_uri;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
"_" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = domainName;
|
||||
|
|
|
|||
|
|
@ -54,6 +54,11 @@ topLevel: {
|
|||
dnsResolver = "1.1.1.1:53";
|
||||
extraDomainNames = [ "*.${domainname}" ];
|
||||
};
|
||||
|
||||
certs."cholli.de" = {
|
||||
dnsResolver = "1.1.1.1:53";
|
||||
extraDomainNames = [ "*.cholli.de" ];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue