diff --git a/profiles/DerGeret/Arch/install.sh b/profiles/DerGeret/Arch/install.sh index 1f847a66..153c87e6 100755 --- a/profiles/DerGeret/Arch/install.sh +++ b/profiles/DerGeret/Arch/install.sh @@ -1,13 +1,12 @@ #!/bin/bash pushd "${BASH_SOURCE%/*}" > /dev/null; -. "../../../scripts/Arch/Software/yay/install.sh"; +. "../../../scripts/Arch/OS/install.sh"; . "../../../scripts/Arch/Software/GRUB/install.sh"; . "../../../scripts/Arch/Config/SecureBoot/install.sh"; . "../../../scripts/Arch/Software/nvidia-dkms/install.sh"; . "../../../scripts/Arch/Software/xone/install.sh"; . "../../../scripts/Arch/Software/bt-dualboot/install.sh"; -. "../../../scripts/Arch/Software/sddm/install.sh"; . "../../../scripts/Arch/Config/ssh-agent/install.sh"; . "../../../scripts/Arch/Collections/personal.sh"; diff --git a/profiles/ManuSurface/Arch/install.sh b/profiles/ManuSurface/Arch/install.sh index 91fec58e..8fc1a166 100755 --- a/profiles/ManuSurface/Arch/install.sh +++ b/profiles/ManuSurface/Arch/install.sh @@ -1,9 +1,9 @@ #!/bin/bash pushd "${BASH_SOURCE%/*}" > /dev/null; +. "../../../scripts/Arch/OS/install.sh"; . "../../../scripts/Arch/Config/SecureBoot/install.sh"; . "../../../scripts/Arch/Devices/SurfaceBook2/install.sh"; -. "../../../scripts/Arch/Software/sddm/install.sh"; . "../../../scripts/Arch/Config/ssh-agent/install.sh"; . "../../../scripts/Arch/Collections/school.sh"; diff --git a/scripts/Arch/Collections/personal.sh b/scripts/Arch/Collections/personal.sh index 9a27488d..5b62e652 100755 --- a/scripts/Arch/Collections/personal.sh +++ b/scripts/Arch/Collections/personal.sh @@ -1,8 +1,6 @@ #!/bin/bash pushd "${BASH_SOURCE%/*}" > /dev/null; . "../Config/pacman/install.sh"; -. "../Software/base-devel/install.sh"; -. "../Software/yay/install.sh"; # Firmware yay --noconfirm -Syu mkinitcpio-firmware; @@ -37,11 +35,10 @@ sudo chsh $USER --shell "$(which fish)"; # User Interface yay --noconfirm -Syu \ - sddm \ maliit-keyboard \ ; -. ../Config/sddm/install.sh; +. ../Software/sddm/install.sh; . ../Software/KDE/install.sh; yay --noconfirm -Syu power-profiles-daemon; diff --git a/scripts/Arch/OS/install.sh b/scripts/Arch/OS/install.sh new file mode 100755 index 00000000..63cc4727 --- /dev/null +++ b/scripts/Arch/OS/install.sh @@ -0,0 +1,7 @@ +#!/bin/bash +pushd "${BASH_SOURCE%/*}" > /dev/null; + +. "../Software/base-devel/install.sh"; +. "../Software/yay/install.sh"; + +popd > /dev/null;