Skip to content

Commit

Permalink
Merge branch 'main' into ttytm/main
Browse files Browse the repository at this point in the history
  • Loading branch information
andygeorge authored Dec 27, 2024
2 parents 2d187f7 + f5e6ee4 commit c933ab0
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ww"
version = "1.2.1"
authors = ["Turiiya <[email protected]>"]
authors = ["Turiiya <[email protected]>","Andy George <[email protected]>"]
edition = "2021"
license = "MIT"
description = "Weather companion for the terminal"
Expand All @@ -10,7 +10,7 @@ homepage = "https://github.com/andygeorge/ww"
repository = "https://github.com/andygeorge/ww"
keywords = ["cli", "weather", "meteorological", "terminal"]
categories = ["command-line-utilities"]
rust-version = "1.74.0"
rust-version = "1.81.0"

[dependencies]
anyhow = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ Package manager installation examples are shown below.

#### 2. Unicode symbol font

A Unicode symbol font("emoji-font") needs to be available on the system.
A Unicode symbol font ("emoji-font") needs to be available on the system.
It is likely already installed if you see emojis correctly rendered in your browser and in other applications.
It will also allow to display line characters that are used in wws daily weather graphs.
It will also allow to display line characters that are used in `ww`'s daily weather graphs.
Noto fonts that add support for Unicode glyphs are usually available via the package manager.

- macOS
Expand Down Expand Up @@ -117,7 +117,7 @@ There are several alternatives to the installation via `cargo`.
nix profile install "github:andygeorge/ww"
```
```sh
nix run "github:tobealive/ww"
nix run "github:andygeorge/ww"
```
- On Arch Linux, `ww` can be installed from the [AUR](https://aur.archlinux.org/packages?O=0&SeB=nd&K=ww&outdated=&SB=p&SO=d&PP=50&submit=Go) using an [AUR helper](https://wiki.archlinux.org/title/AUR_helpers). For example:
```
Expand Down
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
MIT License

Copyright (c) 2022 Turiiya
Copyright (c) 2023-2024 ww contributors
Copyright (c) 2023-2024 wthrr contributors
Copyright (c) 2024+ ww contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 🦀 ww
# 🦀 `ww`

[![][ci_shield]](https://github.com/andygeorge/ww/actions/workflows/ci.yml?query=branch%3Amain)
[![][last_commit_shield]](https://github.com/andygeorge/ww/commits/main)
Expand Down Expand Up @@ -132,7 +132,7 @@ Win: `%USERPROFILE%\AppData\Roaming\ww\`
rowspan: double, // Graph height: `double` | `single`
time_indicator: true, // Indication of the current time in the graph: `true` | `false`
),
greeting: true, // Display greeting message: `true` | `false`
greeting: false, // Display greeting message: `true` | `false`
),
)
```
Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
rustPlatform.bindgenHook
];
buildInputs = [ openssl ];

checkFlags = [
# connecting to internet does not work in the sandbox
"--skip=modules::location::tests::geolocation_response"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/display/gui_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl Default for Gui {
border: BorderStyle::default(),
color: ColorVariant::default,
graph: GraphOpts::default(),
greeting: true,
greeting: false,
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ww.ron
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Configuration for ww the ww, your weather companion for the terminal
/* Configuration for `ww`, your weather companion for the terminal
Lin: ~/.config/ww/
Mac: ~/Library/Application Support/ww/
Win: %USERPROFILE%\AppData\Roaming\ww\
Expand All @@ -24,6 +24,6 @@ Win: %USERPROFILE%\AppData\Roaming\ww\
rowspan: double, // Graph height: `double` | `single`
time_indicator: true, // Indication of the current time in the graph: `true` | `false`
),
greeting: true, // Display greeting message: `true` | `false`
greeting: false, // Display greeting message: `true` | `false`
),
)

0 comments on commit c933ab0

Please sign in to comment.