Merge 68dbc7224a into 6c92727673

Fedora-Workstation-38.sh

@@ -48,8 +48,8 @@ OPTIONS="-F 1"' | sudo tee /etc/sysconfig/chronyd
 sudo systemctl restart chronyd
 
 # Setup Networking
-sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/00-macrandomize.conf -o /etc/NetworkManager/conf.d/00-macrandomize.conf
-sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/01-transient-hostname.conf -o /etc/NetworkManager/conf.d/01-transient-hostname.conf
+echo -e '[device]\nwifi.scan-rand-mac-address=yes\n\n[connection]\nwifi.cloned-mac-address=random\nethernet.cloned-mac-address=random' | sudo tee /etc/NetworkManager/conf.d/99-random-mac.conf
+echo -e '[main]\nhostname-mode=none' | sudo tee /etc/NetworkManager/conf.d/01-transient-hostname.conf
 sudo nmcli general reload conf
 sudo hostnamectl hostname 'localhost'
 sudo hostnamectl --transient hostname ''
@@ -96,7 +96,7 @@ sudo dconf update
 echo -e '[zram0]\nzram-fraction = 1\nmax-zram-size = 8192\ncompression-algorithm = zstd' | sudo tee /etc/systemd/zram-generator.conf
 
 # Speed up DNF
-sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dnf/dnf.conf -o /etc/dnf/dnf.conf
+echo -e 'fastestmirror=1\nmax_parallel_downloads=10\ndeltarpm=False\ndefaultyes=True\ninstall_weak_deps=False\ncountme=False' | sudo tee -a /etc/dnf/dnf.conf
 sudo sed -i 's/^metalink=.*/&\&protocol=https/g' /etc/yum.repos.d/*
 
 # Update packages and firmware
@@ -141,4 +141,16 @@ sudo dnf -y install gnome-console git-core gnome-shell-extension-appindicator gn
 # Enable auto TRIM
 sudo systemctl enable fstrim.timer
 
+# Setup BTRFS layout and Timeshift
+sudo mkdir /btrfs_pool
+sudo mount -o subvolid=5 /dev/mapper/${PARTITIONID} /btrfs_pool
+sudo mv /btrfs_pool/root /btrfs_pool/@
+sudo mv /btrfs_pool/home /btrfs_pool/@home
+sudo btrfs subvolume list /btrfs_pool
+sudo sed -i 's/subvol=root/subvol=@,ssd,noatime,space_cache,commit=120,compress=zstd:1,discard=async/' /etc/fstab
+sudo sed -i 's/subvol=home/subvol=@home,ssd,noatime,space_cache,commit=120,compress=zstd:1,discard=async/' /etc/fstab
+sudo echo "UUID=${PARTITIONUUID} /btrfs_pool             btrfs   subvolid=5,ssd,noatime,space_cache,commit=120,compress=zstd:1,discard=async,x-systemd.device-timeout=0   0 0" | sudo tee -a /etc/fstab
+sudo grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+sudo dnf -y install timeshift
+
 ## The script is done. You can also remove gnome-terminal since gnome-console will replace it.

RHEL-Server-9.sh

@@ -66,7 +66,7 @@ sudo systemctl daemon-reload
 sudo systemctl restart irqbalance
 
 # Setup dnf
-sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dnf/dnf.conf -o /etc/dnf/dnf.conf
+echo -e 'fastestmirror=1\nmax_parallel_downloads=10\ndeltarpm=False\ndefaultyes=True\ninstall_weak_deps=False\ncountme=False' | sudo tee -a /etc/dnf/dnf.conf
 sudo sed -i 's/^metalink=.*/&\&protocol=https/g' /etc/yum.repos.d/*
 
 # Setup unbound

Ubuntu-22.04-Desktop.sh

@@ -28,7 +28,7 @@ sudo usg fix cis_level2_workstation
 # Remove AIDE
 sudo apt purge -y aide*
 
-# Allow su which is disabled by CIS
+# Allow su which is disabled by CIS 
 sudo sed -i 's/auth required pam_wheel.so use_uid group=sugroup//g' /etc/pam.d/su
 
 # Setting umask to 077
@@ -126,12 +126,17 @@ sudo snap remove firefox
 sudo apt install -y git-core gnome-text-editor
 sudo snap install eog
 
-# Setup Networking
-sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/00-macrandomize.conf -o /etc/NetworkManager/conf.d/00-macrandomize.conf
-sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/01-transient-hostname.conf -o /etc/NetworkManager/conf.d/01-transient-hostname.conf
-sudo nmcli general reload conf
-sudo hostnamectl hostname 'localhost'
-sudo hostnamectl --transient hostname ''
+# Randomize MAC address
+sudo bash -c 'cat > /etc/NetworkManager/conf.d/00-macrandomize.conf' <<-'EOF'
+[device]
+wifi.scan-rand-mac-address=yes
+[connection]
+wifi.cloned-mac-address=random
+ethernet.cloned-mac-address=random
+connection.stable-id=${CONNECTION}/${BOOT}
+EOF
+
+sudo systemctl restart NetworkManager
 
 # Enable fstrim.timer
 sudo apt install tuned -y

etc/NetworkManager/conf.d/00-macrandomize.conf

@@ -1,6 +0,0 @@
-[device]
-wifi.scan-rand-mac-address=yes
-[connection]
-wifi.cloned-mac-address=random
-ethernet.cloned-mac-address=random
-connection.stable-id=${CONNECTION}/${BOOT}

etc/NetworkManager/conf.d/01-transient-hostname.conf

@@ -1,2 +0,0 @@
-[main]
-hostname-mode=none

etc/dnf/dnf.conf

@@ -1,5 +0,0 @@
-max_parallel_downloads=10
-deltarpm=False
-defaultyes=True
-install_weak_deps=False
-countme=False