diff --git a/host_vars/xps/network.yml b/host_vars/xps/network.yml index dbfa8ae..ecddca8 100644 --- a/host_vars/xps/network.yml +++ b/host_vars/xps/network.yml @@ -6,9 +6,4 @@ local_network_address: 192.168.2.9/24 local_network_dns: 192.168.2.254 local_network_gateway: 192.168.2.254 -frans_network_ssid: KPNDD1056 -frans_network_address: 192.168.2.9/24 -frans_network_dns: 192.168.2.254 -frans_network_gateway: 192.168.2.254 - hostname: xps diff --git a/tasks/network.yml b/tasks/network.yml index 1c44670..fa4a975 100644 --- a/tasks/network.yml +++ b/tasks/network.yml @@ -78,13 +78,8 @@ loop: - src: 'templates/personal/xps/network/wlan0.link.j2' dest: '/etc/systemd/network/10-wlan0.link' - - src: 'templates/personal/xps/network/wlan0-local.network.j2' dest: '/etc/systemd/network/10-wireless.network' - - - src: 'templates/personal/xps/network/wlan0-frans.network.j2' - dest: '/etc/systemd/network/11-wireless.network' - - src: 'templates/personal/xps/network/wlan0.network.j2' dest: '/etc/systemd/network/20-wireless.network' diff --git a/templates/personal/xps/cmdline.j2 b/templates/personal/xps/cmdline.j2 index 90371ba..a2aab0b 100644 --- a/templates/personal/xps/cmdline.j2 +++ b/templates/personal/xps/cmdline.j2 @@ -1 +1 @@ -rd.luks.name=4483183a-4881-4bf6-b20c-3ba918642cc4=cryptlvm root=/dev/VolumeGroup/root rw resume=/dev/VolumeGroup/swap pcie_aspm=nommconf acpi_rev_override=1 bgrt_disable +cryptdevice=UUID=4483183a-4881-4bf6-b20c-3ba918642cc4:cryptlvm root=/dev/VolumeGroup/root rw resume=/dev/VolumeGroup/swap pcie_aspm=nommconf i915.fastboot=1 enable_fbc=1 enable_psr=1 disable_power_well=0 acpi_rev_override=1 bgrt_disable diff --git a/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 b/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 index c3b6807..ab81af5 100644 --- a/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 +++ b/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 @@ -1,3 +1,3 @@ # {{ ansible_managed }} -HOOKS=(base systemd autodetect microcode modconf kms keyboard sd-vconsole block sd-encrypt lvm2 resume filesystems fsck) +HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt lvm2 resume filesystems fsck) diff --git a/templates/personal/xps/network/wlan0-frans.network.j2 b/templates/personal/xps/network/wlan0-frans.network.j2 deleted file mode 100644 index fb19ae3..0000000 --- a/templates/personal/xps/network/wlan0-frans.network.j2 +++ /dev/null @@ -1,16 +0,0 @@ -# {{ ansible_managed }} - -[Match] -MACAddress={{ wireless_interface_mac }} -SSID={{ frans_network_ssid }} - -[Network] -Address={{ frans_network_address }} -DNS={{ frans_network_dns }} -Gateway={{ frans_network_gateway }} -DHCP=no -MulticastDNS=yes -LinkLocalAddressing=no -IPv6AcceptRA=no -IPv6SendRA=no -RequiredForOnline=routable