diff --git a/_nv_modeset b/_nv_modeset
deleted file mode 100644
index b1e8df2..0000000
--- a/_nv_modeset
+++ /dev/null
@@ -1 +0,0 @@
-options nvidia-drm modeset=1
\ No newline at end of file
diff --git a/_show_pkgs b/_show_pkgs
deleted file mode 100644
index 690b6ad..0000000
--- a/_show_pkgs
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-apt-mark showmanual > ~/.pkgsrc/pkgs_cur
-diff --suppress-common-lines -y ~/.pkgsrc/pkgs_cur ~/.pkgsrc/pkgs_org
diff --git a/_undervolt b/_undervolt
index 5b89e3e..bd4b350 100644
--- a/_undervolt
+++ b/_undervolt
@@ -3,4 +3,4 @@ Description=undervolt
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/undervolt -v --core -125 --cache -125 --uncore -125 --analogio -125 --gpu -50
\ No newline at end of file
+ExecStart=undervolt -v --core -125 --cache -125 --uncore -125 --analogio -125 --gpu -50
diff --git a/_wakeup_fix b/_wakeup_fix
index 8e006c9..4b63ef0 100644
--- a/_wakeup_fix
+++ b/_wakeup_fix
@@ -2,8 +2,8 @@
 Description=Wakeup fix
 
 [Service]
-ExecStart=/bin/sh -c '/bin/echo XHC > /proc/acpi/wakeup; /bin/echo LID0 > /proc/acpi/wakeup; /bin/echo PBTN > /proc/acpi/wakeup; /bin/echo deep > /sys/power/mem_sleep'
+ExecStart=/bin/sh -c '/bin/echo XHC > /proc/acpi/wakeup; /bin/echo deep > /sys/power/mem_sleep'
 
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/id_op52.gpg b/id_ed25519.gpg
similarity index 100%
rename from id_op52.gpg
rename to id_ed25519.gpg
diff --git a/id_op52.pub b/id_ed25519.pub
similarity index 100%
rename from id_op52.pub
rename to id_ed25519.pub
diff --git a/setup1_apt.sh b/setup1_apt.sh
deleted file mode 100755
index 342ace8..0000000
--- a/setup1_apt.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# create apt snapshot and script for manually installed packages
-echo "Creating APT snapshot..."
-mkdir ~/.pkgsrc
-apt-mark showmanual > ~/.pkgsrc/pkgs_org
-echo "Creating APT script..."
-cp ./_show_pkgs ~/show_pkgs
-chmod +x ~/show_pkgs
-
diff --git a/setup2_ssh.sh b/setup2_ssh.sh
index f2057cd..1aebbb8 100755
--- a/setup2_ssh.sh
+++ b/setup2_ssh.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 
+echo "Setting up GnuPG..."
+sudo dnf install -y gnupg
+gpg -d id_ed25519.gpg > id_ed25519
+
 echo "Installing keychain..."
-sudo apt install keychain
+sudo dnf install -y keychain
 
 echo "Copying private key..."
-cp id_op52 ~/.ssh/id_op52
-cp id_op52.pub ~/.ssh/id_op52.pub
-chmod 600 ~/.ssh/id_op52
-chmod 644 ~/.ssh/id_op52.pub
+mkdir -p ~/.ssh
+chmod 700 ~/.ssh
+cp id_ed25519 ~/.ssh/
+cp id_ed25519.pub ~/.ssh/
+chmod 600 ~/.ssh/id_ed25519
+chmod 644 ~/.ssh/id_ed25519.pub
 
 echo "Configuring keychain..."
 echo "# Configured for keychain" >> ~/.bashrc
-echo "eval \`keychain --quiet --eval --agents ssh id_op52\`" >> ~/.bashrc
+echo "eval \`keychain --quiet --eval --agents ssh id_ed25519\`" >> ~/.bashrc
diff --git a/setup3_fedora_pkg.sh b/setup3_fedora_pkg.sh
new file mode 100755
index 0000000..76c73c9
--- /dev/null
+++ b/setup3_fedora_pkg.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "Installing packages"
+sudo dnf upgrade
+sudo dnf install -y vim arc-theme gnome-tweak-tool paper-icon-theme ibus-pinyin clang lld qemu nasm bochs xorriso git dconf-editor
+ibus restart
diff --git a/setup3_ubuntu_pkg.sh b/setup3_ubuntu_pkg.sh
deleted file mode 100755
index b462412..0000000
--- a/setup3_ubuntu_pkg.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-echo "Installing packages"
-sudo add-apt-repository -y -u ppa:snwh/ppa
-sudo add-apt-repository -y ppa:graphics-drivers
-sudo apt-get -y update
-sudo apt-get -y upgrade
-sudo apt install -y vim arc-theme gnome-tweak-tool paper-icon-theme ibus-pinyin clang lld qemu nasm grub-pc-bin bochs bochs-sdl xorriso git dconf-editor
-sudo apt-get -y autoremove
-ibus restart
\ No newline at end of file
diff --git a/setupo_laptop_pwr.sh b/setupo_laptop_pwr.sh
index 46f8981..9fb71a3 100755
--- a/setupo_laptop_pwr.sh
+++ b/setupo_laptop_pwr.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 echo "Installing power-saving packages"
-sudo apt install -y powertop tlp
-sudo apt-get -y autoremove
+sudo dnf install -y powertop tlp
 
-echo "Edit /etc/default/tlp such that the default mode is BAT"
\ No newline at end of file
+echo "Edit /etc/default/tlp such that the default mode is BAT"
diff --git a/setupo_laptop_undervolt.sh b/setupo_laptop_undervolt.sh
index ea2ffcf..0069b9b 100755
--- a/setupo_laptop_undervolt.sh
+++ b/setupo_laptop_undervolt.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 echo "Installing undervolt packages"
-sudo apt install -y python-pip
-sudo apt-get -y autoremove
+sudo dnf install -y python-pip
 sudo pip install undervolt
 
 
diff --git a/setupo_prime_sync.sh b/setupo_prime_sync.sh
deleted file mode 100755
index ca83a19..0000000
--- a/setupo_prime_sync.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-sudo cp _nv_modeset /etc/modprobe.d/zz-nvidia-modeset.conf
-sudo update-initramfs -u
\ No newline at end of file