WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
6 changed files with 6 additions and 5 deletions
Showing only changes of commit 865dad1de3 - Show all commits

View file

@ -188,7 +188,6 @@ dotfiles = [
"f_doas.conf", "f_doas.conf",
"f_fonts.conf", "f_fonts.conf",
"f_freetype2.sh", "f_freetype2.sh",
"f_getty.conf",
"f_ignore", "f_ignore",
"f_logind.conf", "f_logind.conf",
"f_mkinitcpio.conf", "f_mkinitcpio.conf",

View file

@ -0,0 +1,4 @@
[Daemon]
Theme=arch-logo-gnomish
ShowDelay=0
DeviceTimeout=8

View file

@ -1,5 +1,5 @@
{%@@ if profile == "Mirkwood" @@%} {%@@ if profile == "Mirkwood" @@%}
cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
{%@@ elif profile == "Moria" @@%} {%@@ elif profile == "Moria" @@%}
cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d
{%@@ endif @@%} {%@@ endif @@%}

View file

@ -4,7 +4,7 @@ FILES=()
{%@@ if profile == "Mirkwood" @@%} {%@@ if profile == "Mirkwood" @@%}
BINARIES=("/usr/bin/btrfs") BINARIES=("/usr/bin/btrfs")
HOOKS=(colors consolefont welcomemessage base udev keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck)
{%@@ else @@%} {%@@ else @@%}
BINARIES=() BINARIES=()

View file

@ -6,7 +6,6 @@ PRESETS=('default' 'fallback')
default_image="/boot/initramfs-linux-lts.img" default_image="/boot/initramfs-linux-lts.img"
default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi"
default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp"
fallback_image="/boot/initramfs-linux-lts-fallback.img" fallback_image="/boot/initramfs-linux-lts-fallback.img"
fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi"

View file

@ -6,7 +6,6 @@ PRESETS=('default' 'fallback')
default_image="/boot/initramfs-linux.img" default_image="/boot/initramfs-linux.img"
default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" default_efi_image="/boot/EFI/Linux/archlinux-linux.efi"
default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp"
fallback_image="/boot/initramfs-linux-fallback.img" fallback_image="/boot/initramfs-linux-fallback.img"
fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi"