-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split GNOME settings out for desktop only
Signed-off-by: Tommy <[email protected]>
- Loading branch information
1 parent
81bf079
commit 78e6532
Showing
1 changed file
with
33 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -186,8 +186,10 @@ btrfs su cr /mnt/@/var_tmp &>/dev/null | |
| btrfs su cr /mnt/@/var_spool &>/dev/null | ||
| btrfs su cr /mnt/@/var_lib_libvirt_images &>/dev/null | ||
| btrfs su cr /mnt/@/var_lib_machines &>/dev/null | ||
| btrfs su cr /mnt/@/var_lib_gdm &>/dev/null | ||
| btrfs su cr /mnt/@/var_lib_AccountsService &>/dev/null | ||
| if [ "${install_mode}" = 'desktop' ]; then | ||
| btrfs su cr /mnt/@/var_lib_gdm &>/dev/null | ||
| btrfs su cr /mnt/@/var_lib_AccountsService &>/dev/null | ||
| fi | ||
| btrfs su cr /mnt/@/cryptkey &>/dev/null | ||
|
|
||
| ## Disable CoW on subvols we are not taking snapshots of | ||
|
|
@@ -203,8 +205,10 @@ chattr +C /mnt/@/var_tmp | |
| chattr +C /mnt/@/var_spool | ||
| chattr +C /mnt/@/var_lib_libvirt_images | ||
| chattr +C /mnt/@/var_lib_machines | ||
| chattr +C /mnt/@/var_lib_gdm | ||
| chattr +C /mnt/@/var_lib_AccountsService | ||
| if [ "${install_mode}" = 'desktop' ]; then | ||
| chattr +C /mnt/@/var_lib_gdm | ||
| chattr +C /mnt/@/var_lib_AccountsService | ||
| fi | ||
| chattr +C /mnt/@/cryptkey | ||
|
|
||
| ## Set the default BTRFS Subvol to Snapshot 1 before pacstrapping | ||
|
|
@@ -226,7 +230,10 @@ chmod 600 /mnt/@/.snapshots/1/info.xml | |
| umount /mnt | ||
| output 'Mounting the newly created subvolumes.' | ||
| mount -o ssd,noatime,compress=zstd "${BTRFS}" /mnt | ||
| mkdir -p /mnt/{boot,root,home,.snapshots,srv,tmp,/var/log,/var/crash,/var/cache,/var/tmp,/var/spool,/var/lib/libvirt/images,/var/lib/machines,/var/lib/gdm,/var/lib/AccountsService,/cryptkey} | ||
| mkdir -p /mnt/{boot,root,home,.snapshots,srv,tmp,var/log,var/crash,var/cache,var/tmp,var/spool,var/lib/libvirt/images,var/lib/machines,cryptkey} | ||
| if [ "${install_mode}" = 'desktop' ]; then | ||
| mkdir -p /mnt/{var/lib/gdm,var/lib/AccountsService} | ||
| fi | ||
| mount -o ssd,noatime,compress=zstd,nodev,nosuid,noexec,subvol=@/boot "${BTRFS}" /mnt/boot | ||
| mount -o ssd,noatime,compress=zstd,nodev,nosuid,subvol=@/root "${BTRFS}" /mnt/root | ||
| mount -o ssd,noatime,compress=zstd,nodev,nosuid,subvol=@/home "${BTRFS}" /mnt/home | ||
|
|
@@ -247,8 +254,10 @@ mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/var_li | |
| mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/var_lib_machines "${BTRFS}" /mnt/var/lib/machines | ||
|
|
||
| # GNOME requires /var/lib/gdm and /var/lib/AccountsService to be writeable when booting into a readonly snapshot. Thus we sadly have to split them. | ||
| mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/var_lib_gdm $BTRFS /mnt/var/lib/gdm | ||
| mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/var_lib_AccountsService $BTRFS /mnt/var/lib/AccountsService | ||
| if [ "${install_mode}" = 'desktop' ]; then | ||
| mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/var_lib_gdm $BTRFS /mnt/var/lib/gdm | ||
| mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/var_lib_AccountsService $BTRFS /mnt/var/lib/AccountsService | ||
| fi | ||
|
|
||
| ### The encryption is splitted as we do not want to include it in the backup with snap-pac. | ||
| mount -o ssd,noatime,compress=zstd,nodatacow,nodev,nosuid,noexec,subvol=@/cryptkey "${BTRFS}" /mnt/cryptkey | ||
|
|
@@ -372,17 +381,20 @@ sudo mkdir -p /mnt/etc/systemd/user/[email protected] | |
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/systemd/user/org.gnome.Shell%40wayland.service.d/override.conf | sudo tee /mnt/etc/systemd/user/[email protected]/override.conf | ||
|
|
||
| # Setup dconf | ||
| mkdir -p /mnt/etc/dconf/db/local.d/locks | ||
|
|
||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/locks/automount-disable | tee /mnt/etc/dconf/db/local.d/locks/automount-disable | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/locks/privacy | tee /mnt/etc/dconf/db/local.d/locks/privacy | ||
| if [ "${install_mode}" = 'desktop' ]; then | ||
| mkdir -p /mnt/etc/dconf/db/local.d/locks | ||
|
|
||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/locks/automount-disable | tee /mnt/etc/dconf/db/local.d/locks/automount-disable | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/locks/privacy | tee /mnt/etc/dconf/db/local.d/locks/privacy | ||
|
|
||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/adw-gtk3-dark | tee /mnt/etc/dconf/db/local.d/adw-gtk3-dark | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/automount-disable | tee /mnt/etc/dconf/db/local.d/automount-disable | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/button-layout | tee /mnt/etc/dconf/db/local.d/button-layout | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/prefer-dark | tee /mnt/etc/dconf/db/local.d/prefer-dark | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/privacy | tee /mnt/etc/dconf/db/local.d/privacy | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/touchpad | tee /mnt/etc/dconf/db/local.d/touchpad | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/adw-gtk3-dark | tee /mnt/etc/dconf/db/local.d/adw-gtk3-dark | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/automount-disable | tee /mnt/etc/dconf/db/local.d/automount-disable | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/button-layout | tee /mnt/etc/dconf/db/local.d/button-layout | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/prefer-dark | tee /mnt/etc/dconf/db/local.d/prefer-dark | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/privacy | tee /mnt/etc/dconf/db/local.d/privacy | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/touchpad | tee /mnt/etc/dconf/db/local.d/touchpad | ||
| fi | ||
|
|
||
| ## ZRAM configuration | ||
| unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/systemd/zram-generator.conf | tee /mnt/etc/systemd/zram-generator.conf | ||
|
|
@@ -433,9 +445,11 @@ arch-chroot /mnt /bin/bash -e <<EOF | |
| usermod -aG wheel $username | ||
| fi | ||
| # Setting up dconf | ||
| output "Setting up dconf." | ||
| dconf update | ||
| if [ "${install_mode}" = 'desktop' ]; then | ||
| # Setting up dconf | ||
| output "Setting up dconf." | ||
| dconf update | ||
| fi | ||
| # Snapper configuration | ||
| umount /.snapshots | ||
|
|
||