diff --git a/.github/workflows/flakehub-publish-tagged.yml b/.github/workflows/flakehub.yml similarity index 95% rename from .github/workflows/flakehub-publish-tagged.yml rename to .github/workflows/flakehub.yml index 16b9a4f..6b4e0a7 100644 --- a/.github/workflows/flakehub-publish-tagged.yml +++ b/.github/workflows/flakehub.yml @@ -1,8 +1,10 @@ -name: "Publish tags to FlakeHub" +name: Publish to FlakeHub + on: push: tags: - "v?[0-9]+.[0-9]+.[0-9]+*" + workflow_dispatch: inputs: tag: @@ -13,14 +15,18 @@ on: jobs: flakehub-publish: runs-on: "ubuntu-latest" + permissions: id-token: "write" contents: "read" + steps: - uses: "actions/checkout@v3" with: ref: "${{ (inputs.tag != null) && format('refs/tags/{0}', inputs.tag) || '' }}" + - uses: "DeterminateSystems/nix-installer-action@main" + - uses: "DeterminateSystems/flakehub-push@main" with: visibility: "public" diff --git a/Cargo.lock b/Cargo.lock index 16e5290..1262cef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1260,9 +1260,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ "hashbrown 0.14.0", ] @@ -1637,9 +1637,9 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.23.1-alpha.6" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a16e8ea6cc383d0a413353336a40794844f0d63fad911004adfe2b64ab993952" +checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425" dependencies = [ "bitflags 2.4.0", "cassowary", diff --git a/Cargo.toml b/Cargo.toml index 687a810..67c660f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities"] [dependencies] crossterm = "0.27.0" -tui = { package = "ratatui", version = "0.23.1-alpha.6", default-features = false, features = [ "crossterm", "serde" ] } +tui = { package = "ratatui", version = "0.24.0", default-features = false, features = [ "crossterm", "serde" ] } tokio = { version = "1.33.0", features = [ "rt", "macros", "rt-multi-thread", "fs" ] } clap = { version = "4.4.6", features = [ "derive", "cargo" ] } serde = { version = "1.0.189", features = [ "derive" ] } diff --git a/book/src/guide/README.md b/book/src/guide/README.md index 45c3be7..65fe430 100644 --- a/book/src/guide/README.md +++ b/book/src/guide/README.md @@ -4,3 +4,4 @@ The how-to of getting this application up and running. - [Installation](installation.md) - [Configuration](configuration.md) +- [Flake](flake.md) diff --git a/book/src/guide/flake.md b/book/src/guide/flake.md new file mode 100644 index 0000000..52755c0 --- /dev/null +++ b/book/src/guide/flake.md @@ -0,0 +1,16 @@ +# Usage as a flake + +[![FlakeHub](https://img.shields.io/endpoint?url=https://flakehub.com/f/Xithrius/twitch-tui/badge)](https://flakehub.com/flake/Xithrius/twitch-tui) + +Add twitch-tui to your `flake.nix`: + +```nix +{ + inputs.twitch-tui.url = "https://flakehub.com/f/Xithrius/twitch-tui/*.tar.gz"; + + outputs = { self, twitch-tui }: { + # Use in your outputs + }; +} + +``` diff --git a/src/utils/styles.rs b/src/utils/styles.rs index c32ae01..a608e54 100644 --- a/src/utils/styles.rs +++ b/src/utils/styles.rs @@ -6,7 +6,6 @@ pub const BORDER_NAME_DARK: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), - underline_color: None, }; #[allow(dead_code)] @@ -15,7 +14,6 @@ pub const BORDER_NAME_LIGHT: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), - underline_color: None, }; pub const DATETIME_DARK: Style = Style { @@ -23,7 +21,6 @@ pub const DATETIME_DARK: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), - underline_color: None, }; pub const DATETIME_LIGHT: Style = Style { @@ -31,7 +28,6 @@ pub const DATETIME_LIGHT: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), - underline_color: None, }; pub const HIGHLIGHT_NAME_DARK: Style = Style { @@ -39,14 +35,12 @@ pub const HIGHLIGHT_NAME_DARK: Style = Style { bg: Some(Color::White), add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), - underline_color: None, }; pub const HIGHLIGHT_NAME_LIGHT: Style = Style { fg: Some(Color::White), bg: Some(Color::Black), add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), - underline_color: None, }; pub const COLUMN_TITLE: Style = Style { @@ -54,7 +48,6 @@ pub const COLUMN_TITLE: Style = Style { bg: None, add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), - underline_color: None, }; pub const SYSTEM_CHAT: Style = Style { @@ -62,7 +55,6 @@ pub const SYSTEM_CHAT: Style = Style { bg: None, add_modifier: Modifier::BOLD, sub_modifier: Modifier::empty(), - underline_color: None, }; pub const DASHBOARD_TITLE_COLOR: Style = Style { @@ -70,5 +62,4 @@ pub const DASHBOARD_TITLE_COLOR: Style = Style { bg: None, add_modifier: Modifier::empty(), sub_modifier: Modifier::empty(), - underline_color: None, };