Merge branch 'wireguard-tools' of github.com:Etn40ff/toltec into wire…

…guard-tools

docs/package.md

@@ -328,6 +328,7 @@ math            | Apps to assist the user in performing mathematical tasks.
 readers         | Apps for reading and annotating documents (PDF, EPUB, …).
 screensharing   | Apps for streaming the display between the PC and tablet.
 templates       | Templates for xochitl notebooks.
+splashscreens   | Splashscreens for device startup, poweroff, suspend, etc.
 utils           | System tools and various apps.
 
 If the package does not fit into one of the existing sections, you are free to create a new one and document it here.

package/rmscreens/package → package/changescrn/package

@@ -5,7 +5,7 @@
 pkgnames=(changescrn)
 pkgdesc="Change sleep/suspend/poweroff/reboot screens"
 url=https://github.com/pr0fsmith/rMscreens/
-pkgver=1.0.0-1
+pkgver=1.0.0-2
 timestamp=2022-03-15T01:28:33Z
 section="utils"
 maintainer="pr0fsmith <[email protected]>"
@@ -17,3 +17,13 @@ sha256sums=(3c2e8b0952d848d7326c0a4ce45da625dd7fd0fbc6b564a2d40c3b97015138e3)
 package() {
     install -Dm755 "$srcdir"/changescrn "$pkgdir/opt/bin/changescrn"
 }
+
+configure() {
+    if [ ! -d /opt/usr/share/backupscrns ] || [ -z "$(ls -A /opt/usr/share/backupscrns)" ]; then
+        changescrn -b
+    fi
+}
+
+preremove() {
+    changescrn -r all
+}

package/oxide/package

@@ -4,7 +4,7 @@
 
 pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry)
 _oxidever=2.6
-pkgver=$_oxidever-1
+pkgver=$_oxidever-2
 _sentryver=0.5.0
 timestamp=2023-06-05T23:27:53Z
 maintainer="Eeems <[email protected]>"
@@ -179,6 +179,7 @@ oxide-utils() {
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-settings
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio
     }
 }

package/reboot-guard/package

@@ -5,7 +5,7 @@
 pkgnames=(reboot-guard)
 pkgdesc="Block systemd-initiated poweroff/reboot/halt until configurable condition checks pass"
 url=https://github.com/stephanritscher/reboot-guard
-pkgver=1.0.1-6
+pkgver=1.0.1-7
 timestamp=2020-05-04T06:16Z
 section="devel"
 maintainer="Eeems <[email protected]>"
@@ -34,8 +34,13 @@ configure() {
 }
 
 preremove() {
-    if systemctl list-units --full -all | grep -Fq 'rguard.service'; then
-        systemctl disable --now rguard
+    if is-active rguard.service; then
+        echo "Stopping rguard.service"
+        systemctl stop rguard.service
+    fi
+    if is-enabled rguard.service; then
+        echo "Disabling rguard.service"
+        systemctl disable rguard.service
     fi
 }
 

package/remarkable_templates/package

@@ -0,0 +1,142 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(
+    template-daily-planner
+    template-weekly-planner
+    template-journal
+    template-meeting-notes
+    template-smart-goals
+    template-good-time-journal
+)
+url=https://github.com/msencer/remarkable_templates
+pkgver=0.0.0-1
+timestamp=2023-07-27T12:28:59Z
+section="templates"
+maintainer="Eeems <[email protected]>"
+license=MIT
+installdepends=(templatectl)
+
+source=("https://github.com/msencer/remarkable_templates/archive/03282d34b905e7e6431132b022b5a9cb3af116a2.zip")
+sha256sums=(7a39d53767963f59c8d5b8a7ebda411b60d1256fe1077a3864cc43cd59281e03)
+
+template-daily-planner() {
+    pkgdesc="Daily Planner template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/daily_planner.png
+    }
+    configure() {
+        templatectl add \
+            --name "Daily Planner" \
+            --filename "daily_planner" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e9da"
+    }
+    preremove() {
+        templatectl remove --name "Daily Planner"
+    }
+}
+
+template-weekly-planner() {
+    pkgdesc="Weekly Planner template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/weekly_planner.png
+    }
+    configure() {
+        templatectl add \
+            --name "Weekly Planner" \
+            --filename "weekly_planner" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e997"
+    }
+    preremove() {
+        templatectl remove --name "Weekly Planner"
+    }
+}
+
+template-journal() {
+    pkgdesc="Journal template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/journal.png
+    }
+    configure() {
+        templatectl add \
+            --name "Journal" \
+            --filename "journal" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e991"
+    }
+    preremove() {
+        templatectl remove --name "Journal"
+    }
+}
+
+template-meeting-notes() {
+    pkgdesc="Meeting Notes template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/meeting_notes.png
+    }
+    configure() {
+        templatectl add \
+            --name "1:1 / Meeting Notes" \
+            --filename "meeting_notes" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e9d8"
+    }
+    preremove() {
+        templatectl remove --name "1:1 / Meeting Notes"
+    }
+}
+
+template-smart-goals() {
+    pkgdesc="Smart Goals template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/goals.png
+    }
+    configure() {
+        templatectl add \
+            --name "Smart Goals" \
+            --filename "goals" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e98f"
+    }
+    preremove() {
+        templatectl remove --name "Smart Goals"
+    }
+}
+
+template-good-time-journal() {
+    pkgdesc="Smart Goals template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/gt_journal.png
+    }
+    configure() {
+        templatectl add \
+            --name "Good Time Journal" \
+            --filename "gt_journal" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e9b2"
+    }
+    preremove() {
+        templatectl remove --name "Good Time Journal"
+    }
+}

package/rmfm/package

@@ -5,25 +5,24 @@
 pkgnames=(rmfm)
 pkgdesc="Bare-bones file manager using Node.js and sas"
 url="https://forgejo.sny.sh/sun/rmFM"
-pkgver=1.4.0-3
-timestamp=2022-08-19T11:20:10+02:00
+pkgver=1.5.0-1
+timestamp=2023-08-08T22:19:23+02:00
 section=utils
-maintainer="Sunny <[email protected]>"
-license=MIT
+maintainer="Sunny <[email protected]>"
+license=Unlicense
 installdepends=(node simple)
 
 source=(
-    https://forgejo.sny.sh/sun/rmFM/archive/1.4.0.zip
+    https://forgejo.sny.sh/sun/rmFM/archive/1.5.0.zip
     path_fix.patch
 )
 sha256sums=(
-    28ce80c67fecc370d11f3fe2069742c2789b388a9426fff49d269d7900ae3dc9
+    515cc1843bf61f628c3a0b2b2dcb3256a0182352c6b491585fd52cf96a554b26
     SKIP
 )
 
 prepare() {
-    # Assume node to be in /opt/bin and add that directory
-    # to the path of the app to allow finding simple
+    # Assume node to be in /opt/bin
     # This is a temporary fix for not working in remux
     patch -d "$srcdir" < "$srcdir"/path_fix.patch
 }

package/rmfm/path_fix.patch

@@ -1,9 +1,7 @@
 diff --git a/rmfm b/rmfm
-index 4571db9..172eedf 100755
+index 63eeb98..b28dbd0 100755
 --- a/rmfm
 +++ b/rmfm
-@@ -1,2 +1,3 @@
+@@ -1 +1 @@
 -#!/usr/bin/env node
 +#!/opt/bin/node
-+process.env.PATH += ":/opt/bin"
-

package/splashcreens-wavy-lines/package

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(
+    splashscreen-starting-wavey-lines
+    splashscreen-suspended-wavey-lines
+)
+url=https://github.com/EnglishLFC/reMarkable
+pkgver=0.0.0-1
+timestamp=2021-03-19T18:46:40Z
+section="splashscreens"
+maintainer="Eeems <[email protected]>"
+license=BSD-2-Clause
+installdepends=(changescrn)
+
+source=("https://github.com/EnglishLFC/reMarkable/archive/a06b10ea9f28c784e6941085a30944c0489450f4.zip")
+sha256sums=(ec5f0321342bf6b48bb1431f4b1cf4416c37681879b3ec6c9375f889077a0b7f)
+
+splashscreen-starting-wavey-lines() {
+    pkgdesc="Barnsley Fern battery empty splashscreen"
+    replaces=("splashscreen-starting")
+    conflicts=("splashscreen-starting")
+    package() {
+        install -D -m 755 -T "$srcdir"/splash/splash.png \
+            "$pkgdir"/opt/share/remarkable/splashscreens/starting.png
+    }
+    configure() {
+        changescrn -c starting /opt/share/remarkable/splashscreens/starting.png
+    }
+    postremove() {
+        changescrn -r starting
+    }
+}
+
+splashscreen-suspended-wavey-lines() {
+    pkgdesc="Barnsley Fern power off splashscreen"
+    replaces=("splashscreen-suspended")
+    conflicts=("splashscreen-suspended")
+    package() {
+        install -D -m 755 -t "$pkgdir"/opt/share/remarkable/splashscreens \
+            "$srcdir"/splash/suspended.png
+    }
+    configure() {
+        changescrn -c suspended /opt/share/remarkable/splashscreens/suspended.png
+    }
+    postremove() {
+        changescrn -r suspended
+    }
+}