diff --git a/flake.lock b/flake.lock index 373b2cd..db0baa9 100644 --- a/flake.lock +++ b/flake.lock @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1728687662, - "narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=", + "lastModified": 1728763831, + "narHash": "sha256-KOp33tls7jRAhcmu77aVxKpSMou8QgK0BC+Y3sYLuGo=", "owner": "nix-community", "repo": "disko", - "rev": "bdbdb725d632863bdedb80baabf21327614dd237", + "rev": "b6215392ec3bd05e9ebfbb2f7945c414096fce8f", "type": "github" }, "original": { diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 7eaac2e..2c7106a 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -70,13 +70,13 @@ in { kernelPackages = pkgs.linuxPackages_latest; kernelParams = ["consoleblank=60"]; #loader = { - #systemd-boot = { - #enable = true; - #}; - #efi = { - #canTouchEfiVariables = true; - #efiSysMountPoint = "/boot"; - #}; + #systemd-boot = { + #enable = true; + #}; + #efi = { + #canTouchEfiVariables = true; + #efiSysMountPoint = "/boot"; + #}; #}; plymouth = { enable = true; diff --git a/hosts/w1/default.nix b/hosts/w1/default.nix index 9a5f950..6bb1e96 100644 --- a/hosts/w1/default.nix +++ b/hosts/w1/default.nix @@ -18,8 +18,8 @@ networking.hostName = "w1"; boot = { initrd = { - availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; - kernelModules = [ "nvme" ]; + availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + kernelModules = ["nvme"]; }; loader = { grub = { diff --git a/hosts/w1/hardware-configuration.nix b/hosts/w1/hardware-configuration.nix index 70a38b0..682f381 100644 --- a/hosts/w1/hardware-configuration.nix +++ b/hosts/w1/hardware-configuration.nix @@ -1,30 +1,34 @@ # 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, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = ["dm-snapshot"]; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/sda1"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/sda15"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/sda15"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/w1/network.nix b/hosts/w1/network.nix index 5de000e..bb26d8c 100644 --- a/hosts/w1/network.nix +++ b/hosts/w1/network.nix @@ -1,9 +1,10 @@ -{ lib, ... }: { +{lib, ...}: { # This file was populated at runtime with the networking # details gathered from the active system. networking = { - nameservers = [ "1.1.1.1" - ]; + nameservers = [ + "1.1.1.1" + ]; defaultGateway = "172.31.1.1"; defaultGateway6 = { address = "fe80::1"; @@ -14,16 +15,34 @@ interfaces = { eth0 = { ipv4.addresses = [ - { address="5.161.104.185"; prefixLength=32; } + { + address = "5.161.104.185"; + prefixLength = 32; + } ]; ipv6.addresses = [ - { address="2a01:4ff:f0:c3e0::1"; prefixLength=64; } - { address="fe80::9400:3ff:fec1:e04f"; prefixLength=64; } + { + address = "2a01:4ff:f0:c3e0::1"; + prefixLength = 64; + } + { + address = "fe80::9400:3ff:fec1:e04f"; + prefixLength = 64; + } + ]; + ipv4.routes = [ + { + address = "172.31.1.1"; + prefixLength = 32; + } + ]; + ipv6.routes = [ + { + address = "fe80::1"; + prefixLength = 128; + } ]; - ipv4.routes = [ { address = "172.31.1.1"; prefixLength = 32; } ]; - ipv6.routes = [ { address = "fe80::1"; prefixLength = 128; } ]; }; - }; }; services.udev.extraRules = '' diff --git a/hosts/w2/default.nix b/hosts/w2/default.nix index 9a5f950..6bb1e96 100644 --- a/hosts/w2/default.nix +++ b/hosts/w2/default.nix @@ -18,8 +18,8 @@ networking.hostName = "w1"; boot = { initrd = { - availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; - kernelModules = [ "nvme" ]; + availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + kernelModules = ["nvme"]; }; loader = { grub = { diff --git a/hosts/w2/hardware-configuration.nix b/hosts/w2/hardware-configuration.nix index 70a38b0..682f381 100644 --- a/hosts/w2/hardware-configuration.nix +++ b/hosts/w2/hardware-configuration.nix @@ -1,30 +1,34 @@ # 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, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = ["dm-snapshot"]; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/sda1"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/sda15"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/sda15"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/w2/network.nix b/hosts/w2/network.nix index 514752b..bd656e4 100644 --- a/hosts/w2/network.nix +++ b/hosts/w2/network.nix @@ -1,9 +1,10 @@ -{ lib, ... }: { +{lib, ...}: { # This file was populated at runtime with the networking # details gathered from the active system. networking = { - nameservers = [ "1.1.1.1" - ]; + nameservers = [ + "1.1.1.1" + ]; defaultGateway = "172.31.1.1"; defaultGateway6 = { address = "fe80::1"; @@ -14,16 +15,34 @@ interfaces = { eth0 = { ipv4.addresses = [ - { address="178.156.139.49"; prefixLength=32; } + { + address = "178.156.139.49"; + prefixLength = 32; + } ]; ipv6.addresses = [ - { address="2a01:4ff:f0:9df8::1"; prefixLength=64; } - { address="fe80::9400:3ff:fec3:dc26"; prefixLength=64; } + { + address = "2a01:4ff:f0:9df8::1"; + prefixLength = 64; + } + { + address = "fe80::9400:3ff:fec3:dc26"; + prefixLength = 64; + } + ]; + ipv4.routes = [ + { + address = "172.31.1.1"; + prefixLength = 32; + } + ]; + ipv6.routes = [ + { + address = "fe80::1"; + prefixLength = 128; + } ]; - ipv4.routes = [ { address = "172.31.1.1"; prefixLength = 32; } ]; - ipv6.routes = [ { address = "fe80::1"; prefixLength = 128; } ]; }; - }; }; services.udev.extraRules = ''