Merge pull request #1222 from ZyX-I/update-themes

Add unicode-7.0 theme and some small theme fixes

docs/source/configuration/reference.rst

@@ -296,6 +296,7 @@ with the following top themes:
 Theme                       Description
 ==========================  ====================================================
 powerline                   Default powerline theme with fancy powerline symbols
+powerline_unicode7          Theme with powerline dividers and unicode-7 symbols
 unicode                     Theme without any symbols from private use area
 unicode_terminus            Theme containing only symbols from terminus PCF font
 unicode_terminus_condensed  Like above, but occupies as less space as possible

docs/source/troubleshooting/linux.rst

@@ -38,3 +38,41 @@ The fancy symbols look a bit blurry or “off”!
 
 * Make sure that you have patched all variants of your font (i.e. both the 
   regular and the bold font files).
+
+I am seeing strange blocks in place of playing/paused/stopped signs
+-------------------------------------------------------------------
+
+If you are using ``powerline_unicode7`` :ref:`top-level theme 
+<config-common-default_top_theme>` then symbols for player segments are taken 
+from U+23F4–U+23FA range which is missing from most fonts. You may fix the issue 
+by using `Symbola <http://users.teilar.gr/~g1951d/>`_ font (or any other font 
+which contains these glyphs).
+
+If your terminal emulator is using fontconfig library then you can create 
+a fontconfig configuration file with the following contents:
+
+.. code-block:: xml
+
+    <?xml version="1.0"?>
+    <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+
+    <fontconfig>
+    	<alias>
+    		<family>Terminus</family>
+    		<prefer><family>Symbola</family></prefer>
+    	</alias>
+    </fontconfig>
+
+(replace ``Terminus`` with the name of the font you are using). Exact sequence 
+of actions you need to perform is different across distributions, most likely it 
+will work if you put the above xml into 
+:file:`/etc/fonts/conf.d/99-prefer-symbola.conf`. On Gentoo you need to put it 
+into :file:`/etc/fonts/conf.d/99-prefer-symbola.conf` and run::
+
+    eselect fontconfig enable 99-prefer-symbola
+
+.
+
+.. warning::
+    This answer is only applicable if you use ``powerline_unicode7`` theme or if 
+    you configured powerline to use the same characters yourself.

powerline/config_files/themes/ascii.json

@@ -110,15 +110,15 @@
 					"S":  "S-LINE",
 					"^S": "S-BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
+					"R":  "RPLACE",
-					"Rv": "V-RPLCE",
+					"Rv": "V-RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
+					"cv": "VIM-EX",
-					"ce": "EX",
+					"ce": "NRM-EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
+					"rm": "-MORE-",
-					"r?": "CONFIRM",
+					"r?": "CNFIRM",
-					"!":  "SHELL"
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config_files/themes/powerline.json

@@ -108,15 +108,15 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
+					"R":  "RPLACE",
-					"Rv": "V·RPLCE",
+					"Rv": "V·RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
+					"cv": "VIM·EX",
-					"ce": "EX",
+					"ce": "NRM·EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
+					"rm": "-MORE-",
-					"r?": "CONFIRM",
+					"r?": "CNFIRM",
-					"!":  "SHELL"
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config_files/themes/powerline_unicode7.json

@@ -0,0 +1,156 @@
+{
+	"dividers": {
+		"left": {
+			"hard": " ",
+			"soft": " "
+		},
+		"right": {
+			"hard": " ",
+			"soft": " "
+		}
+	},
+	"spaces": 1,
+	"segment_data": {
+		"branch": {
+			"before": "🔀 "
+		},
+		"cwd": {
+			"args": {
+				"ellipsis": "⋯"
+			}
+		},
+
+		"line_current_symbol": {
+			"contents": " "
+		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "⏵",
+					"pause":    "⏸",
+					"stop":     "⏹"
+				}
+			}
+		},
+
+		"time": {
+			"before": "🕐 "
+		},
+
+		"powerline.segments.common.net.network_load": {
+			"args": {
+				"recv_format": "⬇ {value:>8}",
+				"sent_format": "⬆ {value:>8}"
+			}
+		},
+		"powerline.segments.common.net.hostname": {
+			"before": "🏠 "
+		},
+		"powerline.segments.common.players.now_playing": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "⏵",
+					"pause":    "⏸",
+					"stop":     "⏹"
+				}
+			}
+		},
+		"powerline.segments.common.bat.battery": {
+			"args": {
+				"full_heart": "💙",
+				"empty_heart": "💛"
+			}
+		},
+		"powerline.segments.common.sys.uptime": {
+			"before": "⇑ "
+		},
+		"powerline.segments.common.mail.email_imap_alert": {
+			"before": "✉ "
+		},
+		"powerline.segments.common.env.virtualenv": {
+			"before": "🐍 "
+		},
+		"powerline.segments.common.wthr.weather": {
+			"args": {
+				"icons": {
+					"tornado":                 "🌪",
+					"hurricane":               "🌀",
+					"showers":                 "☔",
+					"scattered_showers":       "☔",
+					"thunderstorms":           "🌩",
+					"isolated_thunderstorms":  "🌩",
+					"scattered_thunderstorms": "🌩",
+					"dust":                    "🌫",
+					"fog":                     "🌫",
+					"cold":                    "❄",
+					"partly_cloudy_day":       "🌤",
+					"mostly_cloudy_day":       "🌥",
+					"sun":                     "🌣",
+					"hot":                     "♨",
+					"day":                     "☀",
+					"blustery":                "⚑",
+					"rainy":                   "☂",
+					"cloudy":                  "☁",
+					"snowy":                   "☃",
+					"stormy":                  "☈",
+					"foggy":                   "🌁",
+					"sunny":                   "🌣",
+					"night":                   "☾",
+					"windy":                   "☴",
+					"not_available":           "<22>",
+					"unknown":                 "⚠"
+				}
+			}
+		},
+		"powerline.segments.common.time.fuzzy_time": {
+			"args": {
+				"unicode_text": true
+			}
+		},
+
+		"powerline.segments.vim.mode": {
+			"args": {
+				"override": {
+					"n":  "NORMAL",
+					"no": "N·OPER",
+					"v":  "VISUAL",
+					"V":  "V·LINE",
+					"^V": "V·BLCK",
+					"s":  "SELECT",
+					"S":  "S·LINE",
+					"^S": "S·BLCK",
+					"i":  "INSERT",
+					"R":  "RPLACE",
+					"Rv": "V·RPLC",
+					"c":  "COMMND",
+					"cv": "VIM·EX",
+					"ce": "NRM·EX",
+					"r":  "PROMPT",
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
+				}
+			}
+		},
+		"powerline.segments.vim.visual_range": {
+			"args": {
+				"CTRL_V_text": "{rows} × {vcols}",
+				"v_text_oneline": "C:{vcols}",
+				"v_text_multiline": "L:{rows}",
+				"V_text": "L:{rows}"
+			}
+		},
+		"powerline.segments.vim.readonly_indicator": {
+			"args": {
+				"text": "🔏"
+			}
+		},
+		"powerline.segments.vim.modified_indicator": {
+			"args": {
+				"text": "🖫⃥"
+			}
+		}
+	}
+}

powerline/config_files/themes/unicode.json

@@ -108,15 +108,15 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
+					"R":  "RPLACE",
-					"Rv": "V·RPLCE",
+					"Rv": "V·RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
+					"cv": "VIM·EX",
-					"ce": "EX",
+					"ce": "NRM·EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
+					"rm": "-MORE-",
-					"r?": "CONFIRM",
+					"r?": "CNFIRM",
-					"!":  "SHELL"
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config_files/themes/unicode_terminus.json

@@ -108,15 +108,15 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
+					"R":  "RPLACE",
-					"Rv": "V·RPLCE",
+					"Rv": "V·RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
+					"cv": "VIM·EX",
-					"ce": "EX",
+					"ce": "NRM·EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
+					"rm": "-MORE-",
-					"r?": "CONFIRM",
+					"r?": "CNFIRM",
-					"!":  "SHELL"
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/segments/common/wthr.py

@@ -38,7 +38,7 @@ weather_conditions_codes = (
 	('fog',                     'foggy' ),  # 20
 	('haze',                    'foggy' ),  # 21
 	('smoky',                   'foggy' ),  # 22
-	('blustery',                'foggy' ),  # 23
+	('blustery',                'windy' ),  # 23
 	('windy',                           ),  # 24
 	('cold',                    'day'   ),  # 25
 	('clouds',                  'cloudy'),  # 26