diff --git a/README.md b/README.md index 4b8145c..8c3e6d2 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ Simple way to configure fresh installation of Sublime Text 3 Config includes: +- [Material Theme](http://equinusocio.github.io/material-theme/#/default) - [Soda Theme](http://buymeasoda.github.com/soda-theme/) -- Packages for work with GIT, CoffeeScript, SASS, LESS, Slim and HAML +- Packages for work with GIT, CoffeeScript, JavaScript, SASS, LESS, Slim and HAML - [ChangeQuotes](https://github.com/colinta/SublimeChangeQuotes). Quick changing quotes with `alt+shift+'`. - [AdvancedNewFile](https://packagecontrol.io/packages/AdvancedNewFile). Quick file creating with `opt+cmd+n`. - [All Autocomplete](https://packagecontrol.io/packages/All%20Autocomplete). All open files are searched for autocompletion candidates. diff --git a/bin/install b/bin/install index 8444506..d488812 100755 --- a/bin/install +++ b/bin/install @@ -51,7 +51,7 @@ else osascript -e "tell application \"$APP_NAME\" to quit" fi -if [ -d "$SUBLIME_DIR/Packages/Package Control" ] +if [ -a "$SUBLIME_DIR/Installed Packages/Package Control.sublime-package" ] then echo 'Package Control already installed.' else diff --git a/settings/Default (OSX).sublime-keymap b/settings/Default (OSX).sublime-keymap index d5a8e71..0478264 100644 --- a/settings/Default (OSX).sublime-keymap +++ b/settings/Default (OSX).sublime-keymap @@ -3,5 +3,7 @@ { "keys": ["alt+up"], "command": "move", "args": {"by": "stops", "empty_line": true, "forward": false} }, { "keys": ["alt+shift+'"], "command": "change_quotes" }, { "keys": ["super+shift+\\"], "command": "reveal_in_side_bar"}, - { "keys": ["super+\\"], "command": "toggle_side_bar" } + { "keys": ["super+\\"], "command": "toggle_side_bar" }, + { "keys": ["super+shift+c"], "command": "copy_path" }, + { "keys": ["super+shift+g"], "command": "side_bar_find_in_parent" } ] diff --git a/settings/Package Control.sublime-settings b/settings/Package Control.sublime-settings index 451d1c5..60c3b20 100644 --- a/settings/Package Control.sublime-settings +++ b/settings/Package Control.sublime-settings @@ -2,22 +2,28 @@ "auto_upgrade_last_run": null, "installed_packages": [ - "ChangeQuotes", + "A File Icon", + "AdvancedNewFile", + "All Autocomplete", + "Babel", "Better CoffeeScript", + "Case Conversion", + "ChangeQuotes", "Cucumber", + "Dockerfile Syntax Highlighting", "Git", "GitGutter", + "GitHubinator", "Haml", "LESS", + "MarkdownPreview", + "Material Theme", "Package Control", + "Pretty JSON", "Quick File Move", "Ruby Slim", "Sass", - "Theme - Soda", - "AdvancedNewFile", - "All Autocomplete", - "Side​Bar​Enhancements", - "Babel", - "A File Icon" + "SideBarEnhancements", + "Theme - Soda" ] } diff --git a/settings/Preferences.sublime-settings b/settings/Preferences.sublime-settings index 5267261..45a77f1 100644 --- a/settings/Preferences.sublime-settings +++ b/settings/Preferences.sublime-settings @@ -1,5 +1,5 @@ { - "color_scheme": "Packages/Color Scheme - Default/Solarized (Light).tmTheme", + "color_scheme": "Packages/Material Theme/schemes/Material-Theme.tmTheme", "drag_text": false, "draw_white_space": "all", "ensure_newline_at_eof_on_save": true, @@ -23,12 +23,14 @@ "overlay_scroll_bars": "enabled", "rulers": [ + 80, 120 ], + "save_on_focus_lost": true, "show_full_path": true, "soda_classic_tabs": false, "tab_size": 2, - "theme": "Soda Light 3.sublime-theme", + "theme": "Material-Theme.sublime-theme", "translate_tabs_to_spaces": true, "trim_trailing_white_space_on_save": true, "folder_exclude_patterns": [".git", ".hg", "tmp"]