From 43b63058f7c7884693a3fd1d1aa83cceb4275adc Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Sat, 21 Oct 2023 20:07:56 +0200
Subject: [PATCH] use pcmanfm as desktop (consumes ~+20MB RAM but gets more
 comfort)

---
 install_base/install_base.sh                  | 14 +---------
 makeanything.sh                               | 14 ++++++++++
 nanodesk-files/etc/jwm/system.jwmrc           |  1 +
 .../pcmanfm/default/desktop-items-0.conf      | 13 ++++++++++
 .../skel/.config/pcmanfm/default/pcmanfm.conf | 26 +++++++++++++++++++
 nanodesk-files/etc/skel/.gtkrc-2.0            |  1 +
 6 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 nanodesk-files/etc/skel/.config/pcmanfm/default/desktop-items-0.conf
 create mode 100644 nanodesk-files/etc/skel/.config/pcmanfm/default/pcmanfm.conf
 create mode 100644 nanodesk-files/etc/skel/.gtkrc-2.0

diff --git a/install_base/install_base.sh b/install_base/install_base.sh
index 5a81d13..9a2390a 100644
--- a/install_base/install_base.sh
+++ b/install_base/install_base.sh
@@ -134,18 +134,6 @@ apt install -y \
 #apt install -t bullseye-backports -y linux-image-amd64
 
 
-### set root password
-message "set root password to 'debian'"
-echo -e "debian\ndebian" | (passwd root)
-
-### add debian user
-message "create user debian"
-useradd -m -U -s /bin/bash debian
-
-### set password
-message "set password for user debian to 'debian'"
-echo -e "debian\ndebian" | (passwd debian)
-
 ### Configure timezone and locale
 #dpkg-reconfigure locales
 #dpkg-reconfigure console-data
@@ -169,7 +157,7 @@ echo "Europe/Berlin" > /etc/timezone && \
 ####  
 ######
 
-message "run custom steps from /tmp/install_base.customsteps.tpl.sh"
+message "run custom steps from /tmp/install_base.customsteps.sh"
 . /tmp/install_base.customsteps.sh
 
 ######
diff --git a/makeanything.sh b/makeanything.sh
index f313639..aaa5913 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -126,6 +126,20 @@ message "correct file permissions"
 $CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error
 $CHROOTCMD /usr/bin/chmod 755 /root/nanodesk-installer.sh || error
 
+
+### set root password
+message "set root password to 'debian'"
+$CHROOTCMD 'echo -e "debian\ndebian" | (passwd root)'
+
+### add debian user
+message "create user debian"
+$CHROOTCMD useradd -m -U -s /bin/bash -k /etc/skel debian
+
+### set password
+message "set password for user debian to 'debian'"
+$CHROOTCMD 'echo -e "debian\ndebian" | (passwd debian)'
+
+
 message "clear /tmp"
 $CHROOTCMD /usr/bin/rm -Rf /tmp/* || error
 
diff --git a/nanodesk-files/etc/jwm/system.jwmrc b/nanodesk-files/etc/jwm/system.jwmrc
index 06c152f..93b231d 100644
--- a/nanodesk-files/etc/jwm/system.jwmrc
+++ b/nanodesk-files/etc/jwm/system.jwmrc
@@ -194,6 +194,7 @@
     <Key mask="A" key="Down">ddesktop</Key>
 
     <StartupCommand>$(find ~/.screenlayout/ -type f -executable|head -n 1)</StartupCommand>
+    <StartupCommand>pcmanfm --desktop</StartupCommand>
     <StartupCommand>xscreensaver -no-splash</StartupCommand>
     <StartupCommand>volumeicon</StartupCommand>
     <StartupCommand>connman-gtk</StartupCommand>
diff --git a/nanodesk-files/etc/skel/.config/pcmanfm/default/desktop-items-0.conf b/nanodesk-files/etc/skel/.config/pcmanfm/default/desktop-items-0.conf
new file mode 100644
index 0000000..9d8098b
--- /dev/null
+++ b/nanodesk-files/etc/skel/.config/pcmanfm/default/desktop-items-0.conf
@@ -0,0 +1,13 @@
+[*]
+wallpaper_mode=center
+wallpaper_common=1
+wallpaper=/usr/share/nanodesk/pixmaps/nanodesk-installed.xpm
+desktop_bg=#666999
+desktop_fg=#ffffff
+desktop_shadow=#000000
+desktop_font=Sans 12
+show_wm_menu=0
+sort=mtime;ascending;
+show_documents=0
+show_trash=1
+show_mounts=1
diff --git a/nanodesk-files/etc/skel/.config/pcmanfm/default/pcmanfm.conf b/nanodesk-files/etc/skel/.config/pcmanfm/default/pcmanfm.conf
new file mode 100644
index 0000000..a055c9f
--- /dev/null
+++ b/nanodesk-files/etc/skel/.config/pcmanfm/default/pcmanfm.conf
@@ -0,0 +1,26 @@
+[config]
+bm_open_method=0
+
+[volume]
+mount_on_startup=1
+mount_removable=1
+autorun=1
+
+[ui]
+always_show_tabs=0
+max_tab_chars=32
+win_width=640
+win_height=480
+splitter_pos=150
+media_in_new_tab=0
+desktop_folder_new_win=0
+change_tab_on_drop=1
+close_on_unmount=1
+focus_previous=0
+side_pane_mode=places
+view_mode=icon
+show_hidden=0
+sort=name;ascending;
+toolbar=newtab;navigation;home;
+show_statusbar=1
+pathbar_mode_buttons=0
diff --git a/nanodesk-files/etc/skel/.gtkrc-2.0 b/nanodesk-files/etc/skel/.gtkrc-2.0
new file mode 100644
index 0000000..64e0f49
--- /dev/null
+++ b/nanodesk-files/etc/skel/.gtkrc-2.0
@@ -0,0 +1 @@
+gtk-theme-name="Adwaita"