From 02e68791485a4b1a2d432235c34b150d1614f27c Mon Sep 17 00:00:00 2001
From: Blake Ridgway <blake@blakeridgway.dev>
Date: Thu, 15 Sep 2022 21:52:20 -0500
Subject: [PATCH] [Clean Up] - Only using Fedora so removed Apt references

---
 dotfiles/post_install     |  76 ++++++++----------
 dotfiles/post_install_fed | 164 --------------------------------------
 2 files changed, 35 insertions(+), 205 deletions(-)
 delete mode 100644 dotfiles/post_install_fed

diff --git a/dotfiles/post_install b/dotfiles/post_install
index 17a6dc2..30d7695 100755
--- a/dotfiles/post_install
+++ b/dotfiles/post_install
@@ -3,31 +3,36 @@
 # Relies on Flatpak to be installed
 # Created by Blake Ridgway
 
+# Verify flatpak is engaged properly
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+
 PACKAGE_LIST=(
   dialog
-  discord
+  git
+  go
   htop
   neofetch
   neovim
-  openjdk-11-jre
   python3
   python3-pip
   solaar
-  steam
-  system76-keyboard-configurator
   tilix
-  libvirt-daemon-driver-lxc
   virt-manager
-  vlc
   zsh
 )
 
 FLATPAK_LIST=(
-  com.github.fabiocolacio.marker
-  com.mattermost.Desktop
+  com.bitwarden.desktop
+  com.discordapp.Discord
+  com.jetbrains.GoLand
+  com.jetbrains.DataGrip
   com.obsproject.Studio
-  net.cozic.joplin_desktop
-  net.veloren.Airshipper  
+  com.slack.Slack
+  com.valvesoftware.Steam
+  net.davidotek.pupgui2
+  net.veloren.airshipper
+  org.videolan.VLC
+  sh.cider.Cider
 )
 
 echo #######################
@@ -36,10 +41,10 @@ echo #######################
 
 # iterate through package and installs them
 for package_name in ${PACKAGE_LIST[@]}; do
-  if ! sudo apt list --installed | grep -q "^\<$package_name\>"; then
+  if ! sudo dnf list --installed | grep -q "^\<$package_name\>"; then
     echo "Installing $package_name..."
     sleep .5
-    sudo apt install "$package_name" -y
+    sudo dnf install "$package_name" -y
     echo "$package_name has been installed"
   else
     echo "$package_name already installed"
@@ -64,28 +69,6 @@ mkdir -p ~/.local/share/fonts
 cp Hack\ Regular\ Nerd\ Font\ Complete.ttf ~/.local/share/fonts/
 fc-cache -f -v
 
-echo ##################################
-echo # Downloading and Configuring Go #
-echo ##################################
-
-# Grabs and downloads Go for Google
-wget https://golang.org/dl/go1.17.2.linux-amd64.tar.gz
-sudo tar -C /usr/local -xzf go1.17.2.linux-amd64.tar.gz
-
-echo ###################
-echo # Installing Rust #
-echo ###################
-
-# Install Rust
-curl https://sh.rustup.rs -sSf | sh
-
-echo ######################
-echo # Setting up SSH Key #
-echo ######################
-
-# SSH Key Gen
-ssh-keygen -t ed25519 -C ${USER}@$(hostname --fqdn)
-
 echo ######################
 echo # Installing OhMyZSH #
 echo ######################
@@ -114,24 +97,20 @@ echo ############################
 mkdir -p ~/.config/nvim/
 echo $'set runtimepath^=~/.vim runtimepath+=~/.vim/after\nlet &packpath=&runtimepath\nsource ~/.vimrc' > ~/.config/nvim/init.vim
 
-# wget https://github.com/OrangeDrangon/android-messages-desktop/releases/download/v5.1.1/AndroidMessages-v5.1.1-linux-amd64.deb
-
 echo #######################
 echo # Cleanup and Updates #
 echo #######################
 
-sudo apt update
-sudo apt upgrade -y
-sudo apt autoremove -y
+sudo dnf upgrade --refresh
 flatpak update
 
 echo ################
 echo # File Cleanup #
 echo ################
 
-rm -r *.ttf *.tar.gz
+rm -r *.ttf *.tar.gz *.rpm
 
-FILES=( 'vimrc' 'vim' 'zshrc' 'zsh' 'agignore' 'gitconfig' 'gitignore' 'gitmessage' )
+FILES=( 'vimrc' 'vim' 'zshrc' 'zsh' 'agignore' 'gitconfig' 'gitignore' 'gitmessage' 'aliases' )
 for file in ${FILES[@]}; do
   echo ""
   echo "Simlinking $file to $HOME"
@@ -145,3 +124,18 @@ for file in ${FILES[@]}; do
   fi
 done
 
+# Enable RPM Fusion
+
+sudo dnf install \
+  https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+
+sudo dnf install \
+  https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+  
+# Enable Mesa aco
+sudo dnf copr enable gloriouseggroll/mesa-aco
+
+# Enable fsync kernel
+sudo dnf copr enable sentry/kernel-fsync
+
+sudo dnf upgrade --refresh
\ No newline at end of file
diff --git a/dotfiles/post_install_fed b/dotfiles/post_install_fed
deleted file mode 100644
index ea83fb7..0000000
--- a/dotfiles/post_install_fed
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-# A script for setting up post install
-# Relies on Flatpak to be installed
-# Created by Blake Ridgway
-
-# Setup all System76 Software
-sudo dnf copr enable szydell/system76 
-sudo dnf install system76-dkms system76-power system76-driver system76-firmware firmware-manager system76-io-dkms system76-acpi-dkms
-sudo systemctl enable system76-power system76-power-wake system76-firmware-daemon
-sudo systemctl start system76-power system76-firmware-daemon
-systemctl enable --user com.system76.FirmwareManager.Notify.timer
-
-# Verify flatpak is engaged properly
-flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-PACKAGE_LIST=(
-  dialog
-  git
-  htop
-  neofetch
-  neovim
-  java-11-openjdk
-  python3
-  python3-pip
-  solaar
-  tilix
-  virt-manager
-  vlc
-  zsh
-)
-
-FLATPAK_LIST=(
-  com.discordapp.Discord
-  com.mattermost.Desktop
-  com.obsproject.Studio
-  com.valvesoftware.Steam
-  net.veloren.airshipper
-  sh.cider.Cider
-)
-
-echo #######################
-echo # Installing Packages #
-echo #######################
-
-# iterate through package and installs them
-for package_name in ${PACKAGE_LIST[@]}; do
-  if ! sudo dnf list --installed | grep -q "^\<$package_name\>"; then
-    echo "Installing $package_name..."
-    sleep .5
-    sudo dnf install "$package_name" -y
-    echo "$package_name has been installed"
-  else
-    echo "$package_name already installed"
-  fi
-done
-
-for flatpak_name in ${FLATPAK_LIST[@]}; do
-	if ! flatpak list | grep -q $flatpak_name; then
-		flatpak install "$flatpak_name" -y
-	else
-		echo "$package_name already installed"
-	fi
-done
-
-# git submodule init
-# git submodule update --recursive
-
-echo ############
-echo # Protonup #
-echo ############
-
-pip3 install protonup
-
-echo #####################
-echo # Install Nerd Font #
-echo #####################
-
-# Nerd Font install
-wget https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Hack/Regular/complete/Hack%20Regular%20Nerd%20Font%20Complete.ttf
-mkdir -p ~/.local/share/fonts 
-cp Hack\ Regular\ Nerd\ Font\ Complete.ttf ~/.local/share/fonts/
-fc-cache -f -v
-
-echo ##################################
-echo # Downloading and Configuring Go #
-echo ##################################
-
-# Grabs and downloads Go for Google
-wget https://go.dev/dl/go1.18.2.linux-amd64.tar.gz
-sudo tar -C /usr/local -xzf go1.18.2.linux-amd64.tar.gz
-
-echo ######################
-echo # Installing OhMyZSH #
-echo ######################
-
-# Oh-my-ZSH
-sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
-echo ############################
-echo # Setting up Powerlevel10k #
-echo ############################
-
-# POWERLEVEL10K
-git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
-
-echo ##################################
-echo # Copying p10k Config file to ~/
-echo ##################################
-
-# Copy p10k Config file
-cp .p10k.zsh ~/
-
-echo ############################
-echo # Setting up nvim/init.vim #
-echo ############################
-
-mkdir -p ~/.config/nvim/
-echo $'set runtimepath^=~/.vim runtimepath+=~/.vim/after\nlet &packpath=&runtimepath\nsource ~/.vimrc' > ~/.config/nvim/init.vim
-
-echo #######################
-echo # Cleanup and Updates #
-echo #######################
-
-sudo dnf update
-flatpak update
-
-echo ################
-echo # File Cleanup #
-echo ################
-
-rm -r *.ttf *.tar.gz *.rpm
-
-FILES=( 'vimrc' 'vim' 'zshrc' 'zsh' 'agignore' 'gitconfig' 'gitignore' 'gitmessage' 'aliases' )
-for file in ${FILES[@]}; do
-  echo ""
-  echo "Simlinking $file to $HOME"
-  ln -sf "$PWD/$file" "$HOME/.$file"
-  if [ $? -eq 0 ]
-  then
-    echo "$PWD/$file ~> $HOME/.$file"
-  else
-    echo 'Install failed to symlink.'
-    exit 1
-  fi
-done
-
-# Enable RPM Fusion
-# Run in Bash as Zsh cannot do `$(rpm -E %fedora)`
-sudo dnf install \
-  https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-
-sudo dnf install \
-  https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-  
-# EXECUTE LAST SO NOTHING BREAKS
-
-# Enable Mesa aco
-sudo dnf copr enable gloriouseggroll/mesa-aco
-
-# Enable fsync kernel
-sudo dnf copr enable sentry/kernel-fsync
-
-sudo dnf update --refresh
-