ff

.gitignore

@@ -4,4 +4,8 @@
 /configurator/test_schemas
 /configurator/test_configs
 /configurator/tests
-/.vscode
+/.vscode
+/vendor
+/flatpak-builder-tools
+/.flatpak-builder
+/cargo-sources.json

.prettierignore

@@ -0,0 +1 @@
+res/config_schema.json

README.md

@@ -38,7 +38,7 @@ zconf\* are just alternative to [cosmic-config](https://github.com/pop-os/libcos
 
 As you see, this is quite a lot of works, so if anyone is interested, please reach out
 
-![](./configurator/res/screenshots/cosmic-panel-compat.png)
+![](./res/screenshots/cosmic-panel-compat.png)
 _All the cosmic panel config_ modifiable in the app.
 
 ## Credits

io.github.wiiznokes.cosmic-ext-applet-clipboard-manager.json → io.github.cosmic-utils.configurator.json

@@ -1,5 +1,5 @@
 {
-  "app-id": "io.github.wiiznokes.cosmic-ext-applet-clipboard-manager",
+  "app-id": "io.github.cosmic-utils.configurator",
   "runtime": "org.freedesktop.Platform",
   "runtime-version": "24.08",
   "sdk": "org.freedesktop.Sdk",
@@ -8,7 +8,7 @@
   "finish-args": ["--share=ipc", "--socket=fallback-x11", "--socket=wayland"],
   "modules": [
     {
-      "name": "cosmic-ext-applet-clipboard-manager",
+      "name": "configurator",
       "buildsystem": "simple",
       "build-options": {
         "env": {

justfile

@@ -4,7 +4,7 @@ debug := '0'
 
 
 name := 'configurator'
-appid := 'io.github.wiiznokes.' + name 
+appid := 'io.github.cosmic-utils.' + name 
 
 cargo-target-dir := env('CARGO_TARGET_DIR', 'target')
 bin-src := cargo-target-dir / if debug == '1' { 'debug' / name } else { 'release' / name }
@@ -34,7 +34,7 @@ install:
   install -Dm0755 {{bin-src}} {{bin-dst}}
   install -Dm0644 res/desktop_entry.desktop {{desktop-dst}}
   install -Dm0644 res/app_icon.svg {{icon-dst}}
-  install -Dm0644 configurator/res/config_schema.json {{schema-dst}}
+  install -Dm0644 res/config_schema.json {{schema-dst}}
 
 
 # call before pull request
@@ -80,4 +80,42 @@ prettier:
 
 # todo: add to CI when ubuntu-image get appstream version 1.0
 metainfo-check:
-	appstreamcli validate --pedantic --explain --strict res/linux/metainfo.xml
+	appstreamcli validate --pedantic --explain --strict res/metainfo.xml
+
+
+# flatpak
+
+setupf:
+  rm -rf flatpak-builder-tools
+  git clone https://github.com/flatpak/flatpak-builder-tools
+  pip install aiohttp toml
+
+
+sources_gen:
+  python3 flatpak-builder-tools/cargo/flatpak-cargo-generator.py ./Cargo.lock -o cargo-sources.json
+
+install_sdk:
+  flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
+  flatpak install --noninteractive --user flathub \
+    org.freedesktop.Platform//23.08 \
+    org.freedesktop.Sdk//23.08 \
+    org.freedesktop.Sdk.Extension.rust-stable//23.08 \
+    org.freedesktop.Sdk.Extension.llvm17//23.08
+
+uninstallf:
+  flatpak uninstall io.github.wiiznokes.cosmic-ext-applet-clipboard-manager -y || true
+
+# deps: flatpak-builder git-lfs
+build_and_install: uninstallf
+  flatpak-builder \
+    --force-clean \
+    --verbose \
+    --ccache \
+    --user --install \
+    --install-deps-from=flathub \
+    --repo=repo \
+    flatpak-out \
+    io.github.wiiznokes.cosmic-ext-applet-clipboard-manager.json
+
+runf:
+  flatpak run io.github.wiiznokes.cosmic-ext-applet-clipboard-manager

res/desktop_entry.desktop

@@ -7,6 +7,6 @@ Keywords=dconf
 Type=Application
 Categories=System;Utility;
 Exec=configurator
-Icon=io.github.wiiznokes.configurator
-StartupWMClass=io.github.wiiznokes.configurator
+Icon=io.github.cosmic-utils.configurator
+StartupWMClass=io.github.cosmic-utils.configurator
 Terminal=false

res/metainfo.xml

@@ -16,61 +16,37 @@
   </developer>
 
   <icon type="remote" height="256" width="256">
-    https://raw.githubusercontent.com/wiiznokes/fan-control/master/res/app_icon.svg</icon>
+    https://raw.githubusercontent.com/cosmic-utils/configurator/master/res/app_icon.svg</icon>
 
-  <url type="homepage">https://github.com/wiiznokes/fan-control</url>
-  <url type="bugtracker">https://github.com/wiiznokes/fan-control/issues</url>
-  <url type="donation">https://www.paypal.com/donate/?hosted_button_id=HV84HZ4G63HQ6</url>
-  <url type="vcs-browser">https://github.com/wiiznokes/fan-control</url>
+  <url type="homepage">https://github.com/cosmic-utils/configurator</url>
+  <url type="bugtracker">https://github.com/cosmic-utils/configurator/issues</url>
+  <url type="vcs-browser">https://github.com/cosmic-utils/configurator</url>
 
   <content_rating type="oars-1.1" />
 
   <description>
-    <p>You can add items with the buttons on the right of the app.
-      To save a configuration, write a name in the "Configuration name" field, and click on the +.
-      To modify the value of a fan, you must select it in a Control item (the left column), select a
-      Behavior, and activate the swtich.
+    <p>TODO
     </p>
-    <p xml:lang="de">Du kannst mit den Schaltflächen auf der rechten Seite der App Elemente
-      hinzufügen.
-      Um eine Konfiguration zu speichern, schreibst du einen Namen in das Feld „Konfigurationsname“
-      und klickst auf das +.
-      Um den Wert eines Lüfters zu ändern, musst du ihn in einem Steuerelement (in der linken
-      Spalte) auswählen,
-      ein Verhalten wählen und den Regler aktivieren.
-    </p>
-    <ul>
-      <li>Display sensors data on real time</li>
-      <li xml:lang="de">Anzeige von Sensordaten in Echtzeit</li>
-      <li>Control fans based on custom behaviors</li>
-      <li xml:lang="de">Steuerung von Lüftern basierend auf benutzerdefinierten Verhaltensweisen</li>
-      <li>Save configuration</li>
-      <li xml:lang="de">Konfiguration speichern</li>
-    </ul>
-    <p>Note: After installation, you will need to add the necessary udev rule to your system for
-      this to work. See the GitHub page for more details.</p>
-    <p xml:lang="de">Hinweis: Nach der Installation musst du die notwendige udev-Regel zu deinem
-      System hinzufügen, damit dies funktioniert. Auf der GitHub-Seite findest du weitere Details.</p>
   </description>
 
-  <launchable type="desktop-id">io.github.wiiznokes.fan-control.desktop</launchable>
+  <launchable type="desktop-id">io.github.cosmic-utils.configurator.desktop</launchable>
   <screenshots>
     <screenshot type="default">
-      <caption>fan-control screenshot</caption>
+      <caption>configurator screenshot</caption>
       <image>
-        https://media.githubusercontent.com/media/wiiznokes/fan-control/master/res/screenshots/app.png</image>
+        https://media.githubusercontent.com/media/cosmic-utils/configurator/master/res/screenshots/app.png</image>
     </screenshot>
   </screenshots>
 
   <provides>
     <id>com.system76.CosmicApplication</id>
-    <binary>fan-control</binary>
+    <binary>configurator</binary>
   </provides>
 
   <releases>
     <release version="24.8.23" date="2024-08-23">
       <url type="details">
-        https://github.com/wiiznokes/fan-control/blob/master/CHANGELOG.md</url>
+        https://github.com/cosmic-utils/configurator/blob/master/CHANGELOG.md</url>
     </release>
   </releases>