Compare commits

..

No commits in common. "3c96010c9433835e987bbf2efc65e607b2f96e87" and "b861e0dd8413e086fae79b319979ed65a20d96e9" have entirely different histories.

3 changed files with 13 additions and 1 deletions

View file

@ -78,7 +78,11 @@ fi
# Installing packages
<<<<<<< HEAD
sudo pacman -S gnome-console gnome-session gdm gnome-disk-utility gnome-system-monitor eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
=======
sudo pacman -S gnome-console gnome-session gdm gnome-disk-utility gnome-system-monitor fuse2 eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
>>>>>>> AlexC-main
sudo systemctl enable gdm.service
sudo systemctl enable NetworkManager.service
sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service

View file

@ -80,7 +80,11 @@ fi
# Installing packages
sudo pacman -S gnome-session gdm gnome-disk-utility gnome-system-monitor fuse2 eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
<<<<<<< HEAD
sudo pacman -S tilix gnome-session gdm gnome-disk-utility gnome-system-monitor eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
=======
sudo pacman -S tilix gnome-session gdm gnome-disk-utility gnome-system-monitor fuse2 eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
>>>>>>> AlexC-main
sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service
flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
sudo systemctl enable gdm.service

View file

@ -78,7 +78,11 @@ fi
# Installing packages
<<<<<<< HEAD
sudo pacman -S sddm plasma-desktop plasma-wayland-protocols plasma-systemmonitor dolphin konsole gnome-disk-utility ark kscreen plasma-pa inkscape ksystemstats network-manager-applet networkmanager flatpak base-devel bash-completion kate kcalc baobab ffmpeg git gparted xdg-desktop-portal xdg-desktop-portal-gtk plasma-browser-integration xdg-desktop-portal-wlr ttf-ubuntu-font-family unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools qt5-graphicaleffects qt5-quickcontrols2 ufw gufw spectacle rebuild-detector --noconfirm
=======
sudo pacman -S sddm plasma-desktop plasma-wayland-protocols plasma-systemmonitor networkmanager-qt discover dolphin konsole fuse2 gnome-disk-utility ark kscreen plasma-pa inkscape ksystemstats networkmanager flatpak base-devel bash-completion kate kcalc baobab ffmpeg git gparted xdg-desktop-portal xdg-desktop-portal-gtk plasma-browser-integration xdg-desktop-portal-wlr ttf-ubuntu-font-family unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools qt5-graphicaleffects qt5-quickcontrols2 ufw gufw spectacle rebuild-detector gwenview --noconfirm
>>>>>>> AlexC-main
sudo systemctl enable NetworkManager.service
sudo systemctl enable sddm.service
sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target