diff --git a/.github/ISSUE_TEMPLATE/crash.yml b/.github/ISSUE_TEMPLATE/crash.yml new file mode 100644 index 00000000..e37198c9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/crash.yml @@ -0,0 +1,57 @@ +name: Crash report +description: Report a crash +labels: ["bug", "crash"] +type: "Bug" +title: "[CRASH] " +body: + - type: textarea + attributes: + label: What caused the crash + description: | + Any information likely to help debug the crash. What were you doing when the crash occurred, + what changes did you make, can you get it to happen again? + + - type: upload + attributes: + label: Report file + description: Attach `report.txt` here. + validations: + required: true + + - type: upload + attributes: + label: Log file + description: | + Attach `log.qslog.log` here. If it is too big to upload, compress it. + + You can preview the log if you'd like using `qs log -r '*=true'`. + validations: + required: true + + - type: textarea + attributes: + label: "Version info" + description: Run `caelestia -v` and paste the result below. + value: | +
Version info + + ``` + + ``` + +
+ validations: + required: true + + - type: checkboxes + attributes: + label: Reminder + options: + - label: I've successfully updated to the latest versions following the [updating guide](https://github.com/caelestia-dots/caelestia?tab=readme-ov-file#updating). + required: false + - label: I've successfully updated the system packages to the latest. + required: false + - label: I agree that it's usually impossible for others to help me without my logs. + required: true + - label: I've ticked the checkboxes without reading their contents + required: false diff --git a/.github/workflows/update-flake-inputs.yml b/.github/workflows/update-flake-inputs.yml index c9082215..7f24c797 100644 --- a/.github/workflows/update-flake-inputs.yml +++ b/.github/workflows/update-flake-inputs.yml @@ -14,23 +14,22 @@ jobs: id: app-token uses: actions/create-github-app-token@v3 with: - app-id: ${{ secrets.APP_ID }} + client-id: ${{ secrets.CLIENT_ID }} private-key: ${{ secrets.APP_PRIVATE_KEY }} - uses: actions/checkout@v6 with: token: ${{ steps.app-token.outputs.token }} - persist-credentials: false - name: Install Nix - uses: nixbuild/nix-quick-install-action@v31 + uses: nixbuild/nix-quick-install-action@v34 with: nix_conf: | keep-env-derivations = true keep-outputs = true - name: Restore and save Nix store - uses: nix-community/cache-nix-action@v6 + uses: nix-community/cache-nix-action@v7 with: # restore and save a cache using this key primary-key: nix-${{ hashFiles('**/*.nix', '**/flake.lock') }} @@ -85,7 +84,7 @@ jobs: - name: Commit and push changes if: steps.check.outputs.modified == 'true' - uses: EndBug/add-and-commit@v9 + uses: EndBug/add-and-commit@v10 with: github_token: ${{ steps.app-token.outputs.token }} add: flake.lock diff --git a/flake.lock b/flake.lock index 9f1b2ea0..225792b1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1772764582, - "narHash": "sha256-hSwjmpXHFqzSXrndVekA0IheKrbC7wi0IbfZTYwlmXw=", + "lastModified": 1777726295, + "narHash": "sha256-Db9B3uTLDSj7zjQ4L3tIk9RcxHXbWRKw5fw8JozikyI=", "owner": "caelestia-dots", "repo": "cli", - "rev": "4bcd42f482d038b98145b0b03388244b68b7d35d", + "rev": "a00e71d6b7572a8dbbb7945a45b79acf2401ad56", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1772925576, - "narHash": "sha256-mMoiXABDtkSJxCYDrkhJ/TrrJf5M46oUfIlJvv2gkZ0=", + "lastModified": 1777706159, + "narHash": "sha256-TuD8hw9lkRCEb+6v93iB7HDvcmvH8R0qyD6wBmPGfv8=", "ref": "refs/heads/master", - "rev": "15a84097653593dd15fad59a56befc2b7bdc270d", - "revCount": 750, + "rev": "8db8ca1fecfcce8def1f9265fa1742baa0e0c271", + "revCount": 813, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index 98bae902..38097123 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -78,7 +78,7 @@ Item { id: stateLayer onClicked: { - Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.terminal, "fish", "-C", `exec qalc -i '${root.math}'`]); + Quickshell.execDetached(["app2unit", "--", ...GlobalConfig.general.apps.terminal, "fish", "-C", `exec qalc -i '${root.math}'`]); root.list.visibilities.launcher = false; } diff --git a/modules/launcher/services/Apps.qml b/modules/launcher/services/Apps.qml index 5c80513e..168d9209 100644 --- a/modules/launcher/services/Apps.qml +++ b/modules/launcher/services/Apps.qml @@ -13,7 +13,7 @@ Searcher { if (entry.runInTerminal) Quickshell.execDetached({ - command: ["app2unit", "--", ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command], + command: ["app2unit", "--", ...GlobalConfig.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command], workingDirectory: entry.workingDirectory }); else diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml index fde71c6c..ab727817 100644 --- a/modules/utilities/cards/RecordingList.qml +++ b/modules/utilities/cards/RecordingList.qml @@ -104,7 +104,7 @@ ColumnLayout { onClicked: { root.visibilities.utilities = false; root.visibilities.sidebar = false; - Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.playback, recording.modelData.path]); + Quickshell.execDetached(["app2unit", "--", ...GlobalConfig.general.apps.playback, recording.modelData.path]); } } @@ -114,7 +114,7 @@ ColumnLayout { onClicked: { root.visibilities.utilities = false; root.visibilities.sidebar = false; - Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.explorer, recording.modelData.path]); + Quickshell.execDetached(["app2unit", "--", ...GlobalConfig.general.apps.explorer, recording.modelData.path]); } } diff --git a/shell.qml b/shell.qml index 01ba0f19..bc2bb164 100644 --- a/shell.qml +++ b/shell.qml @@ -1,3 +1,4 @@ +//@ pragma Env QS_CRASHREPORT_URL=https://github.com/caelestia-dots/shell/issues/new?template=crash.yml //@ pragma DefaultEnv QS_NO_RELOAD_POPUP=1 //@ pragma DefaultEnv QS_DROP_EXPENSIVE_FONTS=1 //@ pragma DefaultEnv QSG_RENDER_LOOP=threaded