Merge branch 'axtloss/misc-changes' into 'main'

Enable bluetooth & cups, preinstall xdg-user-dirs

See merge request crystal/software/jade!2

src/functions/base.rs

@@ -67,6 +67,22 @@ pub fn install_base_packages(kernel: String) {
         "ttf-liberation",
     ]);
     files::copy_file("/etc/pacman.conf", "/mnt/etc/pacman.conf");
+
+    exec_eval(
+        exec_chroot(
+            "systemctl",
+            vec![String::from("enable"), String::from("bluetooth")],
+        ),
+        "Enable bluetooth",
+    );
+
+    exec_eval(
+        exec_chroot(
+            "systemctl",
+            vec![String::from("enable"), String::from("cups")],
+        ),
+        "Enable CUPS",
+    );
 }
 
 pub fn genfstab() {

src/functions/desktops.rs

@@ -44,6 +44,7 @@ fn install_bspwm() {
         "lightdm",
         "lightdm-gtk-greeter",
         "lightdm-gtk-greeter-settings",
+        "xdg-user-dirs",
     ]);
     files_eval(
         files::append_file(
@@ -65,6 +66,7 @@ fn install_awesome() {
         "lightdm",
         "lightdm-gtk-greeter",
         "lightdm-gtk-greeter-settings",
+        "xdg-user-dirs",
     ]);
     files_eval(
         files::append_file(
@@ -86,6 +88,7 @@ fn install_herbstluftwm() {
         "lightdm",
         "lightdm-gtk-greeter",
         "lightdm-gtk-greeter-settings",
+        "xdg-user-dirs",
     ]);
     files_eval(
         files::append_file(
@@ -108,6 +111,8 @@ fn install_i3() {
         "lightdm",
         "lightdm-gtk-greeter",
         "lightdm-gtk-greeter-settings",
+        "xdg-user-dirs",
+        "dex",
     ]);
     files_eval(
         files::append_file(
@@ -116,6 +121,10 @@ fn install_i3() {
         ),
         "Add lightdm greeter",
     );
+    files_eval(
+        files::append_file("/mnt/etc/i3/config", "exec_always --no-startup-id dex -a\n"),
+        "Add dex to i3 config for autostart",
+    );
     enable_dm("lightdm");
 }
 
@@ -134,7 +143,16 @@ fn install_sway() {
         "pipewire-jack",
         "wireplumber",
         "sddm",
+        "xdg-user-dirs",
+        "dex",
     ]);
+    files_eval(
+        files::append_file(
+            "/mnt/etc/sway/config",
+            "exec_always --no-startup-id dex -a\n",
+        ),
+        "Add dex to sway config for autostart",
+    );
     enable_dm("sddm");
 }