general: Use $HOSTTYPE instead of uname.

misc: Fix missing quote.
packages: Fix issues with pacman 5.1. Remove needless call to pkginfo on Linux.
2025-12-13 12:12:12 +00:00 · 2018-05-31 06:38:39 +10:00 · 2018-05-29 09:26:59 +10:00 · 2018-05-29 09:16:45 +10:00 · 2018-05-29 09:08:32 +10:00 · 2018-05-29 08:48:03 +10:00
5 changed files with 384 additions and 581 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,66 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

 ## [Unreleased]

+**Contributors**
+
+- [**@mstraube**](https://github.com/mstraube)
+- [**@iandrewt**](https://github.com/iandrewt")
+
+**Operating System**
+
+- Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube)
+
+**General**
+
+- [output] Added `--json` to output the info in `json`.
+- [cursor] Fixed prompt location issues after Neofetch is run.
+- [macOS] Fixed neofetch launching XQuartz.
+- [misc] Removed `uppercase()`.
+- [misc] Removed all instances of `export`.
+
+**Ascii**
+
+- Fixed a bug causing Windows 7 ASCII art to not display.
+
+**Image**
+
+- Removed `catimg` support (*It didn’t allow us to specify height so we
+  couldn’t accurately place the cursor*).
+- Fixed `tycat`, `sixel` and `kitty icat` image sizes.
+
+**Screenshot**
+
+- Removed screenshot functionality.
+- Removed screenshot upload functionality.
+
+**Info**
+
+- [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt")
+- [gpu] Fixed ATI/AMD branding issue.
+- [song] Fixed song detection on macOS.
+- [song] Fixed song output on systems using `C` locale.
+
+## [4.0.2] - 2018-05-19
+
+- [config] Fixed `/dev/stdin` error.
+- [config] Added `--print_config` to display the default config file.
+- [macOS] Fixed xquartz issue.
+
+
+## [4.0.1] - 2018-05-18
+
+### Note: This release is only required for those running `bash <3.3`.
+
+- [config] Fixed issue with default config in bash3.
+- [packages] Simplified code.
+- [term] Fixed macOS issue.
+- [term] Fixed `tmux` issue.
+
+
+## [4.0.0] - 2018-05-17
+
+<h1><img src="https://i.imgur.com/JFxwJtU.png" alt="logo" height="100px"></h1>
+
 This release bumps the version number up to `4.0.0` as it contains major
 changes to how Neofetch is packaged and installed.

@@ -14,15 +74,21 @@ The entirety of Neofetch is now contained within a single executable.
 Everything has been in-lined. Installing Neofetch is now as easy as
 downloading the script and running it.

-Packaging Neofetch is now easier as well. We were using `sed` in the
-`Makefile` to replace specific paths and we have had to work around
-different system hierarchies. None of this is necessary anymore.
-
 Those using distributions with an outdated Neofetch version in their repos
-can now easily install the latest version.
+can now easily install the latest version themselves.

 Thanks to those who contributed this time around and thanks to those who
-discussed proposed changes in the bug tracker. I appreciate it. :+1:
+discussed proposed changes in the bug tracker and Discord. I appreciate
+it. :+1:
+
+
+## Discord
+
+Neofetch now has a Discord server. Come and join the discussion!
+
+<a
+href="https://discord.gg/BtnTPFF"><img
+src="https://img.shields.io/discord/440354555197128704.svg"></a>


 ## Contributors
@@ -36,6 +102,8 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1:
 - [**@TsundereBug**](https://github.com/TsundereBug)
 - [**@dawidd6**](https://github.com/dawidd6)
 - [**@mstraube**](https://github.com/mstraube)
+- [**@iandrewt**](https://github.com/iandrewt)
+- [**@MindTooth**](https://github.com/MindTooth)


 ## Operating System
@@ -64,6 +132,14 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1:

 ## Info

+**Song**
+
+- Added support for VLC. [**@mstraube**](https://github.com/mstraube)
+- Added support for Sayonara. [**@mstraube**](https://github.com/mstraube)
+- Added album data to song output. [**@mstraube**](https://github.com/mstraube), [**@iandrewt**](https://github.com/iandrewt)
+- Added `song_format` to change the display format of the data.
+    - Default: `%artist% - %album% - %title%`.
+
 **Title**

 - Fixed unexpected backslash being inserted on some systems.
@@ -80,6 +156,7 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1:

 - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris)
 - Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube)
+- Fixed `kitty` font bug. [**@MindTooth**](https://github.com/MindTooth)

 **Packages**

@@ -2638,7 +2715,10 @@ Changelog:
 Let me know if you're having issues.


-[Unreleased]: https://github.com/dylanaraps/neofetch/compare/3.4.0...HEAD
+[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.2...HEAD
+[4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2
+[4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1
+[4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0
 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0
 [3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0
 [3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2016-2017 Dylan Araps
+Copyright (c) 2016-2018 Dylan Araps

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,14 +1,15 @@
-# Neofetch
+<h3 align="center"><img src="https://i.imgur.com/ZQI2EYz.png" alt="logo" height="100px"></h3>
+<p align="center">A command-line system information tool written in bash 3.2+</p>

-<a href="https://repology.org/metapackage/neofetch">
-    <img src="https://repology.org/badge/vertical-allrepos/neofetch.svg" alt="Packaging status" align="right" width="150px" height="730px">
-</a>
+<p align="center">
+<a href="https://discord.gg/BtnTPFF"><img src="https://img.shields.io/discord/440354555197128704.svg"></a>
+<a href="https://travis-ci.org/dylanaraps/neofetch"><img src="https://travis-ci.org/dylanaraps/neofetch.svg?branch=master"></a>
+<a href="./LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+<a href="https://github.com/dylanaraps/neofetch/releases"><img src="https://img.shields.io/github/release/dylanaraps/neofetch.svg"></a>
+<a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
+</p>

-[![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch)
-[![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch)
-[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
-[![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases)
-[![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla)
+<img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">

 Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way.

@@ -16,15 +17,14 @@ The overall purpose of Neofetch is to be used in screen-shots of your system. Ne

 The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all.

+<img src="https://i.imgur.com/lUrkQBN.png" alt="neofetch" align="right" height="240px">
+
 You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones.

-Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.<br>
+Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.


-### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\]
-
-<img src="https://i.imgur.com/lUrkQBN.png" alt="neofetch" align="right" width="349px">
-<img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" width="349px">
+### More: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\]

 ## Articles

@@ -41,6 +41,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,
 - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/
 - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/
 - https://www.youtube.com/watch?v=bgepGW858fc
+- https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html


 ## Thanks
--- a/806
+++ b/806
--- a/neofetch.1
+++ b/neofetch.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH NEOFETCH "1" "May 2018" "Neofetch 3.4.1-git" "User Commands"
+.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.3" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -16,7 +16,9 @@ NOTE: Every launch flag has a config option.
 .TP
 \fB\-\-disable\fR infoname
 Allows you to disable an info line from appearing
-in the output.
+in the output. 'infoname' is the function name from the
+\&'print_info()' function inside the config file.
+For example: 'info "Memory" memory' would be '\-\-disable memory'
 .IP
 NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu'
 .TP
@@ -115,8 +117,11 @@ Takes: name, mount, dir
 \fB\-\-ip_host\fR url
 URL to query for public IP
 .TP
+\fB\-\-song_format\fR format
+Print the song data in a specific format (see config file).
+.TP
 \fB\-\-song_shorthand\fR on/off
-Print the Artist/Title on separate lines
+Print the Artist/Album/Title on separate lines.
 .TP
 \fB\-\-music_player\fR player\-name
 Manually specify a player to use.
@@ -188,7 +193,7 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off',
+Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off',
 \&'sixel', 'tycat', 'w3m'
 .TP
 \fB\-\-source\fR source
@@ -202,9 +207,6 @@ Shortcut to use 'ascii' backend.
 \fB\-\-caca\fR source
 Shortcut to use 'caca' backend.
 .TP
-\fB\-\-catimg\fR source
-Shortcut to use 'catimg' backend.
-.TP
 \fB\-\-iterm2\fR source
 Shortcut to use 'iterm2' backend.
 .TP
@@ -230,7 +232,7 @@ Shortcut to use 'tycat' backend.
 Shortcut to use 'w3m' backend.
 .TP
 \fB\-\-off\fR
-Shortcut to use 'off' backend.
+Shortcut to use 'off' backend (Disable ascii art).
 .IP
 NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img',
 \&'/path/to/ascii', '/path/to/dir/'
@@ -302,19 +304,6 @@ closer to the left side.
 .TP
 \fB\-\-clean\fR
 Delete cached files and thumbnails.
-.SS "SCREENSHOT:"
-.TP
-\fB\-s\fR, \fB\-\-scrot\fR \fI\,/path/to/img\/\fP
-Take a screenshot, if path is left empty the screenshot function will use $scrot_dir and $scrot_name.
-.TP
-\fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP
-Same as \fB\-\-scrot\fR but uploads the scrot to a website.
-.TP
-\fB\-\-image_host\fR imgur/teknik
-Website to upload scrots to.
-.TP
-\fB\-\-scrot_cmd\fR cmd
-Screenshot program to launch
 .SS "OTHER:"
 .TP
 \fB\-\-config\fR \fI\,/path/to/config\/\fP
@@ -323,6 +312,9 @@ Specify a path to a custom config file
 \fB\-\-config\fR none
 Launch the script without a config file
 .TP
+\fB\-\-print_config\fR
+Print the default config file to stdout.
+.TP
 \fB\-\-stdout\fR
 Turn off all colors and disables any ASCII/image backend.
 .TP
Author	SHA1	Message	Date
Dylan Araps	5234e76007	general: Use $HOSTTYPE instead of uname.	2018-05-31 06:38:39 +10:00
Dylan Araps	3889bf8dd4	misc: Fix missing quote.	2018-05-29 09:26:59 +10:00
Dylan Araps	9175a47a3c	packages: Fix issues with pacman 5.1. Remove needless call to pkginfo on Linux.	2018-05-29 09:16:45 +10:00
Dylan Araps	15cd3b3e07	gpu: Remove glxinfo usage. Too slow.	2018-05-29 09:08:32 +10:00
Dylan Araps	ec29e74406	cpu: Simplify cpu_cores	2018-05-29 08:48:03 +10:00
Dylan Araps	a2769a93ed	image: Fixed images in kitty on macOS. Closes #994	2018-05-28 18:51:41 +10:00
Dylan Araps	8e3be5204d	docs: update	2018-05-28 11:08:06 +10:00
Dylan Araps	b02ed9fff2	image: Fixed kitty image size.	2018-05-28 10:28:14 +10:00
Dylan Araps	29aabc97fa	docs: update	2018-05-28 09:47:17 +10:00
Dylan Araps	8707a49f04	docs: update	2018-05-28 09:46:08 +10:00
Dylan Araps	b981fb50fa	image: Fixed tycat size.	2018-05-28 09:33:47 +10:00
Dylan Araps	e04302ccec	docs: update	2018-05-28 09:27:55 +10:00
Dylan Araps	92ecdf0012	image: Removed catimg support. Fixed sixel size.	2018-05-28 09:27:41 +10:00
Dylan Araps	e2274fddd8	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-28 08:42:48 +10:00
Dylan Araps	ba9c7bba23	docs: update	2018-05-28 08:42:35 +10:00
Dylan Araps	a4ca62cf5a	Merge pull request #1007 from mstraube/song-config song: sort players in config	2018-05-26 08:34:19 +00:00
Michael Straube	fca688dd12	song: sort players in config	2018-05-26 10:21:08 +02:00
Dylan Araps	e6b8f4f64f	song: Use newlines as a separator directly.	2018-05-26 09:14:28 +10:00
Dylan Araps	8554f42345	song: Remove locale override.	2018-05-26 06:55:25 +10:00
Dylan Araps	2a13d62c0c	song: Use ascii characters to split fields.	2018-05-26 06:54:38 +10:00
Dylan Araps	3ad38d7c95	docs: update	2018-05-25 16:08:41 +10:00
Dylan Araps	01ef60445e	song: Use regex for matching.	2018-05-25 15:13:10 +10:00
Dylan Araps	160276ff6d	general: Fix prompt issues 3	2018-05-25 06:51:06 +10:00
Dylan Araps	77282c8fea	general: revert Fix prompt issue 2	2018-05-25 06:07:42 +10:00
Dylan Araps	bff6cf3b1a	general: Fix prompt issues 2	2018-05-25 06:05:31 +10:00
Dylan Araps	e8ab52de7d	Merge pull request #1003 from dylanaraps/song_fix song: Fix matching	2018-05-24 08:43:32 +00:00
Dylan Araps	b4fc29e6f6	Merge pull request #962 from dylanaraps/ati gpu: Fix ATI/AMD branding issue.	2018-05-24 07:58:45 +00:00
Dylan Araps	c64b5c3d8c	general: clean up	2018-05-24 16:55:10 +10:00
Dylan Araps	0f0d9aa84f	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-24 16:51:34 +10:00
Dylan Araps	6991b71ccb	general: Added json output option.	2018-05-24 16:51:23 +10:00
Andrew Titmuss	de0d342852	Revert "Revert "term_font: fix iTerm2 checking 2 more profiles than exists"" This reverts commit `f49919e957`.	2018-05-24 15:46:38 +10:00
Dylan Araps	33d6dd760f	song: Fix matching	2018-05-24 15:36:04 +10:00
Dylan Araps	130b7028ef	song: Fix matching	2018-05-24 15:33:13 +10:00
Andrew Titmuss	f49919e957	Revert "term_font: fix iTerm2 checking 2 more profiles than exists" This reverts commit `15c2939779`.	2018-05-24 14:27:39 +10:00
Andrew Titmuss	5143b20ce1	font: fix line length for iTerm2 profile count	2018-05-24 13:55:09 +10:00
Andrew Titmuss	d6d6e6ea63	docs: update [skip ci]	2018-05-24 13:50:05 +10:00
Andrew Titmuss	15c2939779	term_font: fix iTerm2 checking 2 more profiles than exists	2018-05-24 13:46:35 +10:00
Andrew Titmuss	5756eb97f2	song: fix iTunes detection	2018-05-24 12:46:47 +10:00
Dylan Araps	14981205c6	docs: update	2018-05-24 08:52:55 +10:00
Dylan Araps	dfc8b10ee4	general: Fix cursor location errors.	2018-05-24 08:07:37 +10:00
Dylan Araps	38762182e8	docs: update	2018-05-22 19:44:14 +10:00
Dylan Araps	3ee0980aac	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-22 14:38:50 +10:00
Dylan Araps	3f021fbbb6	misc: cleanup	2018-05-22 14:14:17 +10:00
Dylan Araps	8e99bc6e5f	Merge pull request #1002 from mstraube/redcore OS: Add support for Redcore Linux	2018-05-21 14:03:28 +00:00
Michael Straube	dc9334b7f1	OS: Add support for Redcore Linux	2018-05-21 11:03:36 +02:00
Dylan Araps	070651e4f4	general: Remove screenshot functionality.	2018-05-21 12:46:05 +10:00
Dylan Araps	6aba54154c	misc: Remove uppercase()	2018-05-21 10:26:46 +10:00
Dylan Araps	c5188a891f	config: Remove support for deprecated options.	2018-05-21 10:23:01 +10:00
Dylan Araps	6bf7f9452e	misc: Remove all instances of export. They're pointless.	2018-05-21 10:14:35 +10:00
Dylan Araps	4895ed33b1	misc: cleanup	2018-05-21 10:08:43 +10:00
Dylan Araps	8ad455a1ce	docs: update	2018-05-21 09:35:07 +10:00
Dylan Araps	aed206b5d7	docs: update	2018-05-21 08:32:28 +10:00
Dylan Araps	a27382d21d	image: Make the resolution of catimg configurable.	2018-05-21 08:29:50 +10:00
Dylan Araps	0fe972073f	image: Cleanup of get_term_size	2018-05-21 08:24:32 +10:00
Dylan Araps	fc229704c8	general: term_size, macos fix.	2018-05-20 15:36:54 +10:00
Dylan Araps	c4bf54db3d	ascii: Fix ascii art on windows.	2018-05-20 14:22:26 +10:00
Dylan Araps	7b1b3755a9	general: Fix issues with default config.	2018-05-20 13:59:14 +10:00
Dylan Araps	cb68508be2	general: Fix issues with default config.	2018-05-20 13:56:24 +10:00
Dylan Araps	7a4492c6c3	ascii: Fix ascii art on windows.	2018-05-20 13:50:10 +10:00
Dylan Araps	1f678f8020	version: bump	2018-05-20 08:03:12 +10:00
Dylan Araps	e4c1732c01	docs: update	2018-05-20 07:59:01 +10:00
Dylan Araps	c9bda1dd09	docs: update	2018-05-20 07:56:46 +10:00
Dylan Araps	c814f14726	general: Fix issues with default config.	2018-05-19 20:38:45 +10:00
Dylan Araps	992d0b38ae	general: Added --print_config to display the default config file.	2018-05-19 08:28:10 +10:00
Dylan Araps	c782af6a06	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-19 08:06:22 +10:00
Dylan Araps	80299bd064	macOS: Fix xquartz issue.	2018-05-19 08:06:05 +10:00
Dylan Araps	c69e5ef041	docs: update	2018-05-18 16:26:22 +10:00
Dylan Araps	19d35b995d	docs: update	2018-05-18 16:25:46 +10:00
Dylan Araps	0e43d765fa	docs: update	2018-05-18 16:14:04 +10:00
Dylan Araps	8b4c858042	Merge pull request #993 from dylanaraps/pkg_clean packages: cleanup	2018-05-18 06:10:38 +00:00
Dylan Araps	98252472ce	general: Fix default config in bash3.	2018-05-18 16:11:00 +10:00
Dylan Araps	6e41d5e0a9	packages: cleanup	2018-05-18 15:49:14 +10:00
Dylan Araps	b16ff8bc4d	term: Fix tmux issue.	2018-05-17 20:43:22 +10:00
Dylan Araps	bad073d78a	term: Fix macOS issue	2018-05-17 20:30:46 +10:00
Dylan Araps	0f7e7b6ee0	docs: update	2018-05-17 14:02:05 +10:00
Dylan Araps	e398f1ee08	docs: update	2018-05-17 13:57:45 +10:00
Dylan Araps	c5dbf34e76	docs: update	2018-05-17 13:47:50 +10:00
Dylan Araps	7961c38693	docs: update	2018-05-17 13:45:03 +10:00
Dylan Araps	582fa2f50b	version: bump	2018-05-17 13:39:24 +10:00
Dylan Araps	63ae8994e2	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-17 13:07:34 +10:00
Dylan Araps	225d9cea1a	docs: update	2018-05-17 13:06:53 +10:00
Dylan Araps	a31e656f82	Merge pull request #984 from MindTooth/final_kitty_fix RFC: kitty: This got to be the last fix...	2018-05-17 02:47:33 +00:00
Dylan Araps	156136121a	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-17 12:36:55 +10:00
Dylan Araps	85d3150d13	docs: update	2018-05-17 12:36:19 +10:00
Dylan Araps	57cd8e3cc5	docs: update	2018-05-17 12:36:03 +10:00
Dylan Araps	5f8d6e06cc	Merge pull request #989 from mstraube/song-vlc song: add support for vlc	2018-05-14 05:15:48 +00:00
Michael Straube	a62c3d2029	song: add support for vlc	2018-05-14 07:08:59 +02:00
Dylan Araps	01ec03720b	Merge pull request #982 from mstraube/deepin-music song: fix deepin-music	2018-05-13 21:54:21 +00:00
Dylan Araps	b74c7a63d3	Merge pull request #983 from mstraube/song-dbus song: simplify get_song_dbus	2018-05-13 21:53:05 +00:00
Dylan Araps	293633d5ab	Merge pull request #987 from mstraube/audacious song: audacious: remove audtool, closes #986	2018-05-13 21:51:51 +00:00
Dylan Araps	a8446133f0	Merge pull request #988 from mstraube/year general: update copyright year	2018-05-13 21:51:30 +00:00
Michael Straube	33fbed0b14	general: update copyright year	2018-05-13 11:06:22 +02:00
Michael Straube	bd0e62d5f3	song: audacious: remove audtool, closes #986	2018-05-12 13:54:42 +02:00
Andrew Titmuss	71104d7e25	Merge pull request #985 from mstraube/song-example song: update song_shorthand example	2018-05-12 19:35:14 +10:00
Michael Straube	8513b62259	song: update song_shorthand example	2018-05-12 10:56:03 +02:00
Birger J. Nordølum	7e4ec9f09d	kitty: This got to be the last fix...	2018-05-11 22:41:30 +02:00
Michael Straube	670161e13a	song: simplify get_song_dbus	2018-05-11 19:22:34 +02:00
Michael Straube	358006dd92	song: fix deepin-music	2018-05-11 18:37:37 +02:00
Dylan Araps	f1aa74f144	Merge pull request #981 from MindTooth/style_fix kitty: style tweaks on regex	2018-05-10 20:56:24 +00:00
Birger J. Nordølum	f93da07f36	kitty: style tweaks on regex	2018-05-10 14:32:48 +02:00
Dylan Araps	965940f57e	Merge pull request #980 from mstraube/sayonara song: add support for sayonara	2018-05-10 07:21:26 +00:00
Michael Straube	1480b833b0	song: add support for sayonara	2018-05-10 09:14:39 +02:00
Dylan Araps	94bf52ecd4	misc: Fix travis	2018-05-10 09:58:46 +10:00
Dylan Araps	8dc25c3ae5	Merge pull request #977 from MindTooth/fix_kitty_regression kitty: fix regression in regex	2018-05-09 23:56:28 +00:00
Dylan Araps	ece335dd94	Merge branch 'master' of github.com:dylanaraps/neofetch	2018-05-10 09:56:19 +10:00
Dylan Araps	f882c48685	docs: update	2018-05-10 09:56:01 +10:00
Dylan Araps	158173b3c7	Merge pull request #979 from dylanaraps/song_format song: Added song_format.	2018-05-09 23:48:15 +00:00
Dylan Araps	7d259e8ef9	song: Added song_format.	2018-05-10 08:52:06 +10:00
Dylan Araps	b5a2323144	song: Added song_format.	2018-05-10 08:49:05 +10:00
Dylan Araps	e8ac76dc57	Merge pull request #837 from dylanaraps/song-album Add Album to the Song function	2018-05-09 22:35:33 +00:00
Dylan Araps	e54f324595	Merge pull request #978 from mstraube/song-album song: fix audacious album	2018-05-09 22:00:39 +00:00
Michael Straube	ccced8d997	song: fix audacious album fallback to get_song_dbus() when song_shorthand is on audtool won't work due to the '-' separator in it's output	2018-05-09 16:07:04 +02:00
Birger J. Nordølum	a7c6745507	kitty: fix regression in regex	2018-05-09 14:15:24 +02:00
Dylan Araps	b6f0460b35	song: Better splitting.	2018-05-09 21:23:10 +10:00
Andrew Titmuss	acd4c84614	fix merge conflict in song_album	2018-05-09 20:48:40 +10:00
Andrew Titmuss	94a2bf6ec0	Merge pull request #976 from dylanaraps/song_album3 Fix issues with album addition to get_song	2018-05-09 20:20:57 +10:00
Dylan Araps	cfcd6fff17	song: Fix separator when printed.	2018-05-09 18:28:17 +10:00
Dylan Araps	3ece779d47	song: Fix issues with splitting.	2018-05-09 18:26:31 +10:00
Dylan Araps	a5f5be869c	Merge pull request #973 from MindTooth/tweak_kitty_regex tweak kitty font regex	2018-05-08 23:35:18 +00:00
Andrew Titmuss	d8436768a0	Merge pull request #885 from mstraube/song-album song: add album for some players	2018-05-08 20:37:33 +10:00
Dylan Araps	859dc69b20	wm: Detect 2bwm manually	2018-05-07 12:26:42 +10:00
Birger J. Nordølum	f765caa038	Tweak kitty font regex	2018-05-06 14:28:38 +02:00
Dylan Araps	8fe3130cbe	gtk: Fix config file read order. Closes #972	2018-05-06 16:16:27 +10:00
Dylan Araps	a9c4db2b54	docs: update	2018-05-05 09:01:24 +10:00
Dylan Araps	862a4c96db	docs: update	2018-05-05 08:59:09 +10:00
Dylan Araps	5dbc0a2748	docs: update	2018-05-05 08:58:40 +10:00
Dylan Araps	6d003b2f2a	docs: update	2018-05-05 08:57:17 +10:00
Dylan Araps	01721da481	docs: update	2018-05-05 08:54:11 +10:00
Dylan Araps	27df891ab9	docs: update	2018-05-05 08:51:29 +10:00
Dylan Araps	0d89e1a400	gpu: Fix ATI/AMD branding issue.	2018-04-25 11:42:11 +10:00
Dylan Araps	da94f65b8c	gpu: Fix ATI/AMD branding issue.	2018-04-25 11:39:03 +10:00
Michael Straube	31ccd633d2	song: fix cmus album	2017-12-26 09:22:03 +01:00
Michael Straube	8ff013e734	song: add album for some players pogo exaile quodlibet pragha amarok deadbeef qmmp xmms2d mocp rhythmbox banshee mpd	2017-12-26 09:11:20 +01:00
Andrew Titmuss	1f482d786c	remove a debug line for cmus (oops)	2017-10-13 13:38:08 +11:00
Andrew Titmuss	f1052a8e73	fix cmus album output (hopefully)	2017-10-13 13:35:10 +11:00
Andrew Titmuss	9b94195ed9	add album to song name for some players	2017-10-07 16:18:07 +11:00