Skip to content

Commit c933ab0

Browse files
authored
Merge branch 'main' into ttytm/main
2 parents 2d187f7 + f5e6ee4 commit c933ab0

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "ww"
33
version = "1.2.1"
4-
authors = ["Turiiya <[email protected]>"]
4+
authors = ["Turiiya <[email protected]>","Andy George <[email protected]>"]
55
edition = "2021"
66
license = "MIT"
77
description = "Weather companion for the terminal"
@@ -10,7 +10,7 @@ homepage = "https://github.com/andygeorge/ww"
1010
repository = "https://github.com/andygeorge/ww"
1111
keywords = ["cli", "weather", "meteorological", "terminal"]
1212
categories = ["command-line-utilities"]
13-
rust-version = "1.74.0"
13+
rust-version = "1.81.0"
1414

1515
[dependencies]
1616
anyhow = "1.0"

INSTALL.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ Package manager installation examples are shown below.
6363

6464
#### 2. Unicode symbol font
6565

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

7171
- macOS
@@ -117,7 +117,7 @@ There are several alternatives to the installation via `cargo`.
117117
nix profile install "github:andygeorge/ww"
118118
```
119119
```sh
120-
nix run "github:tobealive/ww"
120+
nix run "github:andygeorge/ww"
121121
```
122122
- 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:
123123
```

LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
MIT License
22

33
Copyright (c) 2022 Turiiya
4-
Copyright (c) 2023-2024 ww contributors
4+
Copyright (c) 2023-2024 wthrr contributors
5+
Copyright (c) 2024+ ww contributors
56

67
Permission is hereby granted, free of charge, to any person obtaining a copy
78
of this software and associated documentation files (the "Software"), to deal

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 🦀 ww
1+
# 🦀 `ww`
22

33
[![][ci_shield]](https://github.com/andygeorge/ww/actions/workflows/ci.yml?query=branch%3Amain)
44
[![][last_commit_shield]](https://github.com/andygeorge/ww/commits/main)
@@ -132,7 +132,7 @@ Win: `%USERPROFILE%\AppData\Roaming\ww\`
132132
rowspan: double, // Graph height: `double` | `single`
133133
time_indicator: true, // Indication of the current time in the graph: `true` | `false`
134134
),
135-
greeting: true, // Display greeting message: `true` | `false`
135+
greeting: false, // Display greeting message: `true` | `false`
136136
),
137137
)
138138
```

flake.nix

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
rustPlatform.bindgenHook
3030
];
3131
buildInputs = [ openssl ];
32-
3332
checkFlags = [
3433
# connecting to internet does not work in the sandbox
3534
"--skip=modules::location::tests::geolocation_response"

src/modules/display/gui_config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl Default for Gui {
3131
border: BorderStyle::default(),
3232
color: ColorVariant::default,
3333
graph: GraphOpts::default(),
34-
greeting: true,
34+
greeting: false,
3535
}
3636
}
3737
}

ww.ron

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Configuration for ww the ww, your weather companion for the terminal
1+
/* Configuration for `ww`, your weather companion for the terminal
22
Lin: ~/.config/ww/
33
Mac: ~/Library/Application Support/ww/
44
Win: %USERPROFILE%\AppData\Roaming\ww\
@@ -24,6 +24,6 @@ Win: %USERPROFILE%\AppData\Roaming\ww\
2424
rowspan: double, // Graph height: `double` | `single`
2525
time_indicator: true, // Indication of the current time in the graph: `true` | `false`
2626
),
27-
greeting: true, // Display greeting message: `true` | `false`
27+
greeting: false, // Display greeting message: `true` | `false`
2828
),
2929
)

0 commit comments

Comments
 (0)