From 27823104f3e10b2259491c1ca1f4f2ecf82474ac Mon Sep 17 00:00:00 2001 From: "dtomlinson@panaetius.co.uk" Date: Mon, 2 Dec 2019 00:04:15 +0000 Subject: [PATCH] updating to latest config --- .../User/A File Icon.sublime-settings | 2 +- .../Packages/User/Anaconda.sublime-settings | 4 + .../User/AutoDocstring.sublime-settings | 2 +- .../Packages/User/LSP.sublime-settings | 32 +++++ .../User/Preferences.sublime-settings | 42 +++++-- .../User/SublimeLinter.sublime-settings | 46 +++++++- Projects/base.sublime-project | 29 ++++- packages.md | 110 ++++++++++++------ themes.md | 14 ++- 9 files changed, 229 insertions(+), 52 deletions(-) create mode 100644 .config/sublime-text-3/Packages/User/Anaconda.sublime-settings create mode 100644 .config/sublime-text-3/Packages/User/LSP.sublime-settings diff --git a/.config/sublime-text-3/Packages/User/A File Icon.sublime-settings b/.config/sublime-text-3/Packages/User/A File Icon.sublime-settings index 23bde69..2a29d11 100644 --- a/.config/sublime-text-3/Packages/User/A File Icon.sublime-settings +++ b/.config/sublime-text-3/Packages/User/A File Icon.sublime-settings @@ -6,5 +6,5 @@ // ! PLEASE RESTART SUBLIME TEXT FOR THESE CHANGES TO TAKE EFFECT ! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - "force_mode": true + "force_mode": false } diff --git a/.config/sublime-text-3/Packages/User/Anaconda.sublime-settings b/.config/sublime-text-3/Packages/User/Anaconda.sublime-settings new file mode 100644 index 0000000..b4f12fb --- /dev/null +++ b/.config/sublime-text-3/Packages/User/Anaconda.sublime-settings @@ -0,0 +1,4 @@ +{ + "disable_anaconda_completion": false, + "display_signatures": false +} diff --git a/.config/sublime-text-3/Packages/User/AutoDocstring.sublime-settings b/.config/sublime-text-3/Packages/User/AutoDocstring.sublime-settings index bd6c2cb..f2faea1 100644 --- a/.config/sublime-text-3/Packages/User/AutoDocstring.sublime-settings +++ b/.config/sublime-text-3/Packages/User/AutoDocstring.sublime-settings @@ -1,3 +1,3 @@ { - "style": "numpy", + "style": "google", } diff --git a/.config/sublime-text-3/Packages/User/LSP.sublime-settings b/.config/sublime-text-3/Packages/User/LSP.sublime-settings new file mode 100644 index 0000000..395ae94 --- /dev/null +++ b/.config/sublime-text-3/Packages/User/LSP.sublime-settings @@ -0,0 +1,32 @@ +{ + "clients": + { + "rls": + { + "enabled": true + } + }, + "pyls": + { + "command": ["pyls"], + "scopes": ["source.python"], + "syntaxes": ["Packages/Python/Python.sublime-syntax", "Packages/MagicPython/grammars/MagicPython.tmLanguage", "Packages/Djaneiro/Syntaxes/Python Django.tmLanguage"], + "languageId": "python", + "settings": { + "pyls": { + "configurationSources": ["flake8"], + "plugins": { + "pyflakes": { + "enabled": false + } + } + } + } + }, + "show_code_actions_bulb": true, + "highlight_active_signature_parameter": true, + "document_highlight_style": "underline", + "diagnostics_gutter_marker": "bookmark", + "show_symbol_action_links": true, + "auto_show_diagnostics_panel_level": 1, +} diff --git a/.config/sublime-text-3/Packages/User/Preferences.sublime-settings b/.config/sublime-text-3/Packages/User/Preferences.sublime-settings index 390cfa3..4688a1d 100755 --- a/.config/sublime-text-3/Packages/User/Preferences.sublime-settings +++ b/.config/sublime-text-3/Packages/User/Preferences.sublime-settings @@ -8,24 +8,42 @@ ], "bold_folder_labels": true, "caret_style": "phase", - "color_scheme": "Packages/Night Owl/Night Owl.sublime-color-scheme", + "color_scheme": "Packages/10% Too Dull for My Tastes Color Scheme/scotchy.tmTheme", "complete_all_paramters": true, "display_signatures": true, "draw_white_space": "all", "enable_docstrings_tooltip": true, "enable_signatures_tooltip": true, + "enki_theme_compact_panel": true, + "enki_theme_small_statusbar": true, + "enki_theme_small_tab": true, "ensure_newline_at_eof_on_save": true, - "font_face": "Source Code Pro", - "font_size": 11, + "font_face": "Hack Regular", + "font_options": + [ + "gray_antialias", + "subpixel_antialias" + ], + "font_size": 12, "highlight_line": true, "ignored_packages": [ - "Python", + "Debugger", + "Rust", + "SublimeLinter-flake8", + "SublimeLinter-pyflakes", "Vintage" ], + "indent_guide_options": + [ + "draw_normal", + "draw_active" + ], "indent_to_bracket": false, "merge_signatures_and_doc": true, + "overlay_scroll_bars": "enabled", "remember_open_files": true, + "scroll_past_end": true, "settings": { "extra_paths": @@ -34,11 +52,19 @@ ], "python_interpreter": "$VIRTUAL_ENV/bin/python" }, - "theme": "halcyon.sublime-theme", + "sidebar_font_small": true, + "spaceblack_color_expanded_folder": true, + "spaceblack_sidebar_font_normal": false, + "spaceblack_sidebar_font_small": false, + "spaceblack_sidebar_tree_normal": false, + "spaceblack_sidebar_tree_small": false, + "spaceblack_sidebar_tree_xxlarge": false, + "spaceblack_tabs_small": true, + "tabs_small": true, + "theme": "Spaceblack.sublime-theme", + "trailing_spaces_modified_lines_only": true, + "trailing_spaces_trim_on_save": true, "translate_tabs_to_spaces": true, - // "trim_trailing_white_space_on_save": true, - "trailing_spaces_modified_lines_only": true, - "trailing_spaces_trim_on_save": true, "ui_separator": true, "word_wrap": true, "wrap_width": 80 diff --git a/.config/sublime-text-3/Packages/User/SublimeLinter.sublime-settings b/.config/sublime-text-3/Packages/User/SublimeLinter.sublime-settings index eb12789..0cfda37 100644 --- a/.config/sublime-text-3/Packages/User/SublimeLinter.sublime-settings +++ b/.config/sublime-text-3/Packages/User/SublimeLinter.sublime-settings @@ -3,6 +3,48 @@ "pycodestyle": { "ignore": ["E402", "W503"] } - } -} + }, + "gutter_theme": "Danish Royalty", + "highlights.time_to_idle": 60, + "lint_mode": "save", + "highlights.demote_while_editing": "warnings", + // "styles": [ + // { + // // Used to determine the color. E.g. region., with one of + // // redish, orangish, yellowish, greenish, bluish, purplish, pinkish. + // "scope": "region.greenish markup.warning.sublime_linter", + // // The error type this style definition will match for. + // // An array which can contain "warning" and/or "error". + // // If omitted will match both. + // "types": ["warning"], + // "mark_style": "solid_underline", + // }, + // { + // // Determines, for overlapping errors, which one is visualised. + // "priority": 1, + + // // The icon displayed in the gutter area + // // - "circle", "dot" or "bookmark" + // // - "none" to remove the icon + // // - A path to an icon file like + // // "Packages/SublimeLinter/gutter-themes/Blueberry Cross/error.png" + // // - One provided by a gutter theme (e.g. "warning" or "error"). + // // In theme Default: warning, error, cog, x, + // // and diamond, heart, pointer, square, star, triangle, which all + // // also have an -outline variant. + // "icon": "dot", + + // // The highlight style: + // // - "none" + // // - "fill", "outline", + // // - "solid_underline", "squiggly_underline", "stippled_underline" + // // The underline styles are replaced with outlines when there is + // // whitespace in the problem region, because underlines aren't drawn + // // on whitespace (ST issue #137). + // "mark_style": "outline", + + // "scope": "region.redish markup.error.sublime_linter" + // } + // ], +} diff --git a/Projects/base.sublime-project b/Projects/base.sublime-project index 9c3631b..345fce6 100644 --- a/Projects/base.sublime-project +++ b/Projects/base.sublime-project @@ -16,14 +16,33 @@ ], "settings": { - "SublimeLinter.linters.pycodestyle.disable": false, - "SublimeLinter.linters.pyflakes.disable": false, + "LSP": + { + "pyls": + { + "enabled": true, + "env": + { + "PYTHONPATH": "$VIRTUAL_ENV/bin/python" + } + } + }, + "SublimeLinter.linters.pycodestyle.disable": true, + "SublimeLinter.linters.pyflakes.disable": true, "anaconda_linting": false, "convert_tabspaces_on_save": false, + "debug.configurations": + [ + { + "name": "Python Debug", + "program": "${file}", + "request": "launch", + "type": "python" + } + ], "enable_signatures_tooltip": true, - "merge_signatures_and_doc": true, - "python_interpreter": "$VIRTUAL_ENV/bin/python3", - + "merge_signatures_and_doc": false, + "python_interpreter": "$VIRTUAL_ENV/bin/python" }, "virtualenv": "/home/dtomlinson/.virtualenvs/bayes-learning" } diff --git a/packages.md b/packages.md index 07ba82b..f79bf99 100644 --- a/packages.md +++ b/packages.md @@ -1,48 +1,92 @@ +# Notes + +## Anaconda + +This is only used for it's build system. The rest of the addon isn't. + +## Sublack + +Can be deprecated in favour of LSP (with black installed into the venv) + +## SublimeLinter + +Deprecated in favour of LSP + +## Python Breakpoints + +Deprecated in favour of pudb + # Packages + ## General -- a file icon -- base encoder -- brackethighlighter -- expand tabs on save -- sidebarenhancements + +- A File Icon +- BracketHighlighter +- Expand Tabs on Save +- SideBarEnhancements + ## Debugging -- sublimelog -- terminus + +- SublimeLog +- Terminus ## Markdown -- markdown extended -- markdown live preview -- markdown preview -- markdown toc -- markdown table formatter -- github markdown snippets +- Markdown Extended +- Markdown Table Formatter +- MarkdownLivePreview +- MarkdownPreview +- MarkdownTOC +- GitHub Markdown Snippets -## Python-development -- anaconda -- buildview +## RST + +- Restructured Text (RST) Snippets + +## Development + +- LSP + +### Python-development + +- Anaconda +- sublime-text-2-buildview - requirementstxt - sublack -- sublime text - virtualenv -- sublimelinter - - sublimelinter-pycodestyle - - - sublimelinter - flake8 -- sublimerepel -- virtualenv -- autodocstring -- magicpython (disable python package) -- pythonbreakpoints +- Virtualenv + +- SublimeREPL +- AutoDocstring +- Python Improved +- MagicPython + -## Rust development -- rust-extended -- toml -- lsp +### Rust development + +- Rust Enhanced +- TOML ## Productivity -- plain tasks + +- PlainTasks ## Functionality -- text pastry -- base encoder + +- Text Pastry +- Base Encoder +- InsertDate +- AutoFileName +- ChangeQuotes + +## Misc + +- RPM Spec Syntax + +## Themeing + +- ColorSchemeEditor +- Themr diff --git a/themes.md b/themes.md index 195ccbd..1a0d7d7 100644 --- a/themes.md +++ b/themes.md @@ -1,9 +1,19 @@ # Themes + ## Sublime themes + +- Agila Theme - ayu - edge night sky -- halcyon +- Enki Theme +- Halcyon Theme +- Spaceblack ## Colour Schemes + +- 10% Too Dull for My Tastes Color Scheme - ayu -- night Owl +- Night Owl +- Neon Color Scheme +- Predawn +- Predawn Monokai