diff --git a/sublime/Custom-Themes/Espresso Soda.tmTheme b/sublime/Custom-Themes/Espresso Soda.tmTheme
deleted file mode 100644
index baccc64..0000000
--- a/sublime/Custom-Themes/Espresso Soda.tmTheme
+++ /dev/null
@@ -1,683 +0,0 @@
-
-
-
-
- name
- Espresso Soda
- settings
-
-
- settings
-
- background
- #FFFFFF
- caret
- #000000
- foreground
- #000000
- invisibles
- #E0E0E0
- lineHighlight
- #A5A5A526
- selection
- #C2E8FF
- selectionBorder
- #AACBDF
- inactiveSelection
- #EDEDED
- findHighlight
- #FFE792
- findHighlightForeground
- #000000
-
-
-
- name
- Comments
- scope
- comment, comment punctuation
- settings
-
- fontStyle
-
- foreground
- #ADADAD
-
-
-
- name
- Comments: Preprocessor
- scope
- comment.block.preprocessor
- settings
-
- fontStyle
-
- foreground
- #ADADAD
-
-
-
- name
- Comments: Documentation
- scope
- comment.documentation, comment.block.documentation
- settings
-
- background
- #FFFDF7
- fontStyle
-
- foreground
- #BC670F
-
-
-
- name
- Invalid - Deprecated
- scope
- invalid.deprecated
- settings
-
- background
- #EFCFCF
- fontStyle
- italic underline
-
-
-
- name
- Invalid - Illegal
- scope
- invalid.illegal
- settings
-
- background
- #F93232
- fontStyle
-
- foreground
- #F9F2CE
-
-
-
- name
- Operators
- scope
- keyword.operator
- settings
-
- fontStyle
-
- foreground
- #626FC9
-
-
-
- name
- Keywords
- scope
- keyword, storage
- settings
-
- fontStyle
-
- foreground
- #61862F
-
-
-
- name
- Types
- scope
- storage.type, support.type
- settings
-
- fontStyle
-
- foreground
- #6700B9
-
-
-
- name
- Language Constants
- scope
- constant.language, support.constant, variable.language
- settings
-
- background
- #F3F2FF
- fontStyle
-
- foreground
- #7653C1
-
-
-
- name
- Variables
- scope
- variable, support.variable
- settings
-
- fontStyle
-
- foreground
- #4C8FC7
-
-
-
- name
- Variables: Punctuation
- scope
- variable punctuation
- settings
-
- fontStyle
-
- foreground
- #4C8FC7
-
-
-
- name
- Functions
- scope
- entity.name.function, support.function, entity
- settings
-
- fontStyle
-
- foreground
- #61862F
-
-
-
- name
- Classes
- scope
- entity.name.type, entity.other.inherited-class, support.class
- settings
-
- fontStyle
-
- foreground
- #3A1D72
-
-
-
- name
- Exceptions
- scope
- entity.name.exception
- settings
-
- foreground
- #F93232
-
-
-
- name
- Sections
- scope
- entity.name.section
- settings
-
- fontStyle
-
-
-
-
- name
- Numbers
- scope
- constant.numeric, constant
- settings
-
- background
- #F3F2FF
- fontStyle
-
- foreground
- #7653C1
-
-
-
- name
- Punctuation
- scope
- punctuation
- settings
-
- fontStyle
-
- foreground
- #000000
-
-
-
- name
- Strings
- scope
- constant.character, string
- settings
-
- background
- #FBE9AD1A
- fontStyle
-
- foreground
- #BC670F
-
-
-
- name
- Strings: Punctuation
- scope
- string punctuation
- settings
-
- fontStyle
-
- foreground
- #E69A4C
-
-
-
- name
- Strings: Escape Sequences
- scope
- constant.character.escape
- settings
-
- background
- #FBE9ADCC
- fontStyle
- bold
-
-
-
- name
- Strings: Regular Expressions
- scope
- string.regexp
- settings
-
- fontStyle
-
- foreground
- #699D36
-
-
-
- name
- Strings: Symbols
- scope
- constant.other.symbol
- settings
-
- background
- #E8FFD5
- fontStyle
- bold
-
-
-
- name
- Embedded Source
- scope
- string source, text source
- settings
-
- fontStyle
-
- foreground
- #434343
-
-
-
- name
- -----------------------------------
- settings
-
- fontStyle
-
-
-
-
- name
- HTML: Doctype Declaration
- scope
- meta.tag.sgml.doctype
- settings
-
- fontStyle
-
- foreground
- #7F7F7F
-
-
-
- name
- HTML: Tags
- scope
- entity.name.tag
- settings
-
- background
- #F4FAFF
- fontStyle
-
- foreground
- #2F6F9F
-
-
-
- name
- HTML: Attribute Punctuation
- scope
- meta.tag string punctuation
- settings
-
- fontStyle
-
- foreground
- #5FAFEF
-
-
-
- name
- HTML: Tag Punctuation
- scope
- punctuation.definition.tag
- settings
-
- fontStyle
-
- foreground
- #4F9FCF
-
-
-
- name
- HTML: Entities
- scope
- constant.character.entity
- settings
-
- fontStyle
-
- foreground
- #000000
-
-
-
- name
- HTML: Attribute Names
- scope
- entity.other.attribute-name
- settings
-
- fontStyle
-
- foreground
- #4F9FCF
-
-
-
- name
- HTML: Attribute Values
- scope
- meta.tag string.quoted, meta.tag string.quoted constant.character.entity
- settings
-
- background
- #FFFFFF
- fontStyle
-
- foreground
- #D44950
-
-
-
- name
- -----------------------------------
- settings
-
- fontStyle
-
-
-
-
- name
- CSS: Selectors
- scope
- meta.selector, meta.selector entity, meta.selector entity punctuation, entity.name.tag.css
- settings
-
- fontStyle
-
- foreground
- #3A77BF
-
-
-
- name
- CSS: Property Names
- scope
- meta.property-name, support.type.property-name
- settings
-
- foreground
- #D4430D
-
-
-
- name
- CSS: Property Values
- scope
- meta.property-value constant.numeric, meta.property-value constant, meta.property-value keyword
- settings
-
- background
- #FFFFFF
- fontStyle
-
- foreground
- #43A202
-
-
-
- name
- -----------------------------------
- settings
-
-
-
- name
- Markup: Changed
- scope
- markup.changed
- settings
-
- background
- #FFFFDD
- fontStyle
-
- foreground
- #000000
-
-
-
- name
- Markup: Deletion
- scope
- markup.deleted
- settings
-
- background
- #FFDDDD
- foreground
- #000000
-
-
-
- name
- Markup: Emphasis
- scope
- markup.italic
- settings
-
- fontStyle
- italic
-
-
-
- name
- Markup: Error
- scope
- markup.error
- settings
-
- background
- #F93232
- fontStyle
-
- foreground
- #F9F2CE
-
-
-
- name
- Markup: Insertion
- scope
- markup.inserted
- settings
-
- background
- #DDFFDD
- fontStyle
-
- foreground
- #000000
-
-
-
- name
- Markup: Output
- scope
- markup.output, markup.raw
- settings
-
- foreground
- #7F7F7F
-
-
-
- name
- Markup: Prompt
- scope
- markup.prompt
- settings
-
- foreground
- #555555
-
-
-
- name
- Markup: Heading
- scope
- markup.heading
- settings
-
- fontStyle
- bold
-
-
-
- name
- Markup: Strong
- scope
- markup.bold
- settings
-
- fontStyle
- bold
-
-
-
- name
- Markup: Traceback
- scope
- markup.traceback
- settings
-
- foreground
- #F93232
-
-
-
- name
- Markup: Underline
- scope
- markup.underline
- settings
-
- fontStyle
- underline
-
-
-
- name
- -----------------------------------
- settings
-
-
-
- name
- Extra: Diff Range
- scope
- meta.diff.range, meta.diff.index, meta.separator
- settings
-
- background
- #EAF2F5
- fontStyle
-
- foreground
- #434343
-
-
-
- name
- Extra: Diff From
- scope
- meta.diff.header.from-file
- settings
-
- background
- #FFDDDD
- foreground
- #434343
-
-
-
- name
- Extra: Diff To
- scope
- meta.diff.header.to-file
- settings
-
- background
- #DDFFDD
- foreground
- #434343
-
-
-
- uuid
- BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC
-
-
diff --git a/sublime/Custom-Themes/Espresso Soda.tmTheme.cache b/sublime/Custom-Themes/Espresso Soda.tmTheme.cache
deleted file mode 100644
index 568fc78..0000000
Binary files a/sublime/Custom-Themes/Espresso Soda.tmTheme.cache and /dev/null differ
diff --git a/sublime/Custom-Themes/Monokai Soda.tmTheme b/sublime/Custom-Themes/Monokai Soda.tmTheme
deleted file mode 100644
index 711a473..0000000
--- a/sublime/Custom-Themes/Monokai Soda.tmTheme
+++ /dev/null
@@ -1,351 +0,0 @@
-
-
-
-
- name
- Monokai Soda
- settings
-
-
- settings
-
- background
- #222222
- caret
- #F8F8F0
- foreground
- #F8F8F2
- invisibles
- #3B3A32
- lineHighlight
- #333333
- selection
- #444444
- findHighlight
- #FFE792
- findHighlightForeground
- #000000
- selectionBorder
- #1c1c1c
-
-
-
- name
- Comment
- scope
- comment
- settings
-
- foreground
- #75715E
-
-
-
- name
- String
- scope
- string
- settings
-
- foreground
- #E6DB74
-
-
-
- name
- Number
- scope
- constant.numeric
- settings
-
- foreground
- #AE81FF
-
-
-
- name
- Built-in constant
- scope
- constant.language
- settings
-
- foreground
- #AE81FF
-
-
-
- name
- User-defined constant
- scope
- constant.character, constant.other
- settings
-
- foreground
- #AE81FF
-
-
-
- name
- Variable
- scope
- variable
- settings
-
- fontStyle
-
-
-
-
- name
- Keyword
- scope
- keyword
- settings
-
- foreground
- #F92672
-
-
-
- name
- Storage
- scope
- storage
- settings
-
- fontStyle
-
- foreground
- #F92672
-
-
-
- name
- Storage type
- scope
- storage.type
- settings
-
- fontStyle
- italic
- foreground
- #66D9EF
-
-
-
- name
- Class name
- scope
- entity.name.class
- settings
-
- fontStyle
- underline
- foreground
- #A6E22E
-
-
-
- name
- Inherited class
- scope
- entity.other.inherited-class
- settings
-
- fontStyle
- italic underline
- foreground
- #A6E22E
-
-
-
- name
- Function name
- scope
- entity.name.function
- settings
-
- fontStyle
-
- foreground
- #A6E22E
-
-
-
- name
- Function argument
- scope
- variable.parameter
- settings
-
- fontStyle
- italic
- foreground
- #FD971F
-
-
-
- name
- Tag name
- scope
- entity.name.tag
- settings
-
- fontStyle
-
- foreground
- #F92672
-
-
-
- name
- Tag attribute
- scope
- entity.other.attribute-name
- settings
-
- fontStyle
-
- foreground
- #A6E22E
-
-
-
- name
- Library function
- scope
- support.function
- settings
-
- fontStyle
-
- foreground
- #66D9EF
-
-
-
- name
- Library constant
- scope
- support.constant
- settings
-
- fontStyle
-
- foreground
- #66D9EF
-
-
-
- name
- Library class/type
- scope
- support.type, support.class
- settings
-
- fontStyle
- italic
- foreground
- #66D9EF
-
-
-
- name
- Library variable
- scope
- support.other.variable
- settings
-
- fontStyle
-
-
-
-
- name
- Invalid
- scope
- invalid
- settings
-
- background
- #F92672
- fontStyle
-
- foreground
- #F8F8F0
-
-
-
- name
- Invalid deprecated
- scope
- invalid.deprecated
- settings
-
- background
- #AE81FF
- foreground
- #F8F8F0
-
-
-
- name
- JSON String
- scope
- meta.structure.dictionary.json string.quoted.double.json
- settings
-
- foreground
- #CFCFC2
-
-
-
-
- name
- diff.header
- scope
- meta.diff, meta.diff.header
- settings
-
- foreground
- #75715E
-
-
-
- name
- diff.deleted
- scope
- markup.deleted
- settings
-
- foreground
- #F92672
-
-
-
- name
- diff.inserted
- scope
- markup.inserted
- settings
-
- foreground
- #A6E22E
-
-
-
- name
- diff.changed
- scope
- markup.changed
- settings
-
- foreground
- #E6DB74
-
-
-
- uuid
- 5EAF4173-5DDE-4D64-A1E8-C1671C7EE339
-
-
diff --git a/sublime/Custom-Themes/Monokai Soda.tmTheme.cache b/sublime/Custom-Themes/Monokai Soda.tmTheme.cache
deleted file mode 100644
index a4a92fa..0000000
Binary files a/sublime/Custom-Themes/Monokai Soda.tmTheme.cache and /dev/null differ
diff --git a/sublime/Custom-Themes/README b/sublime/Custom-Themes/README
deleted file mode 100644
index 7ba93d3..0000000
--- a/sublime/Custom-Themes/README
+++ /dev/null
@@ -1 +0,0 @@
-Symlink this folder in Sublime's Packages/ folder
\ No newline at end of file
diff --git a/sublime/Default (Linux).sublime-keymap b/sublime/Default (Linux).sublime-keymap
deleted file mode 100644
index d84c22f..0000000
--- a/sublime/Default (Linux).sublime-keymap
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
- { "keys": ["ctrl+shift+k"], "command": "find_under_expand" },
-
- { "keys": ["ctrl+shift+1"], "command": "open_related_rails_model" },
- { "keys": ["ctrl+shift2"], "command": "open_related_rails_controller" },
- { "keys": ["ctrl+shift3"], "command": "open_related_rails_view" },
- { "keys": ["ctrl+shift4"], "command": "open_related_rspec_model" },
- { "keys": ["ctrl+shift5"], "command": "open_related_rspec_controller" }
-]
diff --git a/sublime/Default (OSX).sublime-keymap b/sublime/Default (OSX).sublime-keymap
index 139615b..0c5a55a 100644
--- a/sublime/Default (OSX).sublime-keymap
+++ b/sublime/Default (OSX).sublime-keymap
@@ -1,13 +1,11 @@
[
- { "keys": ["ctrl+tab"], "command": "next_view" },
- { "keys": ["ctrl+shift+tab"], "command": "prev_view" },
- { "keys": ["f11"], "command": "toggle_full_screen" },
- { "keys": ["shift+f11"], "command": "toggle_distraction_free" },
- { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
- { "keys": ["ctrl+shift+k"], "command": "find_under_expand" },
- { "keys": ["alt+shift+t"], "command": "delete_trailing_spaces" },
- { "keys": ["ctrl+t"], "command": "new_file" },
- { "keys": ["ctrl+w"], "command": "close" },
- { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
- { "keys": ["ctrl+shift+d"], "command": "duplicate_line" }
+ { "keys": ["alt+super+up"], "command": "swap_line_up" },
+ { "keys": ["alt+super+down"], "command": "swap_line_down" },
+ { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete Line.sublime-macro"} },
+ { "keys": ["ctrl+shift+k"], "command": "find_under_expand" },
+ { "keys": ["ctrl+tab"], "command": "next_view" },
+ { "keys": ["ctrl+shift+tab"], "command": "prev_view" },
+ { "keys": ["alt+super+left"], "command": "jump_back" },
+ { "keys": ["alt+super+right"], "command": "jump_forward" },
+
]
diff --git a/sublime/Default (Windows).sublime-keymap b/sublime/Default (Windows).sublime-keymap
deleted file mode 100644
index 5948227..0000000
--- a/sublime/Default (Windows).sublime-keymap
+++ /dev/null
@@ -1,4 +0,0 @@
-[
- { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
- { "keys": ["ctrl+shift+k"], "command": "find_under_expand" }
-]
diff --git a/sublime/Preferences.sublime-settings b/sublime/Preferences.sublime-settings
index 715bd9c..6fe1041 100644
--- a/sublime/Preferences.sublime-settings
+++ b/sublime/Preferences.sublime-settings
@@ -1,19 +1,57 @@
{
- "color_scheme": "Packages/Color Scheme - Default/Monokai.tmTheme",
+ "bold_folder_labels": true,
"ensure_newline_at_eof_on_save": true,
- "fallback_encoding": "Cyrillic (Windows 1251)",
- "font_size": 10.0,
+ "file_exclude_patterns":
+ [
+ "*.map",
+ "*.pyc",
+ "*.pyo",
+ "*.exe",
+ "*.dll",
+ "*.obj",
+ "*.o",
+ "*.a",
+ "*.lib",
+ "*.so",
+ "*.dylib",
+ "*.ncb",
+ "*.sdf",
+ "*.suo",
+ "*.pdb",
+ "*.idb",
+ ".DS_Store",
+ "*.class",
+ "*.psd",
+ "*.db",
+ "*.sublime-workspace",
+ "*ng-all.min.js",
+ "*lpall.js",
+ "*.min.js"
+ ],
+ "folder_exclude_patterns":
+ [
+ "generated/",
+ "*landing*",
+ ".svn",
+ ".git",
+ ".hg",
+ "CVS"
+ ],
+ "font_face": "Monaco",
+ "font_size": 13,
"highlight_line": true,
+ "highlight_modified_tabs": true,
"ignored_packages":
[
"Vintage"
],
"rulers":
[
- 80
+ 100
],
- "scroll_speed": 0,
+ "scroll_past_end": true,
+ "shift_tab_unindent": true,
+ "tab_size": 2,
"translate_tabs_to_spaces": true,
- "trim_trailing_white_space_on_save": true,
- "word_wrap": true
+ "trim_trailing_white_space_on_save": true
}
diff --git a/sublime/README b/sublime/README
deleted file mode 100644
index 84f46c0..0000000
--- a/sublime/README
+++ /dev/null
@@ -1,2 +0,0 @@
-* Symlink these files in the Sublime's Packages/User folder
-* The `package_control_packages` is just a useful list of packages. You have to install them manually and keep track of them yourself
diff --git a/sublime/RSpec.sublime-settings b/sublime/RSpec.sublime-settings
deleted file mode 100644
index 9540429..0000000
--- a/sublime/RSpec.sublime-settings
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "tab_size": 2
-}
\ No newline at end of file
diff --git a/sublime/Ruby.sublime-settings b/sublime/Ruby.sublime-settings
deleted file mode 100644
index 3a7adc7..0000000
--- a/sublime/Ruby.sublime-settings
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "tab_size": 2,
- "translate_tabs_to_spaces": true
-}
\ No newline at end of file
diff --git a/sublime/package_control_packages b/sublime/package_control_packages
deleted file mode 100644
index fc8a6e5..0000000
--- a/sublime/package_control_packages
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "bootstrapped": true,
- "in_process_packages":
- [
- ],
- "installed_packages":
- [
- "Alignment",
- "Cucumber",
- "Cucumber Step Finder",
- "Git",
- "GitGutter",
- "Guard",
- "Package Control",
- "Rake",
- "RSpec",
- "RubyTest",
- "SublimeREPL"
- "Git Commit Message Syntax",
- "Gitignore",
- "Jade"
- ]
-}