From f711890dc9b19f05150fa84e3721c4f5e7fbe60e Mon Sep 17 00:00:00 2001 From: Adrien Luxey Date: Fri, 27 Sep 2019 10:29:26 +0200 Subject: [PATCH] mostly sublime, some zshrc --- sublime/.jsbeautifyrc | 2 + sublime/C++.sublime-settings | 7 + sublime/Default (Linux).sublime-keymap | 305 +++++++++++------- sublime/Default.sublime-keymap | 1 + sublime/DocblockrPython.sublime-settings | 9 + sublime/HTML.sublime-settings | 7 + sublime/HTMLPrettify.sublime-settings | 3 + sublime/LaTeXing.sublime-settings | 12 + sublime/Package Control.sublime-settings | 7 + sublime/Preferences.sublime-settings | 43 ++- ...e => SBSCompareScheme.hidden-color-scheme} | 0 ...tmTheme => SBSCompareTheme.hidden-tmTheme} | 0 sublime/SublimeLinter.sublime-settings | 15 + zshrc | 13 +- 14 files changed, 304 insertions(+), 120 deletions(-) create mode 100644 sublime/.jsbeautifyrc create mode 100644 sublime/C++.sublime-settings create mode 100644 sublime/Default.sublime-keymap create mode 100644 sublime/DocblockrPython.sublime-settings create mode 100644 sublime/HTML.sublime-settings create mode 100644 sublime/HTMLPrettify.sublime-settings create mode 100644 sublime/LaTeXing.sublime-settings rename sublime/{SBSCompareScheme.sublime-color-scheme => SBSCompareScheme.hidden-color-scheme} (100%) rename sublime/{SBSCompareTheme.tmTheme => SBSCompareTheme.hidden-tmTheme} (100%) create mode 100644 sublime/SublimeLinter.sublime-settings diff --git a/sublime/.jsbeautifyrc b/sublime/.jsbeautifyrc new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/sublime/.jsbeautifyrc @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/sublime/C++.sublime-settings b/sublime/C++.sublime-settings new file mode 100644 index 0000000..e58e090 --- /dev/null +++ b/sublime/C++.sublime-settings @@ -0,0 +1,7 @@ +// These settings override both User and Default settings for the C++ syntax +{ + // The number of spaces a tab is considered equal to + "tab_size": 2, + // Set to true to insert spaces when tab is pressed + "translate_tabs_to_spaces": true, +} diff --git a/sublime/Default (Linux).sublime-keymap b/sublime/Default (Linux).sublime-keymap index 86ec5dc..8cffa93 100644 --- a/sublime/Default (Linux).sublime-keymap +++ b/sublime/Default (Linux).sublime-keymap @@ -1,121 +1,196 @@ [ - // Open folder - { "keys": ["ctrl+shift+o"], "command": "prompt_open_folder" }, - - // Switch case - { "keys": ["ctrl+u"], "command": "swap_case"}, + // Open folder + { + "keys": ["ctrl+shift+o"], + "command": "prompt_open_folder" + }, - // Change Ctrl+Shift behaviour (Firefox-like) - { "keys": ["ctrl+tab"], "command": "next_view" }, - { "keys": ["ctrl+shift+tab"], "command": "prev_view" }, - { "keys": ["ctrl+pagedown"], "command": "next_view_in_stack" }, - { "keys": ["ctrl+pageup"], "command": "prev_view_in_stack" }, + // Switch case + { + "keys": ["ctrl+u"], + "command": "swap_case" + }, - // Lord, do I hate Ctrl+q ... - { "keys": ["ctrl+q"], "command": "unbound"}, + // Change Ctrl+Shift behaviour (Firefox-like) + { + "keys": ["ctrl+tab"], + "command": "next_view" + }, + { + "keys": ["ctrl+shift+tab"], + "command": "prev_view" + }, + { + "keys": ["ctrl+pagedown"], + "command": "next_view_in_stack" + }, + { + "keys": ["ctrl+pageup"], + "command": "prev_view_in_stack" + }, + + // Lord, do I hate Ctrl+q ... Deactivated because of Layout + //{ "keys": ["ctrl+q"], "command": "unbound"}, - // Allow Alt+C to comment: - { "keys": ["alt+c"], "command": "toggle_comment", "args": { "block": false } }, - { "keys": ["alt+c"], "command": "toggle_comment", "args": { "block": true } }, - { "keys": ["ctrl+/"], "command": "toggle_comment", "args": { "block": false } }, - { "keys": ["ctrl+shift+/"], "command": "toggle_comment", "args": { "block": true } }, - - // View settings - { - "keys": ["ctrl+alt+&"], - "command": "set_layout", - "args": - { - "cols": [0.0, 1.0], - "rows": [0.0, 1.0], - "cells": [[0, 0, 1, 1]] - } - }, - { - "keys": ["ctrl+alt+é"], - "command": "set_layout", - "args": - { - "cols": [0.0, 0.5, 1.0], - "rows": [0.0, 1.0], - "cells": [[0, 0, 1, 1], [1, 0, 2, 1]] - } - }, - { - "keys": ["ctrl+alt+\""], - "command": "set_layout", - "args": - { - "cols": [0.0, 0.5, 1.0], - "rows": [0.0, 0.5, 1.0], - "cells": - [ - [0, 0, 1, 1], [1, 0, 2, 1], - [0, 1, 2, 2] - ] - // "cols": [0.0, 0.33, 0.66, 1.0], - // "rows": [0.0, 1.0], - // "cells": [[0, 0, 1, 1], [1, 0, 2, 1], [2, 0, 3, 1]] - } - }, - { - "keys": ["alt+shift+4"], - "command": "set_layout", - "args": - { - "cols": [0.0, 0.25, 0.5, 0.75, 1.0], - "rows": [0.0, 1.0], - "cells": [[0, 0, 1, 1], [1, 0, 2, 1], [2, 0, 3, 1], [3, 0, 4, 1]] - } - }, - { - "keys": ["ctrl+alt+("], - "command": "set_layout", - "args": - { - "cols": [0.0, 1.0], - "rows": [0.0, 0.5, 1.0], - "cells": [[0, 0, 1, 1], [0, 1, 1, 2]] - } - }, - { - "keys": ["alt+shift+9"], - "command": "set_layout", - "args": - { - "cols": [0.0, 1.0], - "rows": [0.0, 0.33, 0.66, 1.0], - "cells": [[0, 0, 1, 1], [0, 1, 1, 2], [0, 2, 1, 3]] - } - }, - { - "keys": ["ctrl+alt+'"], - "command": "set_layout", - "args": - { - "cols": [0.0, 0.5, 1.0], - "rows": [0.0, 0.5, 1.0], - "cells": - [ - [0, 0, 1, 1], [1, 0, 2, 1], - [0, 1, 1, 2], [1, 1, 2, 2] - ] - } - }, - { - "keys": ["ctrl+alt+o"], - "command": "project_manager", "args": {"action": "new"} - }, - { "keys": ["ctrl+alt+s"], "command": "toggle_side_bar" }, + // Allow Alt+C to comment: + { + "keys": ["alt+c"], + "command": "toggle_comment", + "args": + { + "block": false + } + }, + { + "keys": ["alt+c"], + "command": "toggle_comment", + "args": + { + "block": true + } + }, + { + "keys": ["ctrl+/"], + "command": "toggle_comment", + "args": + { + "block": false + } + }, + { + "keys": ["ctrl+shift+/"], + "command": "toggle_comment", + "args": + { + "block": true + } + }, - // LaTeX compilation set to Ctrl+Enter - // Doesn't work... - // { - // "keys": ["ctrl+enter"], - // "context": [ - // {"key": "selector", "operator": "equal", "operand": "text.tex.latex"}, - // {"key": "latextools.st_version", "operator": "equal", "operand": "<3080"}], - // "command": "latextools_build_selector" - // }, -] + // View settings + { + "keys": ["ctrl+alt+&"], + "command": "set_layout", + "args": + { + "cols": [0.0, 1.0], + "rows": [0.0, 1.0], + "cells": [ + [0, 0, 1, 1] + ] + } + }, + { + "keys": ["ctrl+alt+é"], + "command": "set_layout", + "args": + { + "cols": [0.0, 0.5, 1.0], + "rows": [0.0, 1.0], + "cells": [ + [0, 0, 1, 1], + [1, 0, 2, 1] + ] + } + }, + { + "keys": ["ctrl+alt+\""], + "command": "set_layout", + "args": + { + "cols": [0.0, 0.5, 1.0], + "rows": [0.0, 0.5, 1.0], + "cells": [ + [0, 0, 1, 1], + [1, 0, 2, 1], + [0, 1, 2, 2] + ] + // "cols": [0.0, 0.33, 0.66, 1.0], + // "rows": [0.0, 1.0], + // "cells": [[0, 0, 1, 1], [1, 0, 2, 1], [2, 0, 3, 1]] + } + }, + { + "keys": ["alt+shift+4"], + "command": "set_layout", + "args": + { + "cols": [0.0, 0.25, 0.5, 0.75, 1.0], + "rows": [0.0, 1.0], + "cells": [ + [0, 0, 1, 1], + [1, 0, 2, 1], + [2, 0, 3, 1], + [3, 0, 4, 1] + ] + } + }, + { + "keys": ["ctrl+alt+("], + "command": "set_layout", + "args": + { + "cols": [0.0, 1.0], + "rows": [0.0, 0.5, 1.0], + "cells": [ + [0, 0, 1, 1], + [0, 1, 1, 2] + ] + } + }, + { + "keys": ["alt+shift+9"], + "command": "set_layout", + "args": + { + "cols": [0.0, 1.0], + "rows": [0.0, 0.33, 0.66, 1.0], + "cells": [ + [0, 0, 1, 1], + [0, 1, 1, 2], + [0, 2, 1, 3] + ] + } + }, + { + "keys": ["ctrl+alt+'"], + "command": "set_layout", + "args": + { + "cols": [0.0, 0.5, 1.0], + "rows": [0.0, 0.5, 1.0], + "cells": [ + [0, 0, 1, 1], + [1, 0, 2, 1], + [0, 1, 1, 2], + [1, 1, 2, 2] + ] + } + }, + { + "keys": ["ctrl+alt+o"], + "command": "project_manager", + "args": + { + "action": "new" + } + }, + { + "keys": ["ctrl+alt+s"], + "command": "toggle_side_bar" + }, + { + "keys": ["ctrl+alt+h"], + "command": "htmlprettify" + }, + + // LaTeX compilation set to Ctrl+Enter + // Doesn't work... + // { + // "keys": ["ctrl+enter"], + // "context": [ + // {"key": "selector", "operator": "equal", "operand": "text.tex.latex"}, + // {"key": "latextools.st_version", "operator": "equal", "operand": "<3080"}], + // "command": "latextools_build_selector" + // }, +] \ No newline at end of file diff --git a/sublime/Default.sublime-keymap b/sublime/Default.sublime-keymap new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/sublime/Default.sublime-keymap @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/sublime/DocblockrPython.sublime-settings b/sublime/DocblockrPython.sublime-settings new file mode 100644 index 0000000..da87103 --- /dev/null +++ b/sublime/DocblockrPython.sublime-settings @@ -0,0 +1,9 @@ +{ + /** + * This option dictates which style of docstrings to use, when parsing docstrings + * + * Available Options: + * [PEP0257, docblock, google, numpy, sphinx] + */ + "formatter": "numpy" +} \ No newline at end of file diff --git a/sublime/HTML.sublime-settings b/sublime/HTML.sublime-settings new file mode 100644 index 0000000..e58e090 --- /dev/null +++ b/sublime/HTML.sublime-settings @@ -0,0 +1,7 @@ +// These settings override both User and Default settings for the C++ syntax +{ + // The number of spaces a tab is considered equal to + "tab_size": 2, + // Set to true to insert spaces when tab is pressed + "translate_tabs_to_spaces": true, +} diff --git a/sublime/HTMLPrettify.sublime-settings b/sublime/HTMLPrettify.sublime-settings new file mode 100644 index 0000000..0e0dcd2 --- /dev/null +++ b/sublime/HTMLPrettify.sublime-settings @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/sublime/LaTeXing.sublime-settings b/sublime/LaTeXing.sublime-settings new file mode 100644 index 0000000..a4c783a --- /dev/null +++ b/sublime/LaTeXing.sublime-settings @@ -0,0 +1,12 @@ +{ + "foldable_environments": [ + "table", + "figure", + "equation", + "section" + ], + "zotero": false, + "zotero_user_id": "3421821", + "zotero_user_key": "5d3MQLpPp8ra2irK6tMyBvaJ", + "open_pdf_on_load": false +} \ No newline at end of file diff --git a/sublime/Package Control.sublime-settings b/sublime/Package Control.sublime-settings index 750e744..0095460 100644 --- a/sublime/Package Control.sublime-settings +++ b/sublime/Package Control.sublime-settings @@ -7,16 +7,22 @@ [ "All Autocomplete", "AutoPEP8", + "ayu", "Compare Side-By-Side", "Diffy", + "DocBlockr_Python", "Dockerfile Syntax Highlighting", "ExportHtml", "Git", "GitGutter", "GoSublime", + "Hermes", + "HTML-CSS-JS Prettify", "Javascript Beautify", "Language - French - Français", + "LaTeXing", "LaTeXTools", + "Layout", "Markdown Extended", "MarkdownPreview", "MultiEditUtils", @@ -28,6 +34,7 @@ "ProjectManager", "SublimeCodeIntel", "SublimeLinter", + "SublimeLinter-cppcheck", "SublimeLinter-pyflakes", "SublimeREPL", "SwitchDictionary", diff --git a/sublime/Preferences.sublime-settings b/sublime/Preferences.sublime-settings index 1aeb80a..776c3d3 100644 --- a/sublime/Preferences.sublime-settings +++ b/sublime/Preferences.sublime-settings @@ -39,20 +39,57 @@ "anonymization", "mixnets", "Grafana", - "Prometheus" + "Prometheus", + "décarbonée", + "décarbonées", + "pourcent", + "pouième", + "misclassifications", + "Bayes", + "Hoeffding", + "misclassifies", + "app", + "leverages", + "webservices", + "problematics", + "leveraging", + "leechers", + "leecher", + "premiere", + "tuple", + "booleans", + "uploader", + "anymore", + "byzantine", + "anonymise", + "anonymised", + "cloudlets", + "versioned", + "blockchain", + "blockchains", + "Bitcoin", + "Markovian", + "wearables", + "churnful", + "boxplots", + "timeout", + "proxemics" ], "close_windows_when_empty": false, "color_scheme": "Packages/User/predawn (Flake8Lint).tmTheme", - "dictionary": "Packages/Language - English/en_US.dic", + "dictionary": "Packages/Language - English/en_GB.dic", "find_selected_text": true, + "font_face": "Fira Code", "font_size": 10, "ignored_packages": [ + "LaTeXTools", + "SublimeREPL", "Vintage" ], "predawn_findreplace_small": true, "predawn_quick_panel_small": true, - "predawn_sidebar_arrows": true, + "predawn_sidebar_arrows": false, "predawn_sidebar_small": true, "predawn_tabs_small": true, "theme": "predawn-DEV.sublime-theme" diff --git a/sublime/SBSCompareScheme.sublime-color-scheme b/sublime/SBSCompareScheme.hidden-color-scheme similarity index 100% rename from sublime/SBSCompareScheme.sublime-color-scheme rename to sublime/SBSCompareScheme.hidden-color-scheme diff --git a/sublime/SBSCompareTheme.tmTheme b/sublime/SBSCompareTheme.hidden-tmTheme similarity index 100% rename from sublime/SBSCompareTheme.tmTheme rename to sublime/SBSCompareTheme.hidden-tmTheme diff --git a/sublime/SublimeLinter.sublime-settings b/sublime/SublimeLinter.sublime-settings new file mode 100644 index 0000000..8730ae3 --- /dev/null +++ b/sublime/SublimeLinter.sublime-settings @@ -0,0 +1,15 @@ +// SublimeLinter Settings - User +{ + // Set to true to print extra information in the console. + "debug": true, + "linters": { + "cppcheck": { + // "@disable": false, + // "args": [], + "enable": "all", + // "excludes": [], + // "lint_mode": "save" + "std": ["c++11"] + } + } +} diff --git a/zshrc b/zshrc index d86f667..d4c9f0a 100644 --- a/zshrc +++ b/zshrc @@ -24,6 +24,7 @@ CASE_SENSITIVE="false" # DISABLE_AUTO_UPDATE="true" # Uncomment the following line to change how often to auto-update (in days). + # export UPDATE_ZSH_DAYS=13 # Uncomment the following line to disable colors in ls. @@ -103,10 +104,18 @@ fi #export PATH=/home/adrien/bin:/opt/texbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/adrien/goroot/bin:/usr/local/go/bin:/home/adrien/goroot/bin:/home/adrien/.shadow/bin #export PATH=$PATH:/home/adrien/.shadow/bin -export PATH=$PATH:/home/adrien/.local/bin +export PATH=$PATH:$HOME/.local/bin if [ -d "$HOME/bin" ] ; then PATH="$PATH:$HOME/bin" fi + # Enable Autojump (j) -. /usr/share/autojump/autojump.sh +if [ -f "/usr/share/autojump/autojump.sh" ]; then + . /usr/share/autojump/autojump.sh +fi + +# If there is a local zshrc, source it too +if [ -f "~/.zshrc.local" ]; then + . ~/.zshrc.local +fi