dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions 1

chore: reformat

Browse source
This commit is contained in:
Tim Schubert 2025-06-03 20:04:44 +02:00
parent b638c4125b
commit 1402ee13cc
No known key found for this signature in database
57 changed files with 845 additions and 466 deletions
Download patch file Download diff file Expand all files Collapse all files

91
nixos/ninurta/configuration.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
let
hostAliases = [
"ifrit.dadada.li"
@ -37,7 +42,10 @@ in
};
};
services.openssh.ports = [ 22 2222 ];
services.openssh.ports = [
22
2222
];
dadada.backupClient.bs.enable = false;
dadada.backupClient.backup1.enable = false;
@ -59,7 +67,9 @@ in
boot.loader.efi.canTouchEfiVariables = true;
assertions = lib.singleton {
assertion = (config.boot.initrd.network.ssh.hostKeys != [ ]) -> config.boot.loader.supportsInitrdSecrets == true;
assertion =
(config.boot.initrd.network.ssh.hostKeys != [ ])
-> config.boot.loader.supportsInitrdSecrets == true;
message = "Refusing to store private keys in store";
};
@ -183,7 +193,12 @@ in
{
hostName = "localhost";
system = "x86_64-linux";
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
supportedFeatures = [
"kvm"
"nixos-test"
"big-parallel"
"benchmark"
];
maxJobs = 16;
}
];
@ -277,26 +292,48 @@ in
};
"30-wg0" = {
matchConfig.Name = "wg0";
address = [ "10.3.3.3/32" "fd42:9c3b:f96d:121::3/128" ];
address = [
"10.3.3.3/32"
"fd42:9c3b:f96d:121::3/128"
];
DHCP = "no";
networkConfig.IPv6AcceptRA = false;
linkConfig.RequiredForOnline = false;
routes = [
{ routeConfig = { Destination = "10.3.3.1/24"; }; }
{ routeConfig = { Destination = "fd42:9c3b:f96d:121::1/64"; }; }
{
routeConfig = {
Destination = "10.3.3.1/24";
};
}
{
routeConfig = {
Destination = "fd42:9c3b:f96d:121::1/64";
};
}
];
};
"30-uwu" = {
matchConfig.Name = "uwu";
address = [ "10.11.0.39/24" "fc00:1337:dead:beef::10.11.0.39/128" ];
address = [
"10.11.0.39/24"
"fc00:1337:dead:beef::10.11.0.39/128"
];
dns = [ "10.11.0.1%uwu#uwu" ];
domains = [ "uwu" ];
DHCP = "no";
networkConfig.IPv6AcceptRA = false;
linkConfig.RequiredForOnline = false;
routes = [
{ routeConfig = { Destination = "10.11.0.0/22"; }; }
{ routeConfig = { Destination = "fc00:1337:dead:beef::10.11.0.0/118"; }; }
{
routeConfig = {
Destination = "10.11.0.0/22";
};
}
{
routeConfig = {
Destination = "fc00:1337:dead:beef::10.11.0.0/118";
};
}
];
};
"20-br0" = {
@ -337,7 +374,10 @@ in
{
wireguardPeerConfig = {
PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
AllowedIPs = [ "10.3.3.1/32" "fd42:9c3b:f96d:121::1/128" ];
AllowedIPs = [
"10.3.3.1/32"
"fd42:9c3b:f96d:121::1/128"
];
PersistentKeepalive = 25;
Endpoint = "surgat.dadada.li:51235";
};
@ -345,7 +385,10 @@ in
{
wireguardPeerConfig = {
PublicKey = "INfv++4R+Kd2jdh/3CooM70ZeeoN6aeU6mo+T4C8gWU=";
AllowedIPs = [ "10.3.3.2/32" "fd42:9c3b:f96d:121::2/128" ];
AllowedIPs = [
"10.3.3.2/32"
"fd42:9c3b:f96d:121::2/128"
];
Endpoint = "192.168.101.1:51235";
};
}
@ -359,15 +402,21 @@ in
wireguardConfig = {
PrivateKeyFile = config.age.secrets.${uwuPrivKey}.path;
};
wireguardPeers = [{
wireguardPeerConfig = {
PublicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";
AllowedIPs = [ "10.11.0.0/22" "fc00:1337:dead:beef::10.11.0.0/118" "192.168.178.0/23" ];
PersistentKeepalive = 25;
PresharedKeyFile = config.age.secrets.${uwuPresharedKey}.path;
Endpoint = "53c70r.de:51820";
};
}];
wireguardPeers = [
{
wireguardPeerConfig = {
PublicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";
AllowedIPs = [
"10.11.0.0/22"
"fc00:1337:dead:beef::10.11.0.0/118"
"192.168.178.0/23"
];
PersistentKeepalive = 25;
PresharedKeyFile = config.age.secrets.${uwuPresharedKey}.path;
Endpoint = "53c70r.de:51820";
};
}
];
};
};
};

166
nixos/ninurta/hardware-configuration.nix
View file

@ -1,89 +1,115 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "igc" "xhci_pci" "thunderbolt" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [
"igc"
"xhci_pci"
"thunderbolt"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "compress=zstd" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "compress=zstd" ];
};
boot.initrd.luks.devices."luks".device = "/dev/disk/by-uuid/bac4ee0e-e393-414f-ac3e-1ec20739abae";
fileSystems."/swap" =
fileSystems."/swap" = {
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [
"subvol=swap"
"noatime"
];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [
"subvol=nix"
"noatime"
"compress=zstd"
];
};
fileSystems."/var" = {
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [
"subvol=var"
"compress=zstd"
];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [
"subvol=home"
"compress=zstd"
];
};
fileSystems."/root" = {
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [
"subvol=root"
"compress=zstd"
];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2E20-49CB";
fsType = "vfat";
};
swapDevices = [
{
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "subvol=swap" "noatime" ];
};
device = "/swap/swapfile";
size = 32 * 1024; # 32 GByte
}
];
fileSystems."/nix" =
{
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "subvol=nix" "noatime" "compress=zstd" ];
};
fileSystems."/mnt/storage" = {
device = "/dev/disk/by-uuid/ce483e75-5886-4b03-a3f9-675b80560ac9";
fsType = "btrfs";
options = [
"subvol=root"
"compress=zstd"
];
};
fileSystems."/var" =
{
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "subvol=var" "compress=zstd" ];
};
fileSystems."/home" =
{
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "subvol=home" "compress=zstd" ];
};
fileSystems."/root" =
{
device = "/dev/disk/by-uuid/7ca5fd2a-2a56-48fe-bd48-1e51b6a66714";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" ];
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/2E20-49CB";
fsType = "vfat";
};
swapDevices = [{
device = "/swap/swapfile";
size = 32 * 1024; # 32 GByte
}];
fileSystems."/mnt/storage" =
{
device = "/dev/disk/by-uuid/ce483e75-5886-4b03-a3f9-675b80560ac9";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" ];
};
fileSystems."/mnt/storage/backups" =
{
device = "/dev/disk/by-uuid/ce483e75-5886-4b03-a3f9-675b80560ac9";
fsType = "btrfs";
options = [ "subvol=backups" "noatime" ];
};
fileSystems."/mnt/storage/backups" = {
device = "/dev/disk/by-uuid/ce483e75-5886-4b03-a3f9-675b80560ac9";
fsType = "btrfs";
options = [
"subvol=backups"
"noatime"
];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";