Merge feef443bae into bcaa13deae

build(deps): bump serde_json from 1.0.117 to 1.0.119

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,50 +0,0 @@
----
-name: Bug report
-about: Report an issue with the bar not working as expected
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-> A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-> A clear and concise description of what you expected to happen.
-
-**System information:**
- - Distro: [e.g. Arch Linux, Ubuntu 22.10]
-- Compositor: [e.g. Sway]
- - Ironbar version: [e.g. 0.8.0]
-
-**Configuration**
-> Share your bar configuration and stylesheet as applicable:
-
-<details><summary>Config</summary>
-
-```
-
-```
-</details>
-
-
-<details><summary>Styles</summary>
-
-```css
-
-```
-</details>
-
-**Additional context**
-> Add any other context about the problem here.
-
-**Screenshots**
-> If applicable, add screenshots to help explain your problem.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,99 @@
+name: Bug report
+description: Report an issue with the bar not working as expected
+title: <Bug report name>
+labels: ["bug"]
+body:
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: Ex. The bug is [...]
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior:\
+      value: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen
+      placeholder: Ex. I expected [...] to occur
+    validations:
+      required: true
+  - type: markdown
+    id: system-info
+    attributes:
+      value: |
+        **System information**
+  - type: input
+    id: distro-name
+    attributes:
+      label: Distro
+      placeholder: Ex. NixOS 23.11
+    validations:
+      required: true
+  - type: input
+    id: compositor-name
+    attributes:
+      label: Compositor
+      placeholder: Ex. Hyprland 0.40
+    validations:
+      required: true
+  - type: input
+    id: ironbar-version
+    attributes:
+      label: Ironbar version
+      placeholder: Ex. v0.15.1
+    validations:
+      required: true
+  - type: markdown
+    id: configuration
+    attributes:
+      value: |
+        **Configuration**
+  - type: textarea
+    id: config-file-entry
+    attributes:
+      label: Ironbar config
+      description: The json, yaml, toml, or corn file
+      value: |
+        ```json
+        {}
+        ```
+    validations:
+      required: true
+  - type: textarea
+    id: styles-file-entry
+    attributes:
+      label: Ironbar styles
+      description: The css file with all the styles
+      render: css
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other extra context about the problem here.
+      placeholder: Ex. This issue was discussed at [...]
+    validations:
+      required: false
+  - type: textarea
+    id: attachements
+    attributes:
+      label: Screenshots and other attachments
+      description: If applicable, add screenshots and other attachments to help explain your problem.
+      placeholder: Ex. Here is a screenshot showing how it occurs
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-> A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-
-**Describe the solution you'd like**
-> A clear and concise description of what you want to happen.
-> The more info here about what you are trying to achieve, the better - there's likely more than one way to go about implementing a solution.
-
-**Describe alternatives you've considered**
-> A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-> Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,40 @@
+name: Feature request
+description: Suggest an idea for this project
+title: <Feature request name>
+labels: ["enhancement"]
+
+body:
+  - type: textarea
+    id: the-problem
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is.
+      placeholder: Ex. I'm always frustrated when [...]
+    validations:
+      required: false
+  - type: textarea
+    id: the-solution
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+        A clear and concise description of what you want to happen.
+        The more info here about what you are trying to achieve, the better - there's likely more than one way to go about implementing a solution.
+      placeholder: Ex. I would like there to be [...]
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+      placeholder: Ex. It might be a good idea to also consider [...]
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: Ex. This arose from issue [...], and here is a screenshot showing what I mean
+    validations:
+      required: false

Cargo.lock

@@ -456,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -466,9 +466,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
  "anstream",
  "anstyle",
@@ -478,9 +478,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2798,9 +2798,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
 dependencies = [
  "itoa",
  "ryu",

Cargo.toml

@@ -113,10 +113,10 @@ ctrlc = "3.4.2"
 cfg-if = "1.0.0"
 
 # cli
-clap = { version = "4.5.7", optional = true, features = ["derive"] }
+clap = { version = "4.5.8", optional = true, features = ["derive"] }
 
 # ipc
-serde_json = { version = "1.0.117", optional = true }
+serde_json = { version = "1.0.119", optional = true }
 
 # http
 reqwest = { version = "0.12.5", default-features = false, features = ["default-tls", "http2"], optional = true }

flake.nix

@@ -162,7 +162,7 @@
             };
 
             style = lib.mkOption {
-              type = lib.types.lines;
+              type = lib.types.either (lib.types.lines) (lib.types.path);
               default = "";
               description = "The stylesheet to apply to ironbar.";
             };
@@ -189,8 +189,12 @@
                 source = jsonFormat.generate "ironbar-config" cfg.config;
               };
 
-              "ironbar/style.css" =
-                lib.mkIf (cfg.style != "") { text = cfg.style; };
+              "ironbar/style.css" = lib.mkIf (cfg.style != "") (
+                if builtins.isPath cfg.style || lib.isStorePath cfg.style then
+                  { source = cfg.style; }
+                else
+                  { text = cfg.style; }
+              );
             };
 
             systemd.user.services.ironbar = lib.mkIf cfg.systemd {