switched to hybrid theme for real

8 years ago · 03a0276a34
parent 924c660ce1
commit 03a0276a34
16 changed files with 174 additions and 253 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -4,6 +4,3 @@
 [submodule "zsh/zsh-completions"]
 	path = zsh/zsh-completions
 	url = https://github.com/zsh-users/zsh-completions.git
-[submodule "zsh/dircolors-solarized"]
-	path = zsh/dircolors-solarized
-	url = git@github.com:seebi/dircolors-solarized.git
--- a/alfred/Dash.alfredworkflow
+++ b/alfred/Dash.alfredworkflow
--- a/alfred/Hybrid.alfredappearance
+++ b/alfred/Hybrid.alfredappearance
@ -0,0 +1,61 @@
+{
+  "alfredtheme" : {
+    "result" : {
+      "textSpacing" : 5,
+      "subtext" : {
+        "size" : 11,
+        "colorSelected" : "#C5C8C6C4",
+        "font" : "Menlo",
+        "color" : "#70788065"
+      },
+      "shortcut" : {
+        "size" : 16,
+        "colorSelected" : "#C5C8C6FF",
+        "font" : "Menlo",
+        "color" : "#8C9340FF"
+      },
+      "backgroundSelected" : "#8C9340E4",
+      "text" : {
+        "size" : 16,
+        "colorSelected" : "#C5C8C6FF",
+        "font" : "Menlo",
+        "color" : "#707880E5"
+      },
+      "iconPaddingHorizontal" : 4,
+      "paddingVertical" : 4,
+      "iconSize" : 40
+    },
+    "search" : {
+      "paddingVertical" : 4,
+      "background" : "#0000001A",
+      "spacing" : 8,
+      "text" : {
+        "size" : 28,
+        "colorSelected" : "#000000FF",
+        "font" : "Menlo",
+        "color" : "#C5C8C6FF"
+      },
+      "backgroundSelected" : "#D8D8DBFF"
+    },
+    "window" : {
+      "color" : "#26292CFF",
+      "paddingHorizontal" : 4,
+      "width" : 559,
+      "borderPadding" : 0,
+      "borderColor" : "#0000007F",
+      "blur" : 0,
+      "roundness" : 3,
+      "paddingVertical" : 4
+    },
+    "credit" : "Steffen Rademacker",
+    "separator" : {
+      "color" : "#CBCBCBF3",
+      "thickness" : 0
+    },
+    "scrollbar" : {
+      "color" : "#707880FF",
+      "thickness" : 2
+    },
+    "name" : "Hybrid"
+  }
+}
--- a/alfred/Solarized.alfredappearance
+++ b/alfred/Solarized.alfredappearance
@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>background</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmAIONjAw+g7GwMD4Bhg==
-	</data>
-	<key>border</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmAIONjAw+g7GwMD6DAAAAP4Y=
-	</data>
-	<key>cornerRoundness</key>
-	<integer>3</integer>
-	<key>credits</key>
-	<string>Steffen Rademacker</string>
-	<key>imageStyle</key>
-	<integer>9</integer>
-	<key>name</key>
-	<string>Solarized</string>
-	<key>resultPaddingSize</key>
-	<integer>2</integer>
-	<key>resultSelectedBackgroundColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmAIO5uDg+g+LgYD4Bhg==
-	</data>
-	<key>resultSelectedSubtextColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg/Du7j6DjIsLP4OOjQ0/AYY=
-	</data>
-	<key>resultSelectedTextColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg4mICD+DmpkZP4OamRk/AYY=
-	</data>
-	<key>resultSubtextColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg5WUlD6DysjIPoPW1NQ+AYY=
-	</data>
-	<key>resultSubtextFont</key>
-	<string>Menlo</string>
-	<key>resultSubtextFontSize</key>
-	<integer>1</integer>
-	<key>resultTextColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg5WUlD6DysjIPoPW1NQ+AYY=
-	</data>
-	<key>resultTextFont</key>
-	<string>Menlo</string>
-	<key>resultTextFontSize</key>
-	<integer>2</integer>
-	<key>scrollbarColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg5WUlD6DysjIPoPW1NQ+AYY=
-	</data>
-	<key>searchBackgroundColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmAIO5uDg+g+LgYD4Bhg==
-	</data>
-	<key>searchFont</key>
-	<string>Menlo</string>
-	<key>searchFontSize</key>
-	<integer>2</integer>
-	<key>searchForegroundColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg4mICD+DmpkZP4OamRk/AYY=
-	</data>
-	<key>searchPaddingSize</key>
-	<integer>0</integer>
-	<key>searchSelectionBackgroundColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMGhANA
-	QECEhIQITlNTdHJpbmcBlIQBKwZTeXN0ZW2GhJaYG3NlbGVjdGVkVGV4dEJhY2tncm91
-	bmRDb2xvcoaEk5UDhAJmZoOrqio/AYaG
-	</data>
-	<key>searchSelectionForegroundColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMDhAJm
-	ZgABhg==
-	</data>
-	<key>separatorColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmAIONjAw+g7GwMD4Bhg==
-	</data>
-	<key>shortcutColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmAIOIhwc/g8vJST8Bhg==
-	</data>
-	<key>shortcutFont</key>
-	<string>Menlo</string>
-	<key>shortcutFontSize</key>
-	<integer>2</integer>
-	<key>shortcutSelectedColor</key>
-	<data>
-	BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
-	ZmZmg7i3Nz+D+Pb2PoPKyMg9AYY=
-	</data>
-	<key>uid</key>
-	<string>alfred.theme.custom.1823705A-5CD1-4F9A-AF82-25D66D273188</string>
-	<key>widthSize</key>
-	<integer>3</integer>
-</dict>
-</plist>
--- a/hyperterm.js
+++ b/hyperterm.js
@ -8,28 +8,28 @@ module.exports = {
    windowSize: [ 900, 600 ],
    padding: '4px 4px 0',

-    // use solarized dark colors
-    cursorColor: '#839496',
-    backgroundColor: '#002b36',
-    foregroundColor: '#839496',
-    borderColor: '#073642',
+    // use hybrid colors
+    cursorColor: '#26fcff',
+    backgroundColor: '#1d1f21',
+    foregroundColor: '#c5c8c6',
+    borderColor: '#1d1f21',
    colors: [
-      '#073642',
-      '#dc322f',
-      '#859900',
-      '#b58900',
-      '#268db2',
-      '#d33682',
-      '#2aa198',
-      '#eee8d5',
-      '#002b36',
-      '#cb4b16',
-      '#586e75',
-      '#657b83',
-      '#839496',
-      '#6c71c4',
-      '#93a1a1',
-      '#fdf6e3'
+      '#282a2e',
+      '#a54242',
+      '#8c9440',
+      '#de935f',
+      '#5f819d',
+      '#85678f',
+      '#5e8d87',
+      '#707880',
+      '#373b41',
+      '#cc6666',
+      '#b5bd86',
+      '#f0c674',
+      '#81a2be',
+      '#b294bb',
+      '#8abeb7',
+      '#c5c8c6'
    ],

    // custom css, better text, no border/margins/rounded stuff
--- a/install/_install.sh
+++ b/install/_install.sh
@ -16,9 +16,7 @@ export PATH=/usr/local/bin:/usr/local/sbin:$PATH

 # install some neccessary brew packages
 brew install clipper
-brew install coreutils
 brew install git
-brew install hyperterm
 brew install tmux
 brew install zsh

@ -29,6 +27,7 @@ git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim

 # this is the minimal software used
 brew cask install forklift
+brew cask install hyperterm
 brew cask install owncloud

 # add a nice font
--- a/install/osx.sh
+++ b/install/osx.sh
@ -58,10 +58,10 @@ defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false
 # Disable smart dashes as they’re annoying when typing code
 defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -bool false

-# Trackpad: enable tap to click for this user and for the login screen
-defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true
-defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
-defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
+# Trackpad: disable tap to click for this user and for the login screen, the new macbooks touchpad is so sensitive
+defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool false
+defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 0
+defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 0

 # Enable full keyboard access for all controls
 # (e.g. enable Tab in modal dialogs)
--- a/other/SolarizedDark.terminal
+++ b/other/SolarizedDark.terminal
@ -5,17 +5,17 @@
 	<key>ANSIBlackColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEB8w
-	LjAzMTM3MjU0OTAyIDAuMTYwNzg0MzEzNyAwLjIAEAGAAtIQERITWiRjbGFzc25hbWVY
-	JGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRy
-	b290gAEIERojLTI3O0FITltihIaIjZihqay1x8rPAAAAAAAAAQEAAAAAAAAAGQAAAAAA
-	AAAAAAAAAAAAANE=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
+	LjE1Njg2Mjc0NTEgMC4xNjQ3MDU4ODI0IDAuMTgwMzkyMTU2OQAQAYAC0hAREhNaJGNs
+	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
+	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>ANSIBlueColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjEwNTg4MjM1MjkgMC40NTA5ODAzOTIyIDAuNzg0MzEzNzI1NQAQAYAC0hAREhNaJGNs
+	LjM3MjU0OTAxOTYgMC41MDU4ODIzNTI5IDAuNjE1Njg2Mjc0NQAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -23,17 +23,17 @@
 	<key>ANSIBrightBlackColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
-	IDAuMTI1NDkwMTk2MSAwLjE2MDc4NDMxMzcAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
-	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
-	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
-	AAAAAAAAAM4=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
+	LjIxNTY4NjI3NDUgMC4yMzEzNzI1NDkgMC4yNTQ5MDE5NjA4ABABgALSEBESE1okY2xh
+	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
+	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
 	</data>
 	<key>ANSIBrightBlueColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjQzOTIxNTY4NjMgMC41MDk4MDM5MjE2IDAuNTE3NjQ3MDU4OAAQAYAC0hAREhNaJGNs
+	LjUwNTg4MjM1MjkgMC42MzUyOTQxMTc2IDAuNzQ1MDk4MDM5MgAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -42,7 +42,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjUwNTg4MjM1MjkgMC41NjQ3MDU4ODI0IDAuNTY0NzA1ODgyNAAQAYAC0hAREhNaJGNs
+	LjU0MTE3NjQ3MDYgMC43NDUwOTgwMzkyIDAuNzE3NjQ3MDU4OAAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -51,7 +51,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjI3NDUwOTgwMzkgMC4zNTY4NjI3NDUxIDAuMzg0MzEzNzI1NQAQAYAC0hAREhNaJGNs
+	LjcwOTgwMzkyMTYgMC43NDExNzY0NzA2IDAuNDA3ODQzMTM3MwAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -60,7 +60,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjM0NTA5ODAzOTIgMC4zNDExNzY0NzA2IDAuNzI5NDExNzY0NwAQAYAC0hAREhNaJGNs
+	LjY5ODAzOTIxNTcgMC41ODAzOTIxNTY5IDAuNzMzMzMzMzMzMwAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -68,17 +68,16 @@
 	<key>ANSIBrightRedColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECkw
-	Ljc1Mjk0MTE3NjUgMC4yMTE3NjQ3MDU5IDAuMDAzOTIxNTY4NjI3ABABgALSEBESE1ok
-	Y2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJj
-	aGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYo6Qkpeiq7O2v9HU2QAAAAAAAAEBAAAA
-	AAAAABkAAAAAAAAAAAAAAAAAAADb
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NMMC44
+	IDAuNCAwLjQAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhO
+	U09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltib3Fz
+	eIOMlJegsrW6AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALw=
 	</data>
 	<key>ANSIBrightWhiteColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljk5MjE1Njg2MjcgMC45NjA3ODQzMTM3IDAuODU4ODIzNTI5NAAQAYAC0hAREhNaJGNs
+	Ljc3MjU0OTAxOTYgMC43ODQzMTM3MjU1IDAuNzc2NDcwNTg4MgAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -87,7 +86,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjMyMTU2ODYyNzUgMC40MDc4NDMxMzczIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs
+	Ljk0MTE3NjQ3MDYgMC43NzY0NzA1ODgyIDAuNDU0OTAxOTYwOAAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -96,7 +95,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
-	LjEyMTU2ODYyNzUgMC41Njg2Mjc0NTEgMC41MjE1Njg2Mjc1ABABgALSEBESE1okY2xh
+	LjM2ODYyNzQ1MSAwLjU1Mjk0MTE3NjUgMC41Mjk0MTE3NjQ3ABABgALSEBESE1okY2xh
 	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
 	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
 	ABkAAAAAAAAAAAAAAAAAAADY
@ -104,35 +103,35 @@
 	<key>ANSIGreenColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
-	LjQ0MzEzNzI1NDkgMC41NDExNzY0NzA2IDAAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
-	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
-	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
-	AAAAAAAAAM4=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
+	LjU0OTAxOTYwNzggMC41ODAzOTIxNTY5IDAuMjUwOTgwMzkyMgAQAYAC0hAREhNaJGNs
+	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
+	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>ANSIMagentaColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
-	Ljc4NDMxMzcyNTUgMC4wODYyNzQ1MDk4IDAuNDMxMzcyNTQ5ABABgALSEBESE1okY2xh
-	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
-	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
-	ABkAAAAAAAAAAAAAAAAAAADY
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
+	LjUyMTU2ODYyNzUgMC40MDM5MjE1Njg2IDAuNTYwNzg0MzEzNwAQAYAC0hAREhNaJGNs
+	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
+	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>ANSIRedColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECgw
-	LjgyNzQ1MDk4MDQgMC4wOTgwMzkyMTU2OSAwLjExNzY0NzA1ODgAEAGAAtIQERITWiRj
-	bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo
-	aXZlctEXGFRyb290gAEIERojLTI3O0FITltijY+RlqGqsrW+0NPYAAAAAAAAAQEAAAAA
-	AAAAGQAAAAAAAAAAAAAAAAAAANo=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
+	LjY0NzA1ODgyMzUgMC4yNTg4MjM1Mjk0IDAuMjU4ODIzNTI5NAAQAYAC0hAREhNaJGNs
+	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
+	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>ANSIWhiteColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjkxMzcyNTQ5MDIgMC44ODYyNzQ1MDk4IDAuNzg4MjM1Mjk0MQAQAYAC0hAREhNaJGNs
+	LjQzOTIxNTY4NjMgMC40NzA1ODgyMzUzIDAuNTAxOTYwNzg0MwAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -140,20 +139,20 @@
 	<key>ANSIYellowColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
-	LjY0NzA1ODgyMzUgMC40NjY2NjY2NjY3IDAAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
-	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
-	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
-	AAAAAAAAAM4=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
+	Ljg3MDU4ODIzNTMgMC41NzY0NzA1ODgyIDAuMzcyNTQ5MDE5NgAQAYAC0hAREhNaJGNs
+	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
+	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>BackgroundColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww
-	IDAuMTI1NDkwMTk2MSAwLjE2MDc4NDMxMzcAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs
-	YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290
-	gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA
-	AAAAAAAAAM4=
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
+	LjExMzcyNTQ5MDIgMC4xMjE1Njg2Mjc1IDAuMTI5NDExNzY0NwAQAYAC0hAREhNaJGNs
+	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
+	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
+	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
 	</data>
 	<key>Bell</key>
 	<false/>
@ -163,21 +162,15 @@
 	<false/>
 	<key>BlinkText</key>
 	<false/>
-	<key>CursorBlink</key>
-	<false/>
 	<key>CursorColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjEwNTg4MjM1MjkgMC40NTA5ODAzOTIyIDAuNzg0MzEzNzI1NQAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
+	LjE2ODYyNzQ1MSAwLjkyMTU2ODYyNzUgMC45MjE1Njg2Mjc1ABABgALSEBESE1okY2xh
+	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
+	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
 	</data>
-	<key>CursorType</key>
-	<integer>0</integer>
-	<key>DisableANSIColor</key>
-	<false/>
 	<key>Font</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
@ -189,36 +182,36 @@
 	</data>
 	<key>FontAntialias</key>
 	<true/>
-	<key>FontHeightSpacing</key>
-	<real>0.90000000000000002</real>
-	<key>FontWidthSpacing</key>
-	<real>1</real>
 	<key>ProfileCurrentVersion</key>
 	<real>2.04</real>
 	<key>SelectionColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjEwMTk2MDc4NDMgMC40NTQ5MDE5NjA4IDAuNzk2MDc4NDMxNAAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw
+	LjM2ODYyNzQ1MSAwLjU1Mjk0MTE3NjUgMC41Mjk0MTE3NjQ3ABABgALSEBESE1okY2xh
+	c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
+	ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
+	ABkAAAAAAAAAAAAAAAAAAADY
 	</data>
 	<key>ShouldRestoreContent</key>
 	<false/>
+	<key>ShowActiveProcessArgumentsInTitle</key>
+	<true/>
+	<key>ShowActiveProcessInTitle</key>
+	<true/>
+	<key>ShowActivityIndicatorInTab</key>
+	<false/>
 	<key>ShowDimensionsInTitle</key>
 	<false/>
 	<key>ShowRepresentedURLPathInTitle</key>
 	<true/>
 	<key>ShowTerminalInDockIcon</key>
 	<false/>
-	<key>ShowWindowSettingsNameInTitle</key>
-	<false/>
 	<key>TextBoldColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjUwNTg4MjM1MjkgMC41NjQ3MDU4ODI0IDAuNTY0NzA1ODgyNAAQAYAC0hAREhNaJGNs
+	Ljc3MjU0OTAxOTYgMC43ODQzMTM3MjU1IDAuNzc2NDcwNTg4MgAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@ -226,26 +219,21 @@
 	<key>TextColor</key>
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
-	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjQzOTIxNTY4NjMgMC41MDk4MDM5MjE2IDAuNTE3NjQ3MDU4OAAQAYAC0hAREhNaJGNs
-	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
-	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
-	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
+	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NGMSAx
+	IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVj
+	dF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltiaWttcn2GjpGa
+	rK+0AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALY=
 	</data>
 	<key>UseBrightBold</key>
-	<false/>
+	<true/>
 	<key>VisualBell</key>
 	<false/>
-	<key>VisualBellOnlyWhenMuted</key>
-	<false/>
 	<key>columnCount</key>
 	<integer>160</integer>
 	<key>name</key>
-	<string>SolarizedDark</string>
+	<string>Hybrid</string>
 	<key>rowCount</key>
 	<integer>48</integer>
-	<key>shellExitAction</key>
-	<integer>0</integer>
 	<key>type</key>
 	<string>Window Settings</string>
 	<key>warnOnShellCloseAction</key>
--- a/vim/config/bundles.vim
+++ b/vim/config/bundles.vim
@ -23,18 +23,18 @@ endfunction
 NeoBundle 'Shougo/neocomplete'
 NeoBundle 'Shougo/neosnippet'
 NeoBundle 'Shougo/unite.vim'
-NeoBundle 'altercation/vim-colors-solarized'
 NeoBundle 'cakebaker/scss-syntax.vim'
 NeoBundle 'christoomey/vim-tmux-navigator'
+NeoBundle 'cocopon/lightline-hybrid.vim'
 NeoBundle 'editorconfig/editorconfig-vim'
+NeoBundle 'gcorne/vim-sass-lint'
 NeoBundle 'haya14busa/incsearch.vim'
 NeoBundle 'itchyny/lightline.vim'
 NeoBundle 'justinmk/vim-sneak'
 NeoBundle 'mattn/emmet-vim/'
 NeoBundle 'moll/vim-node'
-NeoBundle 'scrooloose/syntastic'
-NeoBundle 'gcorne/vim-sass-lint'
 NeoBundle 'mtscout6/syntastic-local-eslint.vim'
+NeoBundle 'scrooloose/syntastic'
 NeoBundle 'sheerun/vim-polyglot'
 NeoBundle 'tpope/vim-commentary'
 NeoBundle 'tpope/vim-fugitive'
@ -43,5 +43,6 @@ NeoBundle 'tpope/vim-repeat'
 NeoBundle 'tpope/vim-surround'
 NeoBundle 'tpope/vim-unimpaired'
 NeoBundle 'tpope/vim-vinegar'
+NeoBundle 'w0ng/vim-hybrid'
 NeoBundle 'webgefrickel/vim-snippets'
 NeoBundle 'wellle/tmux-complete.vim'
--- a/vim/config/colorscheme.vim
+++ b/vim/config/colorscheme.vim
@ -11,16 +11,7 @@ set cmdheight=2     " command window is 2 high
 set cpoptions+=$    " Add a $ to the end of a selection
 set cpoptions+=J    " 2 spaces after a sentence for easier text manupulation

-colorscheme solarized
-let g:solarized_termtrans = 1
-set background=dark " and a dark background of course
-set t_Co=256        " 256 color terminal FTW
-
-" minor optical fix vor syntastic - background for extra-error-column
-highlight SignColumn ctermbg=0
-
-" italic comments, yeah
-highlight Comment cterm=italic
-
-" bold concealed functions
-highlight Conceal cterm=bold
+let g:hybrid_reduced_contrast = 0
+let g:hybrid_custom_term_colors = 1
+set background=dark
+colorscheme hybrid
--- a/vim/config/plugins/lightline.vim
+++ b/vim/config/plugins/lightline.vim
@ -2,7 +2,7 @@
 "======================================================================

 let g:lightline = {
-  \ 'colorscheme': 'solarized_dark',
+  \ 'colorscheme': 'hybrid',
  \ 'active': {
  \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ],
  \   'right': [ [ 'lineinfo' ], [ 'fileformat', 'fileencoding', 'filetype' ] ]
--- a/zsh/aliases
+++ b/zsh/aliases
@ -35,9 +35,9 @@ alias -s txt=vim
 # clipper -- https://github.com/wincent/clipper
 alias clip="nc localhost 8377"

-# gnu coreutils
-alias ls="gls -al --color=auto"
-alias l='gls -al --color=auto'
+# better ls / l command
+alias ls='ls -alGp'
+alias l='ls -alGp'

 # Gitty gitgit
 alias g="git"
--- a/zsh/zsh
+++ b/zsh/zsh
@ -1 +0,0 @@
-/Users/webgefrickel/dotfiles/zsh
--- a/zsh/zsh-completions
+++ b/zsh/zsh-completions
@ -1 +1 @@
-Subproject commit 3e81c156e7bb42b916138bf7990009a1ad78b517
+Subproject commit e09fa74f2d1bf66fd4838294451b42d872c9b71b
--- a/zsh/zsh-syntax-highlighting
+++ b/zsh/zsh-syntax-highlighting
@ -1 +1 @@
-Subproject commit 367929502fc1e6cb5a1bacc5ff8cc8a317cb998a
+Subproject commit 11c908196700c00c4662295f44747a5826615c4b
--- a/5
+++ b/5
@ -62,9 +62,8 @@ source $HOME/dotfiles/zsh/zsh-completions/zsh-completions.plugin.zsh
 source $HOME/dotfiles/zsh/forklift/forklift.plugin.zsh

 # nice dircolors -- this requires installed coreutils and lscolors fallback
-autoload colors; colors;
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
-eval `gdircolors $HOME/dotfiles/zsh/dircolors-solarized/dircolors.256dark`
+export CLICOLOR=1
+export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx

 # fasd
 eval "$(fasd --init auto)"