Move all unicode characters from themes to powerline.json

powerline/config_files/themes/powerline.json

@@ -9,5 +9,36 @@
 			"soft": " "
 		}
 	},
-	"spaces": 1
+	"spaces": 1,
+	"segment_data": {
+		"branch": {
+			"before": " "
+		},
+
+		"line_current_symbol": {
+			"contents": " "
+		},
+
+		"powerline.segments.common.uptime": {
+			"before": "⇑  "
+		},
+		"powerline.segments.common.date": {
+			"before": "⌚ "
+		},
+		"powerline.segments.common.email_imap_alert": {
+			"before": "✉ "
+		},
+		"powerline.segments.common.virtualenv": {
+			"before": "ⓔ  "
+		},
+		"powerline.segments.common.hostname": {
+			"before": " "
+		},
+
+		"powerline.segments.vim.modified_indicator": {
+			"args": {
+				"text": "+"
+			}
+		}
+	}
 }

powerline/config_files/themes/shell/__main__.json

@@ -0,0 +1,14 @@
+{
+	"segment_data": {
+		"hostname": {
+			"args": {
+				"only_if_ssh": true
+			}
+		},
+		"cwd": {
+			"args": {
+				"dir_limit_depth": 3
+			}
+		}
+	}
+}

powerline/config_files/themes/shell/default.json

@@ -1,19 +1,5 @@
 {
 	"default_module": "powerline.segments.common",
-	"segment_data": {
-		"hostname": {
-			"before": " ",
-			"args": {
-				"only_if_ssh": true
-			}
-		},
-		"virtualenv": {
-			"before": "ⓔ  "
-		},
-		"branch": {
-			"before": " "
-		}
-	},
 	"segments": {
 		"left": [
 			{
@@ -30,10 +16,7 @@
 				"name": "virtualenv"
 			},
 			{
-				"name": "cwd",
+				"name": "cwd"
-				"args": {
-					"dir_limit_depth": 3
-				}
 			},
 			{
 				"module": "powerline.segments.shell",

powerline/config_files/themes/shell/default_leftonly.json

@@ -1,19 +1,5 @@
 {
 	"default_module": "powerline.segments.common",
-	"segment_data": {
-		"hostname": {
-			"before": " ",
-			"args": {
-				"only_if_ssh": true
-			}
-		},
-		"virtualenv": {
-			"before": "ⓔ  "
-		},
-		"branch": {
-			"before": " "
-		}
-	},
 	"segments": {
 		"left": [
 			{
@@ -29,10 +15,7 @@
 				"name": "branch"
 			},
 			{
-				"name": "cwd",
+				"name": "cwd"
-				"args": {
-					"dir_limit_depth": 3
-				}
 			},
 			{
 				"module": "powerline.segments.shell",

powerline/config_files/themes/tmux/default.json

@@ -1,13 +1,5 @@
 {
 	"default_module": "powerline.segments.common",
-	"segment_data": {
-		"uptime": {
-			"before": "⇑  "
-		},
-		"date": {
-			"before": "⌚ "
-		}
-	},
 	"segments": {
 		"right": [
 			{
@@ -19,7 +11,8 @@
 				"priority": 50
 			},
 			{
-				"name": "date"
+				"name": "date",
+				"before": ""
 			},
 			{
 				"name": "date",

powerline/config_files/themes/vim/__main__.json

@@ -0,0 +1,10 @@
+{
+	"segment_data": {
+		"line_percent": {
+			"args": {
+				"gradient": true
+			},
+			"after": "%"
+		}
+	}
+}

powerline/config_files/themes/vim/default.json

@@ -1,19 +1,4 @@
 {
-	"segment_data": {
-		"branch": {
-			"before": " "
-		},
-		"modified_indicator": {
-			"args": { "text": "+" }
-		},
-		"line_percent": {
-			"args": { "gradient": true },
-			"after": "%"
-		},
-		"line_current_symbol": {
-			"contents": " "
-		}
-	},
 	"segments": {
 		"left": [
 			{

powerline/config_files/themes/wm/default.json

@@ -7,19 +7,18 @@
 				"priority": 50
 			},
 			{
-				"name": "date"
+				"name": "date",
+				"before": ""
 			},
 			{
 				"name": "date",
 				"args": {
 					"format": "%H:%M",
 					"istime": true
-				},
+				}
-				"before": "⌚ "
 			},
 			{
 				"name": "email_imap_alert",
-				"before": "✉ ",
 				"priority": 10,
 				"args": {
 					"username": "",