From a2e63f38876128d67ec4fc9ba6188975eb573fa8 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Wed, 20 Dec 2023 16:54:12 -0600
Subject: [PATCH] Updated more flatpak stuff, fixed network manager on arch

---
 dotenv.sh | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/dotenv.sh b/dotenv.sh
index 6ba2c5b..2cc2035 100755
--- a/dotenv.sh
+++ b/dotenv.sh
@@ -30,6 +30,7 @@ sudo pacman -S -q --noconfirm \
   cmake \
   curl \
   wget \
+  xdg-desktop-portal-kde \
   flatpak \
   neovim \
   vim \
@@ -43,11 +44,9 @@ sudo pacman -S -q --noconfirm \
 # Desktop Programs
 echo -e "\n\n\nInstalling Pacman Desktop Programs\n\n\n"
 sudo pacman -S -q --noconfirm \
-  firefox \
   gparted \
   solaar \
   plasma-wayland-session \
-  steam \
   zip \
   ttc-iosevka \
   bluedevil \
@@ -67,10 +66,12 @@ sudo pacman -S -q --noconfirm \
   sddm \
   gnome-keyring
 
-
 # Install programs using flatpak
 echo -e "\n\n\nInstalling FlatPak Desktop Programs\n\n\n"
-flatpak install flathub \
+flatpak install \
+    flathub \
+    org.mozilla.firefox \
+    com.valvesoftware.Steam \
     com.bitwarden.desktop \
     com.obsproject.Studio \
     com.discordapp.Discord \
@@ -129,8 +130,6 @@ git clone https://aur.archlinux.org/yay.git
 cd yay
 makepkg -si
 
-
-
 # Node JS / NVM
 echo -e "\n\n\nNodeJS\n\n\n"
 if ! command -v nvm &> /dev/null
@@ -144,7 +143,6 @@ fi
 nvm install --lts
 npm i -g yarn
 
-
 # VIM
 echo -e "\n\n\nVIM\n\n\n"
 echo "alias vim='nvim'" >> ~/.bashrc
@@ -196,9 +194,6 @@ sudo systemctl enable avahi-daemon
 # Printer
 sudo systemctl enable --now cups
 
-# Setup screenshot hotkeys
-# shotgun - | xclip -t 'image/png' -selection clipboard
-
 # Enable plasma env vars
 mkdir -p $HOME/.config/plasma-workspace/env/
 echo "#!/bin/bash" >> $HOME/.config/plasma-workspace/env/path.sh
@@ -209,4 +204,14 @@ yay -S --nodiffmenu visual-studio-code-bin ttf-ms-win10-auto
 
 # Setup VSCode to launch under wayland
 echo '--enable-features=WaylandWindowDecorations' >> ~/.config/code-flags.conf
-echo '--ozone-platform-hint=auto' >> ~/.config/code-flags.conf
\ No newline at end of file
+echo '--ozone-platform-hint=auto' >> ~/.config/code-flags.conf
+
+# Enable NetworkManager (Not sure why this isn't being enabled by default?)
+if grep -q 'wifi.backend' "/etc/NetworkManager/NetworkManager.conf"; then
+  echo 'Wi-Fi Backend already setup.'
+else
+  echo "[device]" | sudo tee -a /etc/NetworkManager/NetworkManager.conf
+  echo "wifi.backend=iwd" | sudo tee -a /etc/NetworkManager/NetworkManager.conf
+fi
+sudo systemctl enable --now NetworkManager.service
+sudo systemctl restart NetworkManager.service
\ No newline at end of file