Sublime settings and packages.

2012-10-16 16:11:28 +04:00
parent 250fc306c2
commit 284fd62df2
16 changed files with 357 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.cache
--- a/2
+++ b/2
@@ -55,7 +55,7 @@ command -v brew >/dev/null 2>&1 && [ -r "$(brew --prefix)/etc/bash_completion" ]
 [ -e "~/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2)" scp sftp ssh

 # Nano is default editor
-export EDITOR='nano'		
+export EDITOR='nano'

 # Tell ls to be colourful
 export CLICOLOR=1
--- a/setup/bash.sh
+++ b/setup/bash.sh
--- a/setup/imgo.sh
+++ b/setup/imgo.sh
--- a/setup/sublime-packages.sh
+++ b/setup/sublime-packages.sh
@@ -1,21 +1,26 @@
-# Installs/updates Sublime packages from GitHub
+# Installs/updates Sublime packages
+#
+# 1. Installs Package Control (all plugins listed in `Package Control.sublime-settings` will be installed after Sublime restarts).
+# 2. Installs some packages from GitHub.

 if [ `uname` == 'Darwin' ]; then
-	cd ~/Library/Application\ Support/Sublime\ Text\ 2/Packages
+	cd ~/Library/Application\ Support/Sublime\ Text\ 2/Installed\ Packages
 else
-	cd ~/AppData/Roaming/Sublime\ Text\ 2/Packages
+	cd ~/AppData/Roaming/Sublime\ Text\ 2/Installed\ Packages
 fi

-# Emmet (ex. Zen Coding)
-if [ -d ./emmet-sublime ]; then
-	echo "Updating Emmet..."
-	cd emmet-sublime
-	git pull
-	cd ..
-else
-	echo "Installing Emmet..."
-	git clone git://github.com/sergeche/emmet-sublime.git
-fi
+#
+# Package Control
+#
+
+[ ! -f Package\ Control.sublime-package ] && curl -o Package\ Control.sublime-package http://sublime.wbond.net/Package%20Control.sublime-package
+
+
+#
+# GitHub
+#
+
+cd ../Packages

 # Hayaku Bundle
 if [ -d ./hayaku ]; then
--- a/setup/sublime-settings.sh
+++ b/setup/sublime-settings.sh
@@ -0,0 +1,11 @@
+# Enables Sublime settings syncronization
+
+if [ `uname` == 'Darwin' ]; then
+	cd ~/Library/Application\ Support/Sublime\ Text\ 2/Packages
+else
+	cd ~/AppData/Roaming/Sublime\ Text\ 2/Packages
+fi
+
+[ ! -d ../Packages.bak ] && mkdir ../Packages.bak
+mv User ../Packages.bak/User
+ln -s ~/dotfiles/sublime/User User
--- a/(OSX).sublime-keymap
+++ b/(OSX).sublime-keymap
@@ -0,0 +1,4 @@
+[
+	{ "keys": ["ctrl+d"], "command": "duplicate_line" },
+	{ "keys": ["ctrl+y"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} }
+]
--- a/(Windows).sublime-keymap
+++ b/(Windows).sublime-keymap
@@ -0,0 +1,4 @@
+[
+	{ "keys": ["ctrl+d"], "command": "duplicate_line" },
+	{ "keys": ["ctrl+y"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} }
+]
--- a/Control.sublime-settings
+++ b/Control.sublime-settings
@@ -0,0 +1,17 @@
+{
+	"auto_upgrade_last_run": 1350388642,
+	"installed_packages":
+	[
+		"AdvancedNewFile",
+		"emmet-sublime",
+		"Inc-Dec-Value",
+		"Package Control",
+		"Stylus",
+		"SublimeLinter",
+		"Theme - Soda"
+	],
+	"repositories":
+	[
+		"https://github.com/sergeche/emmet-sublime"
+	]
+}
--- a/sublime/User/Preferences.sublime-settings
+++ b/sublime/User/Preferences.sublime-settings
@@ -0,0 +1,29 @@
+{
+	"auto_complete_delay": 1000,
+	"auto_match_enabled": false,
+	"color_scheme": "Packages/User/Tomorrow.tmTheme",
+	"default_line_ending": "unix",
+	"detect_indentation": false,
+	"create_window_at_startup": false,
+	"open_files_in_new_window": false,
+	"drag_text": false,
+	"fallback_encoding": "Cyrillic (Windows 1251)",
+	"font_face": "Consolas",
+	"font_size": 14,
+	"highlight_line": true,
+	"ignored_packages": [
+		"Vintage"
+	],
+	"rulers": [
+		120
+	],
+	"save_on_focus_lost": true,
+	"tab_completion": true,
+	"detect_slow_plugins": false,
+	"theme": "Soda Light.sublime-theme",
+
+	// Hayaku
+	"hayaku_CSS_whitespace_after_colon": "",
+	"hayaku_CSS_colors_case": "lowercase",
+	"hayaku_CSS_numbers_leading_zero": false
+}
--- a/sublime/User/Stylus.sublime-settings
+++ b/sublime/User/Stylus.sublime-settings
@@ -0,0 +1,14 @@
+{
+	"disable_tab_abbreviations": true,
+
+	// Whitespaces
+	"hayaku_CSS_whitespace_block_end_before": "\n",
+
+	// Syntax quirks
+	"hayaku_CSS_syntax_no_curly_braces": false,  // Don't print braces for code blocks
+	"hayaku_CSS_syntax_no_semicolons": false,  // Don't print the semicolon at the end of rule
+	"hayaku_CSS_syntax_no_colons": false,  // Don't print colon between property and value
+
+	// Prefixes
+	"hayaku_CSS_prefixes_disable": true  // Disable the prefixes at all, like if using nib	
+}
--- a/sublime/User/SublimeLinter.sublime-settings
+++ b/sublime/User/SublimeLinter.sublime-settings
@@ -0,0 +1,6 @@
+{
+	"sublimelinter_delay": 1,
+	"sublimelinter_mark_style": "none",
+	"sublimelinter_gutter_marks": true,
+	"sublimelinter_notes": true
+}
--- a/sublime/User/Tomorrow.tmTheme
+++ b/sublime/User/Tomorrow.tmTheme
@@ -0,0 +1,245 @@
+<?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>comment</key>
+	<string>http://chriskempson.com</string>
+	<key>name</key>
+	<string>Tomorrow</string>
+	<key>settings</key>
+	<array>
+		<dict>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#FFFFFF</string>
+				<key>caret</key>
+				<string>#AEAFAD</string>
+				<key>foreground</key>
+				<string>#4D4D4C</string>
+				<key>invisibles</key>
+				<string>#D1D1D1</string>
+				<key>lineHighlight</key>
+				<string>#EFEFEF</string>
+				<key>selection</key>
+				<string>#D6D6D6</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Comment</string>
+			<key>scope</key>
+			<string>comment</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#8E908C</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Foreground</string>
+			<key>scope</key>
+			<string>keyword.operator.class, constant.other, source.php.embedded.line</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#666969</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Variable, String Link, Regular Expression, Tag Name</string>
+			<key>scope</key>
+			<string>variable, support.other.variable, string.other.link, string.regexp, entity.name.tag, entity.other.attribute-name, meta.tag, declaration.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#C82829</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Number, Constant, Function Argument, Tag Attribute, Embedded</string>
+			<key>scope</key>
+			<string>constant.numeric, constant.language, support.constant, constant.character, variable.parameter, punctuation.section.embedded, keyword.other.unit</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#F5871F</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Class, Support</string>
+			<key>scope</key>
+			<string>entity.name.class, entity.name.type.class, support.type, support.class</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#C99E00</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>String, Symbols, Inherited Class, Markup Heading</string>
+			<key>scope</key>
+			<string>string, constant.other.symbol, entity.other.inherited-class, markup.heading</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#718C00</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Operator, Misc</string>
+			<key>scope</key>
+			<string>keyword.operator, constant.other.color</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#3E999F</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Function, Special Method, Block Level</string>
+			<key>scope</key>
+			<string>entity.name.function, meta.function-call, support.function, keyword.other.special-method, meta.block-level</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#4271AE</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Keyword, Storage</string>
+			<key>scope</key>
+			<string>keyword, storage, storage.type</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#8959A8</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Invalid</string>
+			<key>scope</key>
+			<string>invalid</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#C82829</string>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#FFFFFF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Separator</string>
+			<key>scope</key>
+			<string>meta.separator</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#4271AE</string>
+				<key>foreground</key>
+				<string>#FFFFFF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Deprecated</string>
+			<key>scope</key>
+			<string>invalid.deprecated</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#8959A8</string>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#FFFFFF</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Diff foreground</string>
+			<key>scope</key>
+			<string>markup.inserted.diff, markup.deleted.diff, meta.diff.header.to-file, meta.diff.header.from-file</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#FFFFFF</string>
+			</dict>
+		</dict>				
+		<dict>
+			<key>name</key>
+			<string>Diff insertion</string>
+			<key>scope</key>
+			<string>markup.inserted.diff, meta.diff.header.to-file</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#718c00</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Diff deletion</string>
+			<key>scope</key>
+			<string>markup.deleted.diff, meta.diff.header.from-file</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#c82829</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Diff header</string>
+			<key>scope</key>
+			<string>meta.diff.header.from-file, meta.diff.header.to-file</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#FFFFFF</string>
+				<key>background</key>
+				<string>#4271ae</string>
+			</dict>
+		</dict>		
+		<dict>
+			<key>name</key>
+			<string>Diff range</string>
+			<key>scope</key>
+			<string>meta.diff.range</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#3e999f</string>
+			</dict>
+		</dict>
+	</array>
+	<key>uuid</key>
+	<string>82CCD69C-F1B1-4529-B39E-780F91F07604</string>
+</dict>
+</plist>
--- a/sublime/User/Tomorrow.tmTheme.cache
+++ b/sublime/User/Tomorrow.tmTheme.cache
--- a/sublime/User/console-log.sublime-snippet
+++ b/sublime/User/console-log.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[
+console.log($1);
+]]></content>
+	<tabTrigger>cl</tabTrigger>
+</snippet>
--- a/sync.py
+++ b/sync.py
@@ -9,7 +9,7 @@ Source: https://gist.github.com/490016
 import os
 import glob

-EXCLUDE = ['tools', 'color', 'setup',' sync.py', 'Readme.md']
+EXCLUDE = ['tools', 'color', 'setup', 'sublime', ' sync.py', 'Readme.md', '.gitignore']
 NO_DOT_PREFIX = ['bin']

 def force_remove(path):