From d1c94756923a914458ba465e866bdd00d396a95a Mon Sep 17 00:00:00 2001
From: dabruh <11458706-dabruh@users.noreply.gitlab.com>
Date: Tue, 13 Dec 2022 16:40:08 +0100
Subject: [PATCH] Move away from i3-gaps for Debian based systems

---
 .config/i3/layers/5CG9521PYJ.layer |  1 -
 .installer/packages                |  5 ++++-
 setup_system.sh                    | 23 ++++++++++-------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.config/i3/layers/5CG9521PYJ.layer b/.config/i3/layers/5CG9521PYJ.layer
index 811f12a..843cf41 100644
--- a/.config/i3/layers/5CG9521PYJ.layer
+++ b/.config/i3/layers/5CG9521PYJ.layer
@@ -1,2 +1 @@
-config.post-main-90-gaps
 config.post-main-90-laptop
diff --git a/.installer/packages b/.installer/packages
index 3da6f77..1a40a14 100644
--- a/.installer/packages
+++ b/.installer/packages
@@ -1,14 +1,17 @@
+pacman-base:acpi,curl
 pacman-any:i3-gaps,feh,i3status,network-manager-applet,pasystray,xautolock,inotify-tools,xss-lock,noto-fonts-emoji
 pacman-any:gst-libav,phonon-qt5-gstreamer,gst-plugins-good,qt5-quickcontrols,qt5-graphicaleffects,qt5-multimedia
 pacman-any:code,vim,ufw,scrot,dunst
 pacman-laptop:brightnessctl
 aur-any:picom-git,sddm-theme-aerial-git
 
-apt-any:i3-gaps,feh,i3status,nm-tray,pasystray,xautolock,inotify-tools,xss-lock,fonts-noto-color-emoji,xclip
+apt-base:acpi,curl
+apt-any:i3,feh,i3status,nm-tray,pasystray,xautolock,inotify-tools,xss-lock,fonts-noto-color-emoji,xclip
 apt-any:libxext-dev,libxcb1-dev,libxcb-damage0-dev,libxcb-xfixes0-dev,libxcb-shape0-dev,libxcb-render-util0-dev,libxcb-render0-dev,libxcb-randr0-dev,libxcb-composite0-dev,libxcb-image0-dev,libxcb-present-dev,libxcb-xinerama0-dev,libxcb-glx0-dev,libpixman-1-dev,libdbus-1-dev,libconfig-dev,libgl1-mesa-dev,libpcre2-dev,libpcre3-dev,libevdev-dev,uthash-dev,libev-dev,libx11-xcb-dev,meson
 apt-any:python3,python3-pip
 apt-any:sddm,gstreamer1.0-libav qml-module-qtmultimedia libqt5multimedia5-plugins
 apt-any:codium,vim,ufw,scrot
+apt-any:chromium-browser
 apt-laptop:brightnessctl
 
 apt-any:libxcb-render0-dev,libffi-dev,python3-dev,python3-cffi
diff --git a/setup_system.sh b/setup_system.sh
index 5ac0397..e996174 100755
--- a/setup_system.sh
+++ b/setup_system.sh
@@ -254,11 +254,6 @@ function setup_arch() {
 # Setup for Debian-like systems
 #
 
-function setup_debian_repo_i3gaps() {
-    echo "Setting up repository for i3-gaps."
-    sudo add-apt-repository -y ppa:regolith-linux/release
-}
-
 function setup_debian_repo_vscodium() {
     echo "Setting up repository for VSCodium."
     wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg |
@@ -268,19 +263,21 @@ function setup_debian_repo_vscodium() {
         sudo tee /etc/apt/sources.list.d/vscodium.list
 }
 
-function prepare_debian() {
-    setup_debian_repo_i3gaps || return 1
-    setup_debian_repo_vscodium || return 2
-}
-
 function setup_debian_with_apt() {
-    local targets=("apt-any") packages
-    is_laptop && targets+=("apt-laptop")
+    local targets packages
 
+    targets=("apt-base")
     packages="$(get_packages "${targets[@]}")"
     sudo apt-get update
     # shellcheck disable=SC2086
     sudo apt-get install $packages -y || return 1
+
+    targets=("apt-any")
+    is_laptop && targets+=("apt-laptop")
+    packages="$(get_packages "${targets[@]}")"
+    sudo apt-get update
+    # shellcheck disable=SC2086
+    sudo apt-get install $packages -y || return 2
 }
 
 function setup_debian_with_pip(){
@@ -297,7 +294,7 @@ function setup_debian_with_git() {
 }
 
 function setup_debian() {
-    prepare_debian || return 1
+    setup_debian_repo_vscodium || return 1
     setup_debian_with_apt || return 2
     setup_debian_with_pip || return 3
     setup_debian_with_git || return 4