diff --git a/configure-zram.bash b/configure-zram.bash index 5c2ca9d..473d6c8 100755 --- a/configure-zram.bash +++ b/configure-zram.bash @@ -6,12 +6,6 @@ if [ $(whoami) == "root" ]; then exit 1 fi -sudo_remove_file_if_exists() { - if [ -f $1 ]; then - sudo rm $1 - fi -} - # only fedora is up-to-date command_exists() { type "$1" &>/dev/null; } @@ -20,20 +14,12 @@ if command_exists "apt-get"; then sudo apt-get install kitty -y echo "Please install SchildiChat, nvim/neovim" elif command_exists "dnf"; then - # remove old zram stuff - echo '' | sudo crontab - - sudo_remove_file_if_exists /etc/modules-load.d/zram.conf - sudo_remove_file_if_exists /etc/udev/rules.d/99-zram.rules - sudo sed -i 's/\/dev\/zram0 none swap defaults,discard,pri=160 0 0//g' /etc/fstab - - sudo dnf install zram-generator -y - # set up zram - if [ -f /usr/lib/systemd/zram-generator.conf ]; then - sudo rm /usr/lib/systemd/zram-generator.conf + sudo dnf remove zram-generator -y + echo 'zram' | sudo tee /etc/modules-load.d/zram.conf + echo 'ACTION=="add", KERNEL=="zram0", ATTR{initstate}=="0", ATTR{comp_algorithm}="zstd", ATTR{disksize}="48G", RUN="/usr/bin/mkswap -U clear %N", TAG+="systemd"' | sudo tee /etc/udev/rules.d/99-zram.rules + zram_fstab='/dev/zram0 none swap defaults,discard,pri=160 0 0' + if ! grep -q "$zram_fstab" /etc/fstab; then + echo "$zram_fstab" | sudo tee -a /etc/fstab fi - if ! [ -d /usr/local/lib/systemd ]; then - sudo mkdir -p /usr/local/lib/systemd - fi - echo '[zram0] -zram-size = ram * 3' | sudo tee /usr/local/lib/systemd/zram-generator.conf + echo '@reboot bash -c "mkswap -U clear /dev/zram0; swapon --discard --priority 160 /dev/zram0"' | sudo crontab - fi diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh index 9958f4c..106ed14 100755 --- a/install-stuff/install-misc.sh +++ b/install-stuff/install-misc.sh @@ -12,7 +12,7 @@ if command_exists "apt-get"; then sudo apt-get install kitty -y echo "Please install SchildiChat, nvim/neovim" elif command_exists "dnf"; then - sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup p7zip mosh krita podman podman-docker podman-compose gajim progress yt-dlp genisoimage zstd iperf3 keepassxc python3-pip ffmpegthumbnailer linuxconsoletools bind-utils hyfetch fastfetch nmap unrar-free restic gparted bsdtar android-tools httpd-tools digikam edid-decode hexchat htop minetest fuse-sshfs syncthing nasm sysstat openshot HandBrake HandBrake-gui electrum feather obs-studio fuse-libs pandoc wtype fedora-packager rpmdevtools createrepo_c iotop igt-gpu-tools power-profiles-daemon solaar -y + sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup p7zip mosh krita podman podman-docker podman-compose gajim progress yt-dlp genisoimage zstd iperf3 keepassxc python3-pip ffmpegthumbnailer linuxconsoletools bind-utils hyfetch fastfetch nmap unrar-free restic gparted bsdtar android-tools httpd-tools digikam edid-decode hexchat htop minetest fuse-sshfs syncthing nasm sysstat openshot HandBrake HandBrake-gui electrum feather obs-studio fuse-libs pandoc wtype fedora-packager rpmdevtools createrepo_c iotop igt-gpu-tools power-profiles-daemon -y sudo dnf install ffmpeg --allowerasing sudo systemctl enable --now syncthing@askiiart