This commit is contained in:
parent
67b04a636c
commit
02bcc3ede9
5 changed files with 42 additions and 69 deletions
|
@ -261,7 +261,7 @@ in
|
||||||
xdg.portal.wlr.enable = false;
|
xdg.portal.wlr.enable = false;
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
vaapiVdpau
|
vaapiVdpau
|
||||||
|
|
|
@ -15,11 +15,8 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
nixpkgs.config.allowUnfree = true;
|
hardware.graphics = {
|
||||||
|
|
||||||
hardware.opengl = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport32Bit = true;
|
|
||||||
extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
|
extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ in
|
||||||
};
|
};
|
||||||
u2f = {
|
u2f = {
|
||||||
control = "sufficient";
|
control = "sufficient";
|
||||||
cue = true;
|
settings.cue = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -270,14 +270,10 @@ in
|
||||||
linkConfig.RequiredForOnline = false;
|
linkConfig.RequiredForOnline = false;
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "10.3.3.1/24";
|
||||||
Destination = "10.3.3.1/24";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "fd42:9c3b:f96d:121::1/64";
|
||||||
Destination = "fd42:9c3b:f96d:121::1/64";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -294,14 +290,10 @@ in
|
||||||
linkConfig.RequiredForOnline = false;
|
linkConfig.RequiredForOnline = false;
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "10.11.0.0/22";
|
||||||
Destination = "10.11.0.0/22";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "fc00:1337:dead:beef::10.11.0.0/118";
|
||||||
Destination = "fc00:1337:dead:beef::10.11.0.0/118";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -341,25 +333,21 @@ in
|
||||||
};
|
};
|
||||||
wireguardPeers = [
|
wireguardPeers = [
|
||||||
{
|
{
|
||||||
wireguardPeerConfig = {
|
PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
|
||||||
PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
|
AllowedIPs = [
|
||||||
AllowedIPs = [
|
"10.3.3.1/32"
|
||||||
"10.3.3.1/32"
|
"fd42:9c3b:f96d:121::1/128"
|
||||||
"fd42:9c3b:f96d:121::1/128"
|
];
|
||||||
];
|
PersistentKeepalive = 25;
|
||||||
PersistentKeepalive = 25;
|
Endpoint = "surgat.dadada.li:51235";
|
||||||
Endpoint = "surgat.dadada.li:51235";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
wireguardPeerConfig = {
|
PublicKey = "INfv++4R+Kd2jdh/3CooM70ZeeoN6aeU6mo+T4C8gWU=";
|
||||||
PublicKey = "INfv++4R+Kd2jdh/3CooM70ZeeoN6aeU6mo+T4C8gWU=";
|
AllowedIPs = [
|
||||||
AllowedIPs = [
|
"10.3.3.2/32"
|
||||||
"10.3.3.2/32"
|
"fd42:9c3b:f96d:121::2/128"
|
||||||
"fd42:9c3b:f96d:121::2/128"
|
];
|
||||||
];
|
Endpoint = "192.168.101.1:51235";
|
||||||
Endpoint = "192.168.101.1:51235";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -373,17 +361,15 @@ in
|
||||||
};
|
};
|
||||||
wireguardPeers = [
|
wireguardPeers = [
|
||||||
{
|
{
|
||||||
wireguardPeerConfig = {
|
PublicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";
|
||||||
PublicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";
|
AllowedIPs = [
|
||||||
AllowedIPs = [
|
"10.11.0.0/22"
|
||||||
"10.11.0.0/22"
|
"fc00:1337:dead:beef::10.11.0.0/118"
|
||||||
"fc00:1337:dead:beef::10.11.0.0/118"
|
"192.168.178.0/23"
|
||||||
"192.168.178.0/23"
|
];
|
||||||
];
|
PersistentKeepalive = 25;
|
||||||
PersistentKeepalive = 25;
|
PresharedKeyFile = config.age.secrets.${uwuPresharedKey}.path;
|
||||||
PresharedKeyFile = config.age.secrets.${uwuPresharedKey}.path;
|
Endpoint = "53c70r.de:51820";
|
||||||
Endpoint = "53c70r.de:51820";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -443,7 +429,7 @@ in
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
smartmontools
|
smartmontools
|
||||||
|
|
|
@ -74,12 +74,10 @@ in
|
||||||
"2a01:4f8:c17:1d70::/64"
|
"2a01:4f8:c17:1d70::/64"
|
||||||
];
|
];
|
||||||
routes = [
|
routes = [
|
||||||
{ routeConfig.Gateway = "fe80::1"; }
|
{ Gateway = "fe80::1"; }
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Gateway = "172.31.1.1";
|
||||||
Gateway = "172.31.1.1";
|
GatewayOnLink = true;
|
||||||
GatewayOnLink = true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
linkConfig.RequiredForOnline = "routable";
|
linkConfig.RequiredForOnline = "routable";
|
||||||
|
@ -95,19 +93,13 @@ in
|
||||||
linkConfig.RequiredForOnline = "no";
|
linkConfig.RequiredForOnline = "no";
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "10.3.3.3/24";
|
||||||
Destination = "10.3.3.3/24";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "fd42:9c3b:f96d:121::/64";
|
||||||
Destination = "fd42:9c3b:f96d:121::/64";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
routeConfig = {
|
Destination = "fd42:9c3b:f96d:101::/64";
|
||||||
Destination = "fd42:9c3b:f96d:101::/64";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -124,14 +116,12 @@ in
|
||||||
};
|
};
|
||||||
wireguardPeers = [
|
wireguardPeers = [
|
||||||
{
|
{
|
||||||
wireguardPeerConfig = {
|
PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
|
||||||
PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
|
AllowedIPs = [
|
||||||
AllowedIPs = [
|
"10.3.3.3/32"
|
||||||
"10.3.3.3/32"
|
"fd42:9c3b:f96d:121::3/128"
|
||||||
"fd42:9c3b:f96d:121::3/128"
|
"fd42:9c3b:f96d:101:4a21:bff:fe3e:9cfe/128"
|
||||||
"fd42:9c3b:f96d:101:4a21:bff:fe3e:9cfe/128"
|
];
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue