nixpkgs-fmt

This commit is contained in:
root@dishwasher 2022-06-26 21:19:15 +02:00
parent 35e93ce43b
commit ebc2829be8
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
11 changed files with 157 additions and 144 deletions

View file

@ -22,7 +22,7 @@
networks."uplink" = {
matchConfig = { Name = "enp1s0"; };
networkConfig = {
DHCP="yes"; # hetzner suggests this as default
DHCP = "yes"; # hetzner suggests this as default
};
};
};

View file

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
[
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sd_mod" "sr_mod" ];
@ -14,12 +15,14 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/627952eb-107a-43c3-8223-bfea9af92837";
{
device = "/dev/disk/by-uuid/627952eb-107a-43c3-8223-bfea9af92837";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5CA6-CCE4";
{
device = "/dev/disk/by-uuid/5CA6-CCE4";
fsType = "vfat";
};

View file

@ -24,14 +24,14 @@
'';
locations = {
"/" = {
# extraConfig = '' return 503; '';
proxyPass = "http://10.34.45.100:8080";
# extraConfig = '' return 503; '';
proxyPass = "http://10.34.45.100:8080";
};
"/well-known/carddav" = {
return = "301 $scheme://$host/remote.php/dav";
return = "301 $scheme://$host/remote.php/dav";
};
"/well-known/caldav" = {
return = "301 $scheme://$host/remote.php/dav";
return = "301 $scheme://$host/remote.php/dav";
};
};

View file

@ -19,20 +19,20 @@
{
# microwave
wireguardPeerConfig = {
# nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
PublicKey = "0zpfcNrmbsNwwbnDDX4SMl4BVTB0zuhGKixT9TJQoHc=";
AllowedIPs = [ "10.66.66.10/32" ];
PersistentKeepalive = 25;
};
# nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
PublicKey = "0zpfcNrmbsNwwbnDDX4SMl4BVTB0zuhGKixT9TJQoHc=";
AllowedIPs = [ "10.66.66.10/32" ];
PersistentKeepalive = 25;
};
}
{
# Dishwasher
wireguardPeerConfig = {
# nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
PublicKey = "AdWUBbyeRkxdP9HUu25PpISoxbgQ8oeCw3BmV93xtAw=";
AllowedIPs = [ "10.66.66.100/32" ];
PersistentKeepalive = 25;
};
# nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
PublicKey = "AdWUBbyeRkxdP9HUu25PpISoxbgQ8oeCw3BmV93xtAw=";
AllowedIPs = [ "10.66.66.100/32" ];
PersistentKeepalive = 25;
};
}
];
};
@ -60,12 +60,12 @@
wireguardPeers = [
# nextcloud
{
wireguardPeerConfig = {
PublicKey ="KCYoGx7TGei4X79EZo2NONCcmQjPzBUN1Ds6I9lQbz0=";
AllowedIPs = [ "10.34.45.100/32" ];
PersistentKeepalive = 25;
};
}
wireguardPeerConfig = {
PublicKey = "KCYoGx7TGei4X79EZo2NONCcmQjPzBUN1Ds6I9lQbz0=";
AllowedIPs = [ "10.34.45.100/32" ];
PersistentKeepalive = 25;
};
}
];
};
networks."oxaproxy" = {

View file

@ -6,9 +6,10 @@
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
[
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
@ -35,7 +36,7 @@
};
networkConfig = {
DHCP = "yes";
LinkLocalAddressing="ipv6";
LinkLocalAddressing = "ipv6";
IPv6AcceptRA = "yes";
};
dhcpV6Config = {
@ -47,7 +48,7 @@
};
};
services.resolved={
services.resolved = {
enable = true;
fallbackDns = [
"8.8.8.8"

View file

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@ -14,37 +15,43 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
{
device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
fsType = "btrfs";
options = [ "subvol=nixos" "compress=zstd" "noatime" ];
};
fileSystems."/var/lib" =
{ device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
{
device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
fsType = "btrfs";
options = [ "subvol=var-lib" "compress=zstd" "noatime" ];
};
fileSystems."/var/log" =
{ device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
{
device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
fsType = "btrfs";
options = [ "subvol=var-log" "compress=zstd" "noatime" ];
};
fileSystems."/var/microvms" =
{ device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
{
device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
fsType = "btrfs";
options = [ "subvol=microvms" "compress=zstd" "noatime" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
{
device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1";
fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2A04-BFAE";
{
device = "/dev/disk/by-uuid/2A04-BFAE";
fsType = "vfat";
};

View file

@ -11,14 +11,15 @@
DHCPServer = false;
IPv6SendRA = true;
};
addresses = [ {
addresses = [{
addressConfig.Address = "10.99.99.1/24";
} {
addressConfig.Address = "fd12:3456:789a::1/64";
} ];
ipv6Prefixes = [ {
}
{
addressConfig.Address = "fd12:3456:789a::1/64";
}];
ipv6Prefixes = [{
ipv6PrefixConfig.Prefix = "fd12:3456:789a::/64";
} ];
}];
# networkConfig = {
# Address = "10.99.99.1/24";
# IPForward = "ipv4";
@ -27,9 +28,9 @@
# routeConfig = {
# GatewayOnLink = true;
# };}];
# IPForward = "ipv4";
# DHCPServer = true;
# IPv6SendRA = true;
# IPForward = "ipv4";
# DHCPServer = true;
# IPv6SendRA = true;
# addresses = [{
# addressConfig.Address = "10.99.99.1/24";
# }];

View file

@ -15,11 +15,11 @@
{
# cirrus
wireguardPeerConfig = {
PublicKey = "5nCVC21BL+1r70OGwA4Q6Z/gcPLC3+ZF8sTurdn7N0E=";
AllowedIPs = [ "10.66.66.0/24" ];
Endpoint = [ "95.216.166.21:51820" ];
PersistentKeepalive = 25;
};
PublicKey = "5nCVC21BL+1r70OGwA4Q6Z/gcPLC3+ZF8sTurdn7N0E=";
AllowedIPs = [ "10.66.66.0/24" ];
Endpoint = [ "95.216.166.21:51820" ];
PersistentKeepalive = 25;
};
}
];
};