From e2e0b7efb4fb4ba481d0d46b817fce775965de85 Mon Sep 17 00:00:00 2001
From: meliurwen <meliurwen@gmail.com>
Date: Thu, 11 Aug 2022 14:06:32 +0200
Subject: [PATCH] Updated dotfiles installation and replaced apt install with a
 more soft dependencies check

---
 install-chroot.sh        | 10 ++++++----
 root/srv/get_dotfiles.sh |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/install-chroot.sh b/install-chroot.sh
index 53ebbcd..14a0604 100755
--- a/install-chroot.sh
+++ b/install-chroot.sh
@@ -2,7 +2,9 @@
 
 set -e
 
-apt install \
+printf "Checking dependencies...\n"
+dpkg-query -W \
+    git \
     debootstrap \
     squashfs-tools \
     xorriso \
@@ -33,9 +35,9 @@ chroot /srv/LIVE_BOOT/chroot /srv/entrypoint.sh
 rm -rf /srv/LIVE_BOOT/chroot/srv/*
 
 # Change password to the users
-echo "Setting passwords for users..."
-echo "root:root" | chpasswd --root /srv/LIVE_BOOT/chroot
-echo "live-user:root" | chpasswd --root /srv/LIVE_BOOT/chroot
+printf "Setting passwords for users...\n"
+printf "root:root\n" | chpasswd --root /srv/LIVE_BOOT/chroot
+printf "live-user:root\n" | chpasswd --root /srv/LIVE_BOOT/chroot
 
 # Create directories that will contain files for our live environment files and scratch files.
 bash -c "mkdir -p /srv/LIVE_BOOT/{staging/{EFI/boot,boot/grub/x86_64-efi,isolinux,live},tmp}"
diff --git a/root/srv/get_dotfiles.sh b/root/srv/get_dotfiles.sh
index 852126f..4e51d32 100755
--- a/root/srv/get_dotfiles.sh
+++ b/root/srv/get_dotfiles.sh
@@ -16,8 +16,11 @@ git clone https://gitlab.com/meliurwen/dotfiles.git .dotfiles
 
 cd .dotfiles
 
+# TODO: use dotvenv
 cat ".mousepad/mousepad.dconf" | dbus-run-session dconf load "/org/xfce/mousepad/"
 cat ".nemo/nemo.dconf" | dbus-run-session dconf load "/org/nemo/"
+cat ".gnome/gnome.dconf" | dbus-run-session dconf load "/org/gnome/desktop/interface/"
+cat ".cinnamon/cinnamon.dconf" | dbus-run-session dconf load "/org/cinnamon/desktop/applications/terminal/"
 
 stow --restow --no-folding */