diff options
| -rw-r--r-- | machines/truite/default.nix | 3 | ||||
| -rw-r--r-- | machines/truite/devices.nix | 25 | ||||
| -rw-r--r-- | machines/truite/hardware.nix | 11 | ||||
| -rw-r--r-- | machines/truite/home.nix | 2 |
4 files changed, 19 insertions, 22 deletions
diff --git a/machines/truite/default.nix b/machines/truite/default.nix index 01f82f5..06b04e1 100644 --- a/machines/truite/default.nix +++ b/machines/truite/default.nix @@ -3,7 +3,6 @@ { imports = [ ../../modules/common.nix - ../../modules/vpn/ingress.nix ./hardware.nix ./devices.nix @@ -26,5 +25,5 @@ }; }; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } diff --git a/machines/truite/devices.nix b/machines/truite/devices.nix index dce5ff2..e981b2b 100644 --- a/machines/truite/devices.nix +++ b/machines/truite/devices.nix @@ -8,32 +8,29 @@ }; kernelModules = [ "wireguard" ]; - - swraid.enable = true; }; zramSwap = { enable = true; algorithm = "zstd"; swapDevices = 1; - memoryPercent = 100; + memoryPercent = 50; }; networking = { - nameservers = [ - "9.9.9.9" - "149.112.112.112" - ]; - + nameservers = [ "1.1.1.1" "1.0.0.1" ]; useDHCP = false; }; - systemd.network.enable = true; - systemd.network.networks."10-wan" = { - name = "eth0"; - DHCP = "no"; - address = [ "194.169.163.56/24" ]; - gateway = [ "194.169.163.1" ]; + systemd.network = { + enable = true; + networks."10-wan" = { + name = "ens18"; + address = [ "194.87.197.92/23" ]; + gateway = [ "194.87.196.1" ]; + + DHCP = "ipv6"; + }; }; } diff --git a/machines/truite/hardware.nix b/machines/truite/hardware.nix index b60a848..0936388 100644 --- a/machines/truite/hardware.nix +++ b/machines/truite/hardware.nix @@ -4,20 +4,21 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a029352d-e2e9-432d-ae2a-43921652ea8b"; + { device = "/dev/disk/by-uuid/7eece4ee-4027-4c10-b080-86fca470b915"; fsType = "ext4"; }; swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.hypervGuest.enable = true; } diff --git a/machines/truite/home.nix b/machines/truite/home.nix index 8f27ed2..d8c480a 100644 --- a/machines/truite/home.nix +++ b/machines/truite/home.nix @@ -5,5 +5,5 @@ ../../modules/home/common.nix ]; - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } |
