Skip to content

Commit 9a3f1d6

Browse files
foobaccafoobacca
committed
Merge branch 'master' of github.com:foobacca/dotfiles
* 'master' of github.com:foobacca/dotfiles: Split some tmux bindings into vi file Split tmux conf into smaller bits for re-usability add powerline set up Use powerline in tmux fresh - bring in upstream terminator solarized terminator: correct solarized pallete vim: powerline handles insert line, disable vim version fix powerline config in vim add vim powerline status stuff Conflicts: terminator.config
2 parents b448181 + 20dee3d commit 9a3f1d6

31 files changed

+907
-91
lines changed

‎freshrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fresh inputrc --file
1616

1717
fresh jasoncodes/dotfiles config/inputrc --file
1818
fresh tigrc --file
19-
fresh tmux.conf --file
2019
fresh jasoncodes/dotfiles config/sqliterc --file
2120

2221
# git
@@ -30,12 +29,21 @@ fresh jasoncodes/dotfiles aliases/editor.sh --file=~/.bashrc
3029

3130
# vim
3231
fresh gvimrc --file
32+
# note vimrc sources files from .dotfiles/vim in particular order
3333
fresh vimrc.vundle --file=~/.vimrc
3434

35+
# tmux
36+
fresh 'tmux/*' --file=~/.tmux.conf
37+
3538
# bin commands
3639
fresh 'bin/*' --bin
3740
fresh 'gitbin/*' --bin
3841

42+
# powerline
43+
fresh powerline --file=~/.config/powerline/
44+
45+
# terminator solarized sample config
46+
fresh ghuntley/terminator-solarized config --file=~/.config/terminator/config-solarized
3947

4048
# sack stuff - https://github.com/sampson-chen/sack
4149
fresh sampson-chen/sack sack --bin

‎powerline/colors.json

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
2+
"colors": {
3+
"black": 16,
4+
"white": 231,
5+
6+
"darkestgreen": 22,
7+
"darkgreen": 28,
8+
"mediumgreen": 70,
9+
"brightgreen": 148,
10+
11+
"darkestcyan": 23,
12+
"darkcyan": 74,
13+
"mediumcyan": 117,
14+
"brightcyan": 159,
15+
16+
"darkestblue": 24,
17+
"darkblue": 31,
18+
19+
"darkestred": 52,
20+
"darkred": 88,
21+
"mediumred": 124,
22+
"brightred": 160,
23+
"brightestred": 196,
24+
25+
"darkestpurple": 55,
26+
"mediumpurple": 98,
27+
"brightpurple": 189,
28+
29+
"darkorange": 94,
30+
"mediumorange": 166,
31+
"brightorange": 208,
32+
"brightestorange": 214,
33+
34+
"brightyellow": 220,
35+
36+
"gray0": 233,
37+
"gray1": 235,
38+
"gray2": 236,
39+
"gray3": 239,
40+
"gray4": 240,
41+
"gray5": 241,
42+
"gray6": 244,
43+
"gray7": 245,
44+
"gray8": 247,
45+
"gray9": 250,
46+
"gray10": 252,
47+
48+
"gray61": [14, "93a1a1"],
49+
"gray13": [8, "002b36"],
50+
51+
"royalblue5": [0, "073642"],
52+
"darkgreencopper": [10, "586e75"],
53+
"lightskyblue4": [11, "657b83"],
54+
"azure4": [12, "839496"],
55+
"lightyellow": [7, "eee8d5"],
56+
"oldlace": [15, "fdf6e3"],
57+
58+
"green": [2, "719e07"],
59+
"cyan": [6, "2aa198"],
60+
"blue": [4, "268bd2"],
61+
"red": [1, "dc322f"],
62+
"magenta": [5, "d33682"],
63+
"violet": [13, "6c71c4"],
64+
"orange": [9, "cb4b16"],
65+
"yellow": [3, "b58900"],
66+
67+
"lightyellowgreen": 106,
68+
"gold3": 178,
69+
"orangered": 202,
70+
71+
"steelblue": 67,
72+
"darkorange3": 166,
73+
"skyblue1": 117,
74+
"khaki1": 228
75+
},
76+
"gradients": {
77+
"green_yellow_red": [
78+
[190, 184, 178, 172, 166, 160],
79+
["8ae71c", "8ce71c", "8fe71c", "92e71c", "95e71d", "98e71d", "9ae71d", "9de71d", "a0e71e", "a3e71e", "a6e71e", "a8e71e", "abe71f", "aee71f", "b1e71f", "b4e71f", "b6e720", "b9e720", "bce720", "bfe720", "c2e821", "c3e721", "c5e621", "c7e521", "c9e522", "cbe422", "cde322", "cfe222", "d1e223", "d3e123", "d5e023", "d7df23", "d9df24", "dbde24", "dddd24", "dfdc24", "e1dc25", "e3db25", "e5da25", "e7d925", "e9d926", "e9d626", "e9d426", "e9d126", "e9cf27", "e9cc27", "e9ca27", "e9c727", "e9c528", "e9c228", "e9c028", "e9bd28", "e9bb29", "e9b829", "e9b629", "e9b329", "e9b12a", "e9ae2a", "e9ac2a", "e9a92a", "eaa72b", "eaa42b", "eaa22b", "ea9f2b", "ea9d2c", "ea9b2c", "ea982c", "ea962c", "ea942d", "ea912d", "ea8f2d", "ea8d2d", "ea8a2e", "ea882e", "ea862e", "ea832e", "ea812f", "ea7f2f", "ea7c2f", "ea7a2f", "eb7830", "eb7530", "eb7330", "eb7130", "eb6f31", "eb6c31", "eb6a31", "eb6831", "eb6632", "eb6332", "eb6132", "eb5f32", "eb5d33", "eb5a33", "eb5833", "eb5633", "eb5434", "eb5134", "eb4f34", "eb4d34", "ec4b35"]
80+
]
81+
}
82+
}

‎powerline/colorschemes/ipython/default.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "Default color scheme for IPython prompt",
3+
"groups": {
4+
"virtualenv": { "fg": "white", "bg": "darkcyan" },
5+
"prompt": { "fg": "gray9", "bg": "gray4" }
6+
}
7+
}

‎powerline/colorschemes/shell/default.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Default color scheme for shell prompts",
3+
"groups": {
4+
"user": { "fg": "white", "bg": "darkblue", "attr": ["bold"] },
5+
"superuser": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
6+
"virtualenv": { "fg": "white", "bg": "darkcyan" },
7+
"branch": { "fg": "gray9", "bg": "gray2" },
8+
"cwd": { "fg": "gray9", "bg": "gray4" },
9+
"cwd:current_folder": { "fg": "gray10", "bg": "gray4", "attr": ["bold"] },
10+
"cwd:divider": { "fg": "gray7", "bg": "gray4" },
11+
"hostname": { "fg": "brightyellow", "bg": "mediumorange" },
12+
"exit_fail": { "fg": "white", "bg": "darkestred" },
13+
"exit_success": { "fg": "white", "bg": "darkestgreen" }
14+
}
15+
}

‎powerline/colorschemes/shell/solarized.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Solarized Dark",
3+
"groups": {
4+
"user": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
5+
"superuser": { "fg": "oldlace", "bg": "red", "attr": ["bold"] },
6+
"virtualenv": { "fg": "oldlace", "bg": "green" },
7+
"branch": { "fg": "gray61", "bg": "royalblue5" },
8+
"cwd": { "fg": "lightyellow", "bg": "darkgreencopper" },
9+
"cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
10+
"cwd:divider": { "fg": "gray61", "bg": "darkgreencopper" },
11+
"hostname": { "fg": "oldlace", "bg": "darkgreencopper" },
12+
"exit_fail": { "fg": "oldlace", "bg": "red" },
13+
"exit_success": { "fg": "oldlace", "bg": "green" }
14+
}
15+
}

‎powerline/colorschemes/tmux/default.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "Default color scheme for terminal prompts",
3+
"groups": {
4+
"background:divider": { "fg": "gray5", "bg": "gray0" },
5+
"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
6+
"date": { "fg": "gray8", "bg": "gray2" },
7+
"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
8+
"time:divider": { "fg": "gray5", "bg": "gray2" },
9+
"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
10+
"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
11+
"weather": { "fg": "gray8", "bg": "gray0" },
12+
"weather_temp_cold": { "fg": "steelblue", "bg": "gray0" },
13+
"weather_temp_hot": { "fg": "darkorange3", "bg": "gray0" },
14+
"weather_condition_hot": { "fg": "khaki1", "bg": "gray0" },
15+
"weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" },
16+
"weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" },
17+
"uptime": { "fg": "gray8", "bg": "gray0" },
18+
"external_ip": { "fg": "gray8", "bg": "gray0" },
19+
"network_load": { "fg": "gray8", "bg": "gray0" },
20+
"system_load": { "fg": "gray8", "bg": "gray0" },
21+
"system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" },
22+
"system_load_bad": { "fg": "gold3", "bg": "gray0" },
23+
"system_load_ugly": { "fg": "orangered", "bg": "gray0" }
24+
}
25+
}

‎powerline/colorschemes/vim/default.json

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
{
2+
"name": "Default color scheme",
3+
"groups": {
4+
"background": { "fg": "white", "bg": "gray2" },
5+
"background:divider": { "fg": "gray6", "bg": "gray2" },
6+
"mode": { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] },
7+
"modified_indicator": { "fg": "brightyellow", "bg": "gray4", "attr": ["bold"] },
8+
"paste_indicator": { "fg": "white", "bg": "mediumorange", "attr": ["bold"] },
9+
"readonly_indicator": { "fg": "brightestred", "bg": "gray4" },
10+
"branch": { "fg": "gray9", "bg": "gray4" },
11+
"branch:divider": { "fg": "gray7", "bg": "gray4" },
12+
"file_directory": { "fg": "gray9", "bg": "gray4" },
13+
"file_name": { "fg": "white", "bg": "gray4", "attr": ["bold"] },
14+
"file_size": { "fg": "gray8", "bg": "gray2" },
15+
"file_name_no_file": { "fg": "gray9", "bg": "gray4", "attr": ["bold"] },
16+
"file_name_empty": { "fg": "gray9", "bg": "gray4" },
17+
"file_format": { "fg": "gray8", "bg": "gray2" },
18+
"file_encoding": { "fg": "gray8", "bg": "gray2" },
19+
"file_type": { "fg": "gray8", "bg": "gray2" },
20+
"file_vcs_status": { "fg": "brightestred", "bg": "gray4" },
21+
"file_vcs_status_M": { "fg": "brightyellow", "bg": "gray4" },
22+
"file_vcs_status_A": { "fg": "brightgreen", "bg": "gray4" },
23+
"line_percent": { "fg": "gray9", "bg": "gray4" },
24+
"line_percent_gradient": { "fg": "green_yellow_red", "bg": "gray4" },
25+
"line_current": { "fg": "gray1", "bg": "gray10", "attr": ["bold"] },
26+
"line_current_symbol": { "fg": "gray1", "bg": "gray10" },
27+
"col_current": { "fg": "gray6", "bg": "gray10" },
28+
"modified_buffers": { "fg": "brightyellow", "bg": "gray2" }
29+
},
30+
"mode_translations": {
31+
"nc": {
32+
"colors": {
33+
"brightyellow": "darkorange",
34+
"brightestred": "darkred",
35+
"gray0": "gray0",
36+
"gray1": "gray0",
37+
"gray2": "gray0",
38+
"gray3": "gray1",
39+
"gray4": "gray1",
40+
"gray5": "gray1",
41+
"gray6": "gray1",
42+
"gray7": "gray4",
43+
"gray8": "gray4",
44+
"gray9": "gray4",
45+
"gray10": "gray5",
46+
"white": "gray6",
47+
"green_yellow_red": "gray5"
48+
}
49+
},
50+
"i": {
51+
"colors": {
52+
"gray0": "darkestblue",
53+
"gray1": "darkestblue",
54+
"gray2": "darkestblue",
55+
"gray3": "darkblue",
56+
"gray4": "darkblue",
57+
"gray5": "darkestcyan",
58+
"gray6": "darkestcyan",
59+
"gray7": "darkestcyan",
60+
"gray8": "mediumcyan",
61+
"gray9": "mediumcyan",
62+
"gray10": "mediumcyan",
63+
"green_yellow_red": "gray5"
64+
},
65+
"groups": {
66+
"mode": { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
67+
"background:divider": { "fg": "darkcyan", "bg": "darkestblue" },
68+
"branch:divider": { "fg": "darkcyan", "bg": "darkblue" }
69+
}
70+
},
71+
"v": {
72+
"groups": {
73+
"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
74+
}
75+
},
76+
"V": {
77+
"groups": {
78+
"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
79+
}
80+
},
81+
"^V": {
82+
"groups": {
83+
"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
84+
}
85+
},
86+
"R": {
87+
"groups": {
88+
"mode": { "fg": "white", "bg": "brightred", "attr": ["bold"] }
89+
}
90+
}
91+
}
92+
}

‎powerline/colorschemes/vim/solarized.json

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
2+
"name": "Solarized Dark",
3+
"groups": {
4+
"background": { "fg": "oldlace", "bg": "royalblue5" },
5+
"background:divider": { "fg": "lightskyblue4", "bg": "royalblue5" },
6+
"mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] },
7+
"modified_indicator": { "fg": "yellow", "bg": "darkgreencopper", "attr": ["bold"] },
8+
"paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
9+
"readonly_indicator": { "fg": "red", "bg": "darkgreencopper" },
10+
"branch": { "fg": "lightyellow", "bg": "darkgreencopper" },
11+
"branch:divider": { "fg": "gray61", "bg": "darkgreencopper" },
12+
"file_directory": { "fg": "lightyellow", "bg": "darkgreencopper" },
13+
"file_name": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
14+
"file_size": { "fg": "oldlace", "bg": "darkgreencopper" },
15+
"file_name_no_file": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
16+
"file_name_empty": { "fg": "oldlace", "bg": "darkgreencopper" },
17+
"file_format": { "fg": "gray61", "bg": "royalblue5" },
18+
"file_encoding": { "fg": "gray61", "bg": "royalblue5" },
19+
"file_type": { "fg": "gray61", "bg": "royalblue5" },
20+
"file_vcs_status": { "fg": "red", "bg": "darkgreencopper" },
21+
"file_vcs_status_M": { "fg": "yellow", "bg": "darkgreencopper" },
22+
"file_vcs_status_A": { "fg": "green", "bg": "darkgreencopper" },
23+
"line_percent": { "fg": "oldlace", "bg": "lightskyblue4" },
24+
"line_current": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] },
25+
"line_current_symbol": { "fg": "gray13", "bg": "lightyellow" },
26+
"col_current": { "fg": "azure4", "bg": "lightyellow" }
27+
},
28+
"mode_translations": {
29+
"nc": {
30+
"colors": {
31+
"darkgreencopper": "royalblue5",
32+
"lightskyblue4": "royalblue5",
33+
"azure4": "darkgreencopper",
34+
"gray61": "lightskyblue4",
35+
"lightyellow": "azure4",
36+
"oldlace": "gray61"
37+
}
38+
},
39+
"i": {
40+
"groups": {
41+
"background": { "fg": "oldlace", "bg": "darkgreencopper" },
42+
"background:divider": { "fg": "lightyellow", "bg": "darkgreencopper" },
43+
"mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
44+
"modified_indicator": { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] },
45+
"paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
46+
"readonly_indicator": { "fg": "red", "bg": "lightyellow" },
47+
"branch": { "fg": "darkgreencopper", "bg": "lightyellow" },
48+
"branch:divider": { "fg": "lightskyblue4", "bg": "lightyellow" },
49+
"file_directory": { "fg": "darkgreencopper", "bg": "lightyellow" },
50+
"file_name": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
51+
"file_size": { "fg": "royalblue5", "bg": "lightyellow" },
52+
"file_name_no_file": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
53+
"file_name_empty": { "fg": "royalblue5", "bg": "lightyellow" },
54+
"file_format": { "fg": "lightyellow", "bg": "darkgreencopper" },
55+
"file_encoding": { "fg": "lightyellow", "bg": "darkgreencopper" },
56+
"file_type": { "fg": "lightyellow", "bg": "darkgreencopper" },
57+
"file_vcs_status": { "fg": "red", "bg": "lightyellow" },
58+
"file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow" },
59+
"file_vcs_status_A": { "fg": "green", "bg": "lightyellow" },
60+
"line_percent": { "fg": "oldlace", "bg": "gray61" },
61+
"line_current": { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] },
62+
"line_current_symbol": { "fg": "gray13", "bg": "oldlace" },
63+
"col_current": { "fg": "azure4", "bg": "oldlace" }
64+
}
65+
},
66+
"v": {
67+
"groups": {
68+
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
69+
}
70+
},
71+
"V": {
72+
"groups": {
73+
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
74+
}
75+
},
76+
"R": {
77+
"groups": {
78+
"mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }
79+
}
80+
}
81+
}
82+
}

‎powerline/colorschemes/wm/default.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "Default color scheme for window managers",
3+
"groups": {
4+
"background:divider": { "fg": "gray5", "bg": "gray0" },
5+
"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
6+
"date": { "fg": "gray8", "bg": "gray2" },
7+
"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
8+
"time:divider": { "fg": "gray5", "bg": "gray2" },
9+
"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
10+
"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
11+
"weather": { "fg": "gray8", "bg": "gray0" },
12+
"weather_temp_cold": { "fg": "steelblue", "bg": "gray0" },
13+
"weather_temp_hot": { "fg": "darkorange3", "bg": "gray0" },
14+
"weather_condition_hot": { "fg": "khaki1", "bg": "gray0" },
15+
"weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" },
16+
"weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" },
17+
"uptime": { "fg": "gray8", "bg": "gray0" },
18+
"external_ip": { "fg": "gray8", "bg": "gray0" },
19+
"network_load": { "fg": "gray8", "bg": "gray0" },
20+
"system_load": { "fg": "gray8", "bg": "gray0" },
21+
"system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" },
22+
"system_load_bad": { "fg": "gold3", "bg": "gray0" },
23+
"system_load_ugly": { "fg": "orangered", "bg": "gray0" }
24+
}
25+
}

0 commit comments

Comments
 (0)