derped/tmux-kanagawa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed readme merge issue

Browse source
This commit is contained in:
Dane Williams 2020-03-30 23:49:28 -07:00
parent c4fed454cb
commit 98c845b33d
1 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
README.md
View file

@ -2,32 +2,7 @@
> A dark theme for [tmux](https://github.com/tmux/tmux/wiki) > A dark theme for [tmux](https://github.com/tmux/tmux/wiki)
<<<<<<< HEAD
![Screenshot](./screenshot.jpg) ![Screenshot](./screenshot.jpg)
=======
## Features
Day, date, time, timezone
Current location based on network with temperature and forecast icon (if available)
Network connection status and SSID
Battery percentage and AC power connection status
Color code based on if prefix is active or not
List of windows with current window highlighted
## Screenshots
![Alt text](screenshots/tmux-dracula-screenshot.jpg?raw=true "Tmux Dracula")
tmux-dracula in action
![Alt text](screenshots/alt-tmux-dracula-screenshot.jpg?raw=true "Tmux Dracula")
When prefix is enabled smiley face turns from green to yellow
When charging, 'AC' is displayed
If forecast information is available, a ☀, ☁, ☂, or ❄ unicode character corresponding with the forecast is displayed alongside the temperature
## Compatibility
Designed for compatibility with Mac systems and tested on macOS 10.15 Catalina
Compatibility with Linux systems and/or WSL on Windows is not yet available
>>>>>>> 8e57456bdcd40f9b29d68b9f7848e84736782ff5
## Install ## Install
@ -36,7 +11,6 @@ Use TPM (tmux plugin manager) and add to your .tmux.conf:
Be sure that `run -b '~/.tmux/plugins/tpm/tpm'` is at the bottom of .tmux.config for tpm to work Be sure that `run -b '~/.tmux/plugins/tpm/tpm'` is at the bottom of .tmux.config for tpm to work
Restart tmux and then use `prefix + I` (capital I as in Install) to install Restart tmux and then use `prefix + I` (capital I as in Install) to install
<<<<<<< HEAD
## Features ## Features
* Day, date, time, timezone * Day, date, time, timezone
@ -60,13 +34,4 @@ This theme is maintained by the following person(s) and a bunch of awesome contr
## License ## License
[MIT License](./LICENSE) [MIT License](./LICENSE)
=======
## Troubleshooting
Some users have experienced issues where the weather does not load.
This may be solved by manually running dracula.tmux:
`~/.tmux/plugins/tmux-dracula/dracula.tmux`
## License
This project is licensed under the MIT License - see [LICENSE.md](./LICENSE.md) for details
>>>>>>> 8e57456bdcd40f9b29d68b9f7848e84736782ff5