Fetched template changes (#44)

.copier-answers.yaml

@@ -1,6 +1,5 @@
----
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.4.1
+_commit: 0.5.0
 _src_path: gh:radio-aktywne/template-app-generic
 accountname: radio-aktywne
 appname: fusion

.dockerignore

@@ -1,5 +1,5 @@
 #Task
-/.task
+/.task/
 /Taskfile.yaml
 /Taskfile.yml
 
@@ -8,19 +8,19 @@
 .todo
 
 # Tracked, but not needed
-.devcontainer
-.github
-.trunk
-.vscode
-docs
-.copier-answers.yaml
-.dockerignore
-.envrc
-.gitattributes
-.gitignore
-CONTRIBUTING.md
-docker-compose.yaml
-Dockerfile
-LICENSE
-README.md
-Taskfile.dist.yaml
+/.devcontainer/
+/.github/
+/.trunk/
+/.vscode/
+/docs/
+/.copier-answers.yaml
+/.dockerignore
+/.envrc
+/.gitattributes
+/.gitignore
+/CONTRIBUTING.md
+/docker-compose.yaml
+/Dockerfile
+/LICENSE
+/README.md
+/Taskfile.dist.yaml

.envrc

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # reload when these files change
-watch_file ./flake.lock ./*.nix
+watch_file flake.lock ./*.nix
 
 # activate the default development shell in the current shell
 # --accept-flake-config will accept the nix configuration from the flake without prompting
-eval "$(nix print-dev-env path:. --accept-flake-config)" || true
+eval "$(nix print-dev-env path:./ --accept-flake-config)" || true

.gitattributes

@@ -1,6 +1,6 @@
 # Mark everything as vendored
 * linguist-vendored
 # Treat docs as documentation
-docs/** -linguist-vendored linguist-documentation
+/docs/** -linguist-vendored linguist-documentation
 # Unmark files in src, so that they are included in language stats
-src/** -linguist-vendored
+/src/** -linguist-vendored

.github/release.yaml

@@ -1,4 +1,3 @@
----
 changelog:
   exclude:
     # Exclude PRs with the following labels from the changelog

.github/workflows/docs.yaml

@@ -1,4 +1,3 @@
----
 name: Docs
 
 # Only one workflow can run at a time
@@ -17,11 +16,11 @@ concurrency:
       - main
     # Run only on changes to relevant files
     paths:
-      - ".github/workflows/docs.yaml"
-      - "docs/**"
-      - "flake.lock"
+      - .github/workflows/docs.yaml
+      - docs/**
+      - flake.lock
       - "*.nix"
-      - "Taskfile.dist.yaml"
+      - Taskfile.dist.yaml
 
 jobs:
   build:
@@ -31,15 +30,15 @@ jobs:
     # Use reasonable timeout to avoid stuck workflows
     timeout-minutes: 10
     env:
-      NIX_CACHE_DIR: /home/runner/.nixcache
+      NIX_CACHE_DIR: /home/runner/.nixcache/
     permissions:
       # Needed to checkout code
       contents: read
       # Needed to upload page artifact
       pages: write
     steps:
       - name: Checkout code
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: Setup Nix cache
         uses: actions/[email protected]
         id: cache-nix
@@ -49,13 +48,13 @@ jobs:
       - name: Setup docs modules cache
         uses: actions/[email protected]
         with:
-          path: docs/node_modules
+          path: docs/node_modules/
           key: docs-modules
       - name: Install Nix
-        uses: cachix/install-nix-action@v22
+        uses: cachix/install-nix-action@v23
         with:
           github_access_token: ${{ github.token }}
-          install_url: https://releases.nixos.org/nix/nix-2.18.0/install
+          install_url: https://releases.nixos.org/nix/nix-2.18.1/install
       # See: https://github.com/cachix/install-nix-action/issues/56
       - name: Import Nix store cache
         if: steps.cache-nix.outputs.cache-hit == 'true'
@@ -67,21 +66,21 @@ jobs:
         run: >
           nix
           develop
-          .#docs
+          ./#docs
           --command
           --
           task
           docs
           --
           build
           --out-dir
-          build
+          build/
       - name: Setup Pages
         uses: actions/[email protected]
       - name: Upload artifact
         uses: actions/[email protected]
         with:
-          path: docs/build
+          path: docs/build/
       # See: https://github.com/cachix/install-nix-action/issues/56
       - name: Export Nix store cache
         if: "!cancelled()"
@@ -91,7 +90,7 @@ jobs:
           ${{ env.NIX_CACHE_DIR }}
           &&
           nix-store
-          --export $(find /nix/store -maxdepth 1 -name '*-*')
+          --export $(find /nix/store/ -maxdepth 1 -name '*-*')
           > ${{ env.NIX_CACHE_DIR }}/archive.nar
   deploy:
     name: Deploy docs

.github/workflows/image.yaml

@@ -1,4 +1,3 @@
----
 name: Image
 
 # Put 'on' in quotes to avoid YAML parsing error
@@ -11,25 +10,25 @@ name: Image
       - main
     # Run only on changes to relevant files
     paths:
-      - ".github/workflows/image.yaml"
-      - "scripts/**"
-      - "src/**"
-      - ".dockerignore"
-      - "Dockerfile"
-      - "flake.lock"
+      - .github/workflows/image.yaml
+      - scripts/**
+      - src/**
+      - .dockerignore
+      - Dockerfile
+      - flake.lock
       - "*.nix"
   # Run also on pull requests to main branch
   pull_request:
     branches:
       - main
     # Run only on changes to relevant files
     paths:
-      - ".github/workflows/image.yaml"
-      - "scripts/**"
-      - "src/**"
-      - ".dockerignore"
-      - "Dockerfile"
-      - "flake.lock"
+      - .github/workflows/image.yaml
+      - scripts/**
+      - src/**
+      - .dockerignore
+      - Dockerfile
+      - flake.lock
       - "*.nix"
 
 jobs:
@@ -44,13 +43,13 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: Set up Docker Buildx
         uses: docker/[email protected]
       - name: Build Docker image
         uses: docker/[email protected]
         with:
-          context: .
+          context: ./
           # Don't save image
           outputs: type=cacheonly
           # Cache Docker layers between builds

.github/workflows/lint.yaml

@@ -1,4 +1,3 @@
----
 name: Lint
 
 # Put 'on' in quotes to avoid YAML parsing error
@@ -22,14 +21,14 @@ jobs:
     # Use reasonable timeout to avoid stuck workflows
     timeout-minutes: 10
     env:
-      NIX_CACHE_DIR: /home/runner/.nixcache
-      TRUNK_CACHE_DIR: /home/runner/.trunkcache
+      NIX_CACHE_DIR: /home/runner/.nixcache/
+      TRUNK_CACHE_DIR: /home/runner/.trunkcache/
     permissions:
       # Needed to checkout code
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       # We need to fetch upstream so Trunk can compare against it
       - name: Fetch upstream
         if: github.event_name == 'pull_request'
@@ -52,13 +51,13 @@ jobs:
       - name: Setup docs modules cache
         uses: actions/[email protected]
         with:
-          path: docs/node_modules
+          path: docs/node_modules/
           key: lint-docs-modules
       - name: Install Nix
-        uses: cachix/install-nix-action@v22
+        uses: cachix/install-nix-action@v23
         with:
           github_access_token: ${{ github.token }}
-          install_url: https://releases.nixos.org/nix/nix-2.18.0/install
+          install_url: https://releases.nixos.org/nix/nix-2.18.1/install
       # See: https://github.com/cachix/install-nix-action/issues/56
       - name: Import Nix store cache
         if: steps.cache-nix.outputs.cache-hit == 'true'
@@ -74,7 +73,7 @@ jobs:
         run: >
           nix
           develop
-          .#lint
+          ./#lint
           --command
           --
           task
@@ -91,7 +90,7 @@ jobs:
         run: >
           nix
           develop
-          .#lint
+          ./#lint
           --command
           --
           task
@@ -107,5 +106,5 @@ jobs:
           ${{ env.NIX_CACHE_DIR }}
           &&
           nix-store
-          --export $(find /nix/store -maxdepth 1 -name '*-*')
+          --export $(find /nix/store/ -maxdepth 1 -name '*-*')
           > ${{ env.NIX_CACHE_DIR }}/archive.nar

.github/workflows/registry.yaml

@@ -1,4 +1,3 @@
----
 name: Registry
 
 # Put 'on' in quotes to avoid YAML parsing error
@@ -22,7 +21,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout code
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: Set up Docker Buildx
         uses: docker/[email protected]
       - name: Log in to the Container registry
@@ -34,7 +33,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/[email protected]
         with:
-          context: .
+          context: ./
           push: true
           # Slashes are here to make the string multiline and avoid using spaces
           tags: "\

.gitignore

@@ -2,7 +2,7 @@
 /local.nix
 
 #Task
-/.task
+/.task/
 /Taskfile.yaml
 /Taskfile.yml
 

.trunk/.gitignore

@@ -1,8 +1,7 @@
-*actions
-*logs
-*notifications
-*out
-*plugins
-*tools
-user_trunk.yaml
-user.yaml
+/*actions
+/*logs
+/*notifications
+/*out
+/*plugins
+/*tools
+/user.yaml

.trunk/configs/.markdownlint.yaml

@@ -1,4 +1,3 @@
----
 # Enable all rules by default
 default: true
 

.trunk/configs/svgo.config.cjs → .trunk/configs/svgo.config.mjs

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   js2svg: {
     // Don't minify
     pretty: true,