1
0
Fork 0
forked from RP1/RaveOS-arch

Merge pull request 'Fixed git fuckery' (#12) from AlexC/RaveOS-arch:main into main

Reviewed-on: RP1/RaveOS-arch#12
This commit is contained in:
RP1 2025-01-13 14:48:46 +00:00
commit 3c96010c94
3 changed files with 1 additions and 13 deletions

View file

@ -78,11 +78,7 @@ fi
# Installing packages # 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 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 gdm.service
sudo systemctl enable NetworkManager.service sudo systemctl enable NetworkManager.service
sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service

View file

@ -80,11 +80,7 @@ fi
# Installing packages # Installing packages
<<<<<<< HEAD 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
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 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 flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
sudo systemctl enable gdm.service sudo systemctl enable gdm.service

View file

@ -78,11 +78,7 @@ fi
# Installing packages # 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 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 NetworkManager.service
sudo systemctl enable sddm.service sudo systemctl enable sddm.service
sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target