From d7882be50b54fbeb7606f3a28fb51f21687da283 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Wed, 3 May 2023 12:39:32 +0200
Subject: [PATCH] customized jwm config, add gsimplecal as calendar, add xdg
 config for it

---
 rootdir/etc/jwm/system.jwmrc      | 19 ++++++++-----------
 rootdir/etc/xdg/gsimplecal/config |  1 +
 templates/install_base.tpl.sh     |  2 ++
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 rootdir/etc/xdg/gsimplecal/config

diff --git a/rootdir/etc/jwm/system.jwmrc b/rootdir/etc/jwm/system.jwmrc
index da753a8..992f6ac 100644
--- a/rootdir/etc/jwm/system.jwmrc
+++ b/rootdir/etc/jwm/system.jwmrc
@@ -8,20 +8,17 @@
 	<Separator/>
 	<Program icon="/usr/share/icons/Adwaita/scalable/apps/preferences-system-network-symbolic.svg" label="Network settings">connman-gtk</TrayButton>
 	<Program icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg" label="Display settings">arandr</TrayButton>
-        <Separator/>
-        <Program icon="lock.png" label="Lock">
+	<Separator/>
+	<Restart label="Restart JWM" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg"/>
+	<Program icon="/usr/share/icons/Adwaita/scalable/status/changes-prevent-symbolic.svg" label="Lock screen">
             xscreensaver-command -lock
         </Program>
+	<Exit label="Logout" confirm="true" icon="/usr/share/icons/Adwaita/scalable/actions/system-log-out-symbolic.svg"/>
 	<Separator/>
-        <Restart label="Restart JWM" icon="restart.png"/>
-	<Exit label="Logout" confirm="true" icon="quit.png"/>
-	<Separator/>
-	<Separator/>
-	<Separator/>
-	<Program label="Reboot" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg">
+	<Program label="Reboot" icon="/usr/share/icons/Adwaita/scalable/actions/system-reboot-symbolic.svg">
 	   gxmessage "Reboot?" -title "Reboot?" -center -buttons Yes:0,No:1 -default No -font "bold 14"  && systemctl reboot
 	</Program>
-	<Program label="Shutdown" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-system-symbolic.svg">
+	<Program label="Shutdown" icon="/usr/share/icons/Adwaita/scalable/actions/system-shutdown-symbolic.svg">
 	   gxmessage "Shutdown?" -title "Shutdown?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl poweroff
 	</Program>
 
@@ -68,7 +65,7 @@
         <TaskList maxwidth="256"/>
 
         <Dock/>
-        <Clock format="%H:%M"><Button mask="123">exec:xclock</Button></Clock>
+        <Clock format="%H:%M"><Button mask="123">exec:gsimplecal</Button></Clock>
 
     </Tray>
 
@@ -233,7 +230,7 @@
     <Key mask="A" key="F4">close</Key>
     <Key mask="A" key="#">desktop#</Key>
     <Key mask="A" key="F1">root:1</Key>
-    <Key mask="A" key="F2">window</Key>
+    <Key mask="A" key="space">window</Key>
     <Key mask="A" key="F10">maximize</Key>
     <Key mask="A" key="Right">rdesktop</Key>
     <Key mask="A" key="Left">ldesktop</Key>
diff --git a/rootdir/etc/xdg/gsimplecal/config b/rootdir/etc/xdg/gsimplecal/config
new file mode 100644
index 0000000..ad5eb3d
--- /dev/null
+++ b/rootdir/etc/xdg/gsimplecal/config
@@ -0,0 +1 @@
+mainwindow_yoffset = 24
diff --git a/templates/install_base.tpl.sh b/templates/install_base.tpl.sh
index 40a1fa3..8036438 100644
--- a/templates/install_base.tpl.sh
+++ b/templates/install_base.tpl.sh
@@ -70,6 +70,7 @@ apt install -y  \
 	xscreensaver \
 	xfonts-75dpi \
 	xfonts-100dpi \
+	x11-apps \
 	xterm \
 	xdm \
 	jwm \
@@ -85,6 +86,7 @@ apt install -y  \
 	htop \
 	git \
 	gxmessage \
+	gsimplecal \
 	arandr \
 	lxterminal \
 	gparted \