From 91aa687a02405cf9d9077e3b7d7aa4ce01955a95 Mon Sep 17 00:00:00 2001 From: AlexanderCurl Date: Mon, 13 Jan 2025 14:45:12 +0000 Subject: [PATCH] Fixed git fuckery --- raveos-gnome.sh | 4 ---- raveos-hypr.sh | 4 ---- raveos-kde.sh | 4 ---- 3 files changed, 12 deletions(-) diff --git a/raveos-gnome.sh b/raveos-gnome.sh index 18a814e..eda3f2c 100644 --- a/raveos-gnome.sh +++ b/raveos-gnome.sh @@ -78,11 +78,7 @@ 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 diff --git a/raveos-hypr.sh b/raveos-hypr.sh index 60b945a..0d07747 100644 --- a/raveos-hypr.sh +++ b/raveos-hypr.sh @@ -80,11 +80,7 @@ fi # Installing packages -<<<<<<< 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 diff --git a/raveos-kde.sh b/raveos-kde.sh index 6029cba..45180dd 100644 --- a/raveos-kde.sh +++ b/raveos-kde.sh @@ -78,11 +78,7 @@ 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