Feature 57 (config and provisioning): modules declare config and provisions, their files rendered from templates; synced with main (issues of feature 57, 874)

modules/feh/module.json

@@ -1,6 +1,7 @@
 {
   "module": "feh",
   "version": "1",
+  "moved": true,
   "capabilities": [
     "package-manager"
   ],
@@ -11,11 +12,16 @@
     "feh_set",
     "feh_current"
   ],
-  "shell": [
+  "items": [
     {
-      "for": "xinitrc",
-      "slot": "normal",
-      "code": "# The wallpaper (module feh, novox/hq ADR 0208): the declared one, set once per session.\n\"$HOME/.fehbg\"\n"
+      "collection": "shell:xinitrc:normal",
+      "name": "xinitrc-normal",
+      "template": "files/xinitrc-normal"
+    },
+    {
+      "collection": "contribution:node-display-session:config",
+      "name": "display-session",
+      "template": "files/i3/50-feh.conf"
     }
   ],
   "resources": [
@@ -37,7 +43,7 @@
       "path": "${machine:account-home}/.fehbg",
       "owner": "${machine:account}",
       "mode": "0755",
-      "content": "#!/bin/sh\n# The wallpaper (module feh, novox/hq ADR 0208). Owned by the mesh: replaced at every push. The\n# session's start runs it, and so may anything that wants the declared wallpaper back. The image is\n# the module's own, in ~/.local/share/feh/wallpapers. feh_set changes the wallpaper for a session\n# without touching this file.\nfeh --no-fehbg --bg-fill \"$HOME/.local/share/feh/wallpapers/default.jpg\"\n"
+      "template": "files/fehbg"
     }
   ],
   "build": {
@@ -57,14 +63,12 @@
         "loads": [
           "feh-tools"
         ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
-  },
-  "contributions": [
-    {
-      "seat": "node-display-session",
-      "kind": "config",
-      "content": "# The wallpaper's key (module feh, novox/hq ADR 0208). Owned by the mesh: replaced at every push.\n# It puts the declared wallpaper back, after a monitor change or a wallpaper set for the session.\nbindsym $mod+Shift+b exec --no-startup-id ~/.fehbg\n"
-    }
-  ]
+  }
 }