From 05fbc9fa1b0ae4612b6262a35d2d39c521378f1a Mon Sep 17 00:00:00 2001 From: Macoy Madson Date: Tue, 14 May 2019 16:41:01 -0700 Subject: [PATCH] Fixed crlf issue --- ClangFormat/clang_format.vsSettings | 42 +-- Emacs/EmacsOnWindowsSetup.txt | 21 +- Emacs/core-settings.el | 15 +- Emacs/dotEmacs.el | 440 ++++++++++++++-------------- Emacs/emacsPackages.txt | 72 ++--- SublimeText3/SublimeKeybinds.json | 18 +- SublimeText3/SublimeSettings.json | 58 ++-- VSCode/VSCodeSettings.json | 48 +-- 8 files changed, 363 insertions(+), 351 deletions(-) diff --git a/ClangFormat/clang_format.vsSettings b/ClangFormat/clang_format.vsSettings index a7c1d24..6d3bf6b 100644 --- a/ClangFormat/clang_format.vsSettings +++ b/ClangFormat/clang_format.vsSettings @@ -1,22 +1,22 @@ -# http://releases.llvm.org/6.0.0/tools/clang/docs/ClangFormatStyleOptions.html -BasedOnStyle: Google -AccessModifierOffset: -4 -AllowShortBlocksOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -BreakBeforeBraces: Allman -BraceWrapping: - AfterNamespace: false -BreakBeforeTernaryOperators: false -ColumnLimit: 100 -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -IndentWidth: 4 -Standard: Cpp11 -TabWidth: 4 -UseTab: ForIndentation -DerivePointerAlignment: false -PointerAlignment: Left -NamespaceIndentation: None +# http://releases.llvm.org/6.0.0/tools/clang/docs/ClangFormatStyleOptions.html +BasedOnStyle: Google +AccessModifierOffset: -4 +AllowShortBlocksOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +BreakBeforeBraces: Allman +BraceWrapping: + AfterNamespace: false +BreakBeforeTernaryOperators: false +ColumnLimit: 100 +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +IndentWidth: 4 +Standard: Cpp11 +TabWidth: 4 +UseTab: ForIndentation +DerivePointerAlignment: false +PointerAlignment: Left +NamespaceIndentation: None IndentCaseLabels: true \ No newline at end of file diff --git a/Emacs/EmacsOnWindowsSetup.txt b/Emacs/EmacsOnWindowsSetup.txt index c29567e..9d0721e 100644 --- a/Emacs/EmacsOnWindowsSetup.txt +++ b/Emacs/EmacsOnWindowsSetup.txt @@ -1,5 +1,5 @@ #EmacsSetup -1. Download https://drive.google.com/open?id=19KVTioQZE8o3UxtSb2M5CugBbWKRRwl1 +1. Download https://drive.google.com/open?id=19KVTioQZE8o3UxtSb2M5CugBbWKRRwl1 (this is my --with-modules Emacs 27 build) 2. Extract it 3. Install git: https://git-scm.com/download/win 4. Run `git clone https://github.com/makuto/editorPreferences` (I like it in C:/editorPreferences) @@ -7,4 +7,21 @@ 6. Copy the default settings: `cp editorPreferences/Emacs/dotEmacs.el Users/your user name here/AppData/Roaming/.emacs` 7. Open Users/your user name here/AppData/Roaming/.emacs 8. Edit the line which says `(setq user-init-dir "~/.emacs.d/macoy")` to point to your editorPreferences dir: `(setq user-init-dir "C:/editorPreferences")` -9. Restart Emacs \ No newline at end of file +9. Restart Emacs + +External Dependencies +1. Install chocolately: https://chocolatey.org/install +2. Install ag: `choco install ag` (for file search) +3. Download codesearch: https://github.com/junkblocker/codesearch/releases/download/v5/codesearch_v5_windows_amd64.zip + +External dependencies setup example +``` +(setq codesearch-csearch-exe "C:/Users/mmadson/MacoyPrograms/Emacs27_Win64_WithDeps/codesearch/csearch.exe") +(setq codesearch-cindex-exe "C:/Users/mmadson/MacoyPrograms/Emacs27_Win64_WithDeps/codesearch/cindex.exe") +(setq codesearch-dir-to-index "D:/srcTip") +(setq codesearch-index-file "~/.csearchindex") +(setq codesearch-cindex-args (list "-reset" "-exclude" "D:/srcTip/csearchIgnorePatterns")) +(setq codesearch-temp-file "~/.temp-codesearch.txt") + +;; (setq ag-executable "") +``` diff --git a/Emacs/core-settings.el b/Emacs/core-settings.el index facbcb4..5d3e346 100644 --- a/Emacs/core-settings.el +++ b/Emacs/core-settings.el @@ -153,17 +153,12 @@ ;; Make projectile mode-line more minimal ;; TODO: Make this work based on version! - (when (string-equal (user-login-name) "macoy") - (defun macoy-projectile-mode-line () - (format " [%s]" (projectile-project-name)) - ) - (setq projectile-mode-line-function 'macoy-projectile-mode-line) - ) - - (when (string-equal (user-login-name) "mmadson") - ;; Older version syntax - (setq projectile-mode-line '(:eval (format " [%s]" (projectile-project-name)))) + (defun macoy-projectile-mode-line () + (format " [%s]" (projectile-project-name)) ) + (setq projectile-mode-line-function 'macoy-projectile-mode-line) + ;; Older version syntax + ;; (setq projectile-mode-line '(:eval (format " [%s]" (projectile-project-name)))) ) ;; ;; File-related shortcuts diff --git a/Emacs/dotEmacs.el b/Emacs/dotEmacs.el index 6bd6cab..14366b9 100644 --- a/Emacs/dotEmacs.el +++ b/Emacs/dotEmacs.el @@ -1,220 +1,220 @@ - -;; Emacs Notes -;; C-h k to find what a key does -;; C-h b to list all bindings (should've used this more when fighting binds...) -;; C-q = quoted-insert "insert the next character, whatever it is" e.g. useful for inserting a tab -;; describe-char with cursor over character will say where the font face came from (useful for theming) -;; Use ibuffer to select and kill many buffers. kill-some-buffers is also okay -;; Use ediff-revision to easily manipulate working edits -;; Use re-builder to create a regex by seeing the results of it in the current buffer (super awesome) -;; Hit C-f while in ido to disable all completion (for when you're fighting it) -;; Amazing multiline editing: C-f to isearch-forward, then C-a to see all results, then e to edit all lines -;; diff-buffer-with-file to see a diff of current (unsaved) modifications - -;; Used to load separate configuration files I've created. Order matters so they're scattered a bit -(setq user-init-dir "~/.emacs.d/macoy") -(defun load-user-file (file) - (interactive "f") - "Load a file in current user's configuration directory" - (load-file (expand-file-name file user-init-dir))) - -;; BAD THING -;; -;; This is the worst thing ever. Remap keys so I can use C-c and C-x how I damn well please. -;; Subsequently, read C-u as my C-x and C-y as my C-c (yes, it sucks and is confusing as hell. -;; I blame the developers. -;; -(keyboard-translate ?\C-u ?\C-x) -(keyboard-translate ?\C-x ?\C-u) -(keyboard-translate ?\C-y ?\C-c) -(keyboard-translate ?\C-c ?\C-y) - -;; This is a stupid hack around an apparent bug in edebug. -;; If set, don't define C-x anywhere. If C-x is defined then edebug complains about it not being a prefix key -;; You'll need to restart in order for it to work -;; Update: After keyboard-translate, this is no longer an issue. Leaving here in case I go back on keyboard-translate -(setq macoy-edebug-prefix-hack nil) - -;; Handle installing packages -(load-user-file "packages.el") - -;; Simpleclip makes system clipboard and emacs kill ring separate -;; This is sane copy paste behavior -;; I keep this near the top because many of my utilities rely on simpleclip -(when (require 'simpleclip) - (simpleclip-mode 1)) - -;; Settings which affect the core behavior of Emacs as well as interface-changing things like ido -;; This also has random utilities for managing buffers and files -;; This should remain early in load order -(load-user-file "core-settings.el") - -;; Various customizations for Org mode -(load-user-file "org-customizations.el") - -;; Manipulate JIRAs in Org-mode -;; These customizations are required to use org-jira with lower permissions -(load-user-file "org-jira-customizations.el") - -;; Org-drill and associated customizations -(load-user-file "drill-customizations.el") - -;; Make it easier to create and switch desktops -(load-user-file "desktop-management.el") - -;; Utilities for getting around in files (quick jump, saving points, etc.) -(load-user-file "navigation.el") - -;; Various different ways to search -(load-user-file "search.el") - -;; Tools for auto-formatting code, default formatting settings, etc. -(load-user-file "code-formatting.el") - -;; All things tags and autocompletion -(load-user-file "tags-and-autocompletion.el") - -;; Modes and customizations of modes for different syntaxes -(load-user-file "syntaxes.el") - -;; Customizations related to source control stuff like DSVN, Magit, etc. -(load-user-file "source-control.el") - -;; Various compile commands and build system management -(load-user-file "build-systems.el") - -;; Cut/copy/paste and multiple cursors stuff -(load-user-file "clipboard.el") - -;; Keybindings for various modes -;; Note that not all keybinds are defined in this file -(load-user-file "keybinds.el") - -;; Visual customizations which are okay to occur before the theme has been set in custom-set-variables -(load-user-file "visual-early.el") - -;; Stuff unique to certain machines (mine here for reference) -(when (or (string-equal (user-login-name) "macoy") - (string-equal (user-login-name) "mmadson")) - (load-file "~/.emacs-this-machine-only.el") - ) - -;; -;; Hand-written by Macoy end -;; - -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(ansi-color-faces-vector - [default default default italic underline success warning error]) - '(ansi-color-names-vector - ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"]) - '(ansi-term-color-vector - [unspecified "#ffffff" "#c82829" "#718c00" "#eab700" "#4271ae" "#8959a8" "#4271ae" "#4d4d4c"] t) - '(custom-enabled-themes '(base16-ashes)) - '(diary-entry-marker 'font-lock-variable-name-face) - '(ediff-split-window-function 'split-window-horizontally) - '(emms-mode-line-icon-image-cache - '(image :type xpm :ascent center :data "/* XPM */ -static char *note[] = { -/* width height num_colors chars_per_pixel */ -\" 10 11 2 1\", -/* colors */ -\". c #1fb3b3\", -\"# c None s None\", -/* pixels */ -\"###...####\", -\"###.#...##\", -\"###.###...\", -\"###.#####.\", -\"###.#####.\", -\"#...#####.\", -\"....#####.\", -\"#..######.\", -\"#######...\", -\"######....\", -\"#######..#\" };")) - '(fci-rule-color "#383838") - '(gnus-logo-colors '("#2fdbde" "#c0c0c0") t) - '(gnus-mode-line-image-cache - '(image :type xpm :ascent center :data "/* XPM */ -static char *gnus-pointer[] = { -/* width height num_colors chars_per_pixel */ -\" 18 13 2 1\", -/* colors */ -\". c #1fb3b3\", -\"# c None s None\", -/* pixels */ -\"##################\", -\"######..##..######\", -\"#####........#####\", -\"#.##.##..##...####\", -\"#...####.###...##.\", -\"#..###.######.....\", -\"#####.########...#\", -\"###########.######\", -\"####.###.#..######\", -\"######..###.######\", -\"###....####.######\", -\"###..######.######\", -\"###########.######\" };") t) - '(large-file-warning-threshold 60000000) - '(linum-format " %7i ") - '(org-modules - '(org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail org-w3m org-drill)) - '(org-support-shift-select t) - '(package-archives - (quote - (("gnu" . "http://elpa.gnu.org/packages/") - ("melpa" . "http://melpa.org/packages/")))) - '(pos-tip-background-color "#36473A") - '(pos-tip-foreground-color "#FFFFC8") - '(projectile-globally-ignored-directories - '(".idea" ".ensime_cache" ".eunit" ".git" ".hg" ".fslckout" "_FOSSIL_" ".bzr" "_darcs" ".tox" ".svn" ".stack-work" "AutoGen" "obj140")) - '(projectile-indexing-method 'native) - '(tab-width 4) - '(vc-annotate-background "#2B2B2B") - '(vc-annotate-color-map - '((20 . "#BC8383") - (40 . "#CC9393") - (60 . "#DFAF8F") - (80 . "#D0BF8F") - (100 . "#E0CF9F") - (120 . "#F0DFAF") - (140 . "#5F7F5F") - (160 . "#7F9F7F") - (180 . "#8FB28F") - (200 . "#9FC59F") - (220 . "#AFD8AF") - (240 . "#BFEBBF") - (260 . "#93E0E3") - (280 . "#6CA0A3") - (300 . "#7CB8BB") - (320 . "#8CD0D3") - (340 . "#94BFF3") - (360 . "#DC8CC3"))) - '(vc-annotate-very-old-color "#DC8CC3")) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(default ((t (:family "Ubuntu Mono" :foundry "outline" :slant normal :weight normal :height 120 :width normal))))) - -;; -;; Macoy late visual customizations (put here to play nice with themes) -;; - -;; Visual customization which should happen after theme has been set -(load-user-file "visual-late.el") - -;; -;; Macoy Handwritten end -;; - -(put 'upcase-region 'disabled nil) -(put 'downcase-region 'disabled nil) -(put 'dired-find-alternate-file 'disabled nil) + +;; Emacs Notes +;; C-h k to find what a key does +;; C-h b to list all bindings (should've used this more when fighting binds...) +;; C-q = quoted-insert "insert the next character, whatever it is" e.g. useful for inserting a tab +;; describe-char with cursor over character will say where the font face came from (useful for theming) +;; Use ibuffer to select and kill many buffers. kill-some-buffers is also okay +;; Use ediff-revision to easily manipulate working edits +;; Use re-builder to create a regex by seeing the results of it in the current buffer (super awesome) +;; Hit C-f while in ido to disable all completion (for when you're fighting it) +;; Amazing multiline editing: C-f to isearch-forward, then C-a to see all results, then e to edit all lines +;; diff-buffer-with-file to see a diff of current (unsaved) modifications + +;; Used to load separate configuration files I've created. Order matters so they're scattered a bit +(setq user-init-dir "~/.emacs.d/macoy") +(defun load-user-file (file) + (interactive "f") + "Load a file in current user's configuration directory" + (load-file (expand-file-name file user-init-dir))) + +;; BAD THING +;; +;; This is the worst thing ever. Remap keys so I can use C-c and C-x how I damn well please. +;; Subsequently, read C-u as my C-x and C-y as my C-c (yes, it sucks and is confusing as hell. +;; I blame the developers. +;; +(keyboard-translate ?\C-u ?\C-x) +(keyboard-translate ?\C-x ?\C-u) +(keyboard-translate ?\C-y ?\C-c) +(keyboard-translate ?\C-c ?\C-y) + +;; This is a stupid hack around an apparent bug in edebug. +;; If set, don't define C-x anywhere. If C-x is defined then edebug complains about it not being a prefix key +;; You'll need to restart in order for it to work +;; Update: After keyboard-translate, this is no longer an issue. Leaving here in case I go back on keyboard-translate +(setq macoy-edebug-prefix-hack nil) + +;; Handle installing packages +(load-user-file "packages.el") + +;; Simpleclip makes system clipboard and emacs kill ring separate +;; This is sane copy paste behavior +;; I keep this near the top because many of my utilities rely on simpleclip +(when (require 'simpleclip) + (simpleclip-mode 1)) + +;; Settings which affect the core behavior of Emacs as well as interface-changing things like ido +;; This also has random utilities for managing buffers and files +;; This should remain early in load order +(load-user-file "core-settings.el") + +;; Various customizations for Org mode +(load-user-file "org-customizations.el") + +;; Manipulate JIRAs in Org-mode +;; These customizations are required to use org-jira with lower permissions +(load-user-file "org-jira-customizations.el") + +;; Org-drill and associated customizations +(load-user-file "drill-customizations.el") + +;; Make it easier to create and switch desktops +(load-user-file "desktop-management.el") + +;; Utilities for getting around in files (quick jump, saving points, etc.) +(load-user-file "navigation.el") + +;; Various different ways to search +(load-user-file "search.el") + +;; Tools for auto-formatting code, default formatting settings, etc. +(load-user-file "code-formatting.el") + +;; All things tags and autocompletion +(load-user-file "tags-and-autocompletion.el") + +;; Modes and customizations of modes for different syntaxes +(load-user-file "syntaxes.el") + +;; Customizations related to source control stuff like DSVN, Magit, etc. +(load-user-file "source-control.el") + +;; Various compile commands and build system management +(load-user-file "build-systems.el") + +;; Cut/copy/paste and multiple cursors stuff +(load-user-file "clipboard.el") + +;; Keybindings for various modes +;; Note that not all keybinds are defined in this file +(load-user-file "keybinds.el") + +;; Visual customizations which are okay to occur before the theme has been set in custom-set-variables +(load-user-file "visual-early.el") + +;; Stuff unique to certain machines (mine here for reference) +(when (or (string-equal (user-login-name) "macoy") + (string-equal (user-login-name) "mmadson")) + (load-file "~/.emacs-this-machine-only.el") + ) + +;; +;; Hand-written by Macoy end +;; + +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(ansi-color-faces-vector + [default default default italic underline success warning error]) + '(ansi-color-names-vector + ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"]) + '(ansi-term-color-vector + [unspecified "#ffffff" "#c82829" "#718c00" "#eab700" "#4271ae" "#8959a8" "#4271ae" "#4d4d4c"] t) + '(custom-enabled-themes '(base16-ashes)) + '(diary-entry-marker 'font-lock-variable-name-face) + '(ediff-split-window-function 'split-window-horizontally) + '(emms-mode-line-icon-image-cache + '(image :type xpm :ascent center :data "/* XPM */ +static char *note[] = { +/* width height num_colors chars_per_pixel */ +\" 10 11 2 1\", +/* colors */ +\". c #1fb3b3\", +\"# c None s None\", +/* pixels */ +\"###...####\", +\"###.#...##\", +\"###.###...\", +\"###.#####.\", +\"###.#####.\", +\"#...#####.\", +\"....#####.\", +\"#..######.\", +\"#######...\", +\"######....\", +\"#######..#\" };")) + '(fci-rule-color "#383838") + '(gnus-logo-colors '("#2fdbde" "#c0c0c0") t) + '(gnus-mode-line-image-cache + '(image :type xpm :ascent center :data "/* XPM */ +static char *gnus-pointer[] = { +/* width height num_colors chars_per_pixel */ +\" 18 13 2 1\", +/* colors */ +\". c #1fb3b3\", +\"# c None s None\", +/* pixels */ +\"##################\", +\"######..##..######\", +\"#####........#####\", +\"#.##.##..##...####\", +\"#...####.###...##.\", +\"#..###.######.....\", +\"#####.########...#\", +\"###########.######\", +\"####.###.#..######\", +\"######..###.######\", +\"###....####.######\", +\"###..######.######\", +\"###########.######\" };") t) + '(large-file-warning-threshold 60000000) + '(linum-format " %7i ") + '(org-modules + '(org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail org-w3m org-drill)) + '(org-support-shift-select t) + '(package-archives + (quote + (("gnu" . "http://elpa.gnu.org/packages/") + ("melpa" . "http://melpa.org/packages/")))) + '(pos-tip-background-color "#36473A") + '(pos-tip-foreground-color "#FFFFC8") + '(projectile-globally-ignored-directories + '(".idea" ".ensime_cache" ".eunit" ".git" ".hg" ".fslckout" "_FOSSIL_" ".bzr" "_darcs" ".tox" ".svn" ".stack-work" "AutoGen" "obj140")) + '(projectile-indexing-method 'native) + '(tab-width 4) + '(vc-annotate-background "#2B2B2B") + '(vc-annotate-color-map + '((20 . "#BC8383") + (40 . "#CC9393") + (60 . "#DFAF8F") + (80 . "#D0BF8F") + (100 . "#E0CF9F") + (120 . "#F0DFAF") + (140 . "#5F7F5F") + (160 . "#7F9F7F") + (180 . "#8FB28F") + (200 . "#9FC59F") + (220 . "#AFD8AF") + (240 . "#BFEBBF") + (260 . "#93E0E3") + (280 . "#6CA0A3") + (300 . "#7CB8BB") + (320 . "#8CD0D3") + (340 . "#94BFF3") + (360 . "#DC8CC3"))) + '(vc-annotate-very-old-color "#DC8CC3")) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(default ((t (:family "Ubuntu Mono" :foundry "outline" :slant normal :weight normal :height 120 :width normal))))) + +;; +;; Macoy late visual customizations (put here to play nice with themes) +;; + +;; Visual customization which should happen after theme has been set +(load-user-file "visual-late.el") + +;; +;; Macoy Handwritten end +;; + +(put 'upcase-region 'disabled nil) +(put 'downcase-region 'disabled nil) +(put 'dired-find-alternate-file 'disabled nil) diff --git a/Emacs/emacsPackages.txt b/Emacs/emacsPackages.txt index a376213..f4f5489 100644 --- a/Emacs/emacsPackages.txt +++ b/Emacs/emacsPackages.txt @@ -1,36 +1,36 @@ -adaptive-wrap -ag -alect-themes -auto-complete -avy -base16-theme -better-defaults -clang-format -darktooth-theme -diminish -dired-narrow -dsvn -engine-mode -expand-region -flx-ido -ido-vertical-mode -ivy -ivy-xref -iy-go-to-char -keyfreq -magit -marmalade-demo -multiple-cursors -powerline -projectile -rainbow-mode -simpleclip -smex -smooth-scrolling -sublime-themes -swiper -web-beautify -web-mode -xah-find -yasnippet -zenburn-theme +adaptive-wrap +ag +alect-themes +auto-complete +avy +base16-theme +better-defaults +clang-format +darktooth-theme +diminish +dired-narrow +dsvn +engine-mode +expand-region +flx-ido +ido-vertical-mode +ivy +ivy-xref +iy-go-to-char +keyfreq +magit +marmalade-demo +multiple-cursors +powerline +projectile +rainbow-mode +simpleclip +smex +smooth-scrolling +sublime-themes +swiper +web-beautify +web-mode +xah-find +yasnippet +zenburn-theme diff --git a/SublimeText3/SublimeKeybinds.json b/SublimeText3/SublimeKeybinds.json index 326120d..19e18a3 100644 --- a/SublimeText3/SublimeKeybinds.json +++ b/SublimeText3/SublimeKeybinds.json @@ -1,9 +1,9 @@ -[ - { "keys": ["ctrl+m", "ctrl+l"], "command": "fold_by_level", "args": {"level": 1} }, - { "keys": ["ctrl+m", "ctrl+m"], "command": "unfold_all" }, - { "keys": ["ctrl+shift+alt+a"], "command": "alignment" }, - { "keys": ["ctrl+alt+p"], "command": "prompt_select_workspace"}, - { "keys": ["ctrl+j"], "command": "ace_jump_word"}, - { "keys": ["ctrl+shift+j"], "command": "ace_jump_char"}, - { "keys": ["ctrl+shift+g"], "command": "ace_jump_line"} -] +[ + { "keys": ["ctrl+m", "ctrl+l"], "command": "fold_by_level", "args": {"level": 1} }, + { "keys": ["ctrl+m", "ctrl+m"], "command": "unfold_all" }, + { "keys": ["ctrl+shift+alt+a"], "command": "alignment" }, + { "keys": ["ctrl+alt+p"], "command": "prompt_select_workspace"}, + { "keys": ["ctrl+j"], "command": "ace_jump_word"}, + { "keys": ["ctrl+shift+j"], "command": "ace_jump_char"}, + { "keys": ["ctrl+shift+g"], "command": "ace_jump_line"} +] diff --git a/SublimeText3/SublimeSettings.json b/SublimeText3/SublimeSettings.json index bfcee99..f7949c0 100644 --- a/SublimeText3/SublimeSettings.json +++ b/SublimeText3/SublimeSettings.json @@ -1,29 +1,29 @@ -{ - "added_words": - [ - "Macoy" - ], - "auto_match_enabled": false, - "caret_extra_width": 1, - "color_scheme": "Packages/Dayle Rees Color Schemes/sublime/contrast/earthsong-contrast.tmTheme", - "enable_tab_scrolling": false, - "font_face": "Ubuntu Mono", - "font_options": - [ - "directwrite", - "subpixel_antialias" - ], - "font_size": 11, - "ignored_packages": - [ - "Vintage" - ], - "predawn_tabs_active_underline": true, - "predawn_tabs_small": true, - "rulers": - [ - 100 - ], - "theme": "Adaptive.sublime-theme", - "word_wrap": "false" -} +{ + "added_words": + [ + "Macoy" + ], + "auto_match_enabled": false, + "caret_extra_width": 1, + "color_scheme": "Packages/Dayle Rees Color Schemes/sublime/contrast/earthsong-contrast.tmTheme", + "enable_tab_scrolling": false, + "font_face": "Ubuntu Mono", + "font_options": + [ + "directwrite", + "subpixel_antialias" + ], + "font_size": 11, + "ignored_packages": + [ + "Vintage" + ], + "predawn_tabs_active_underline": true, + "predawn_tabs_small": true, + "rulers": + [ + 100 + ], + "theme": "Adaptive.sublime-theme", + "word_wrap": "false" +} diff --git a/VSCode/VSCodeSettings.json b/VSCode/VSCodeSettings.json index 73d76d3..c302469 100644 --- a/VSCode/VSCodeSettings.json +++ b/VSCode/VSCodeSettings.json @@ -1,25 +1,25 @@ -{ - "workbench.colorTheme": "Kimbie Dark", - - "workbench.colorCustomizations": { - "statusBar.background" : "#1A1A1A", - "statusBar.noFolderBackground" : "#212121", - "statusBar.debuggingBackground": "#263238", - - // Remove when theme changes - "editorIndentGuide.background": "#442323" - }, - "clang-format.executable": "C:/clang-format.exe", - "workbench.iconTheme": "vscode-icons", - "window.zoomLevel": 0, - "sublimeTextKeymap.promptV3Features": true, - "editor.multiCursorModifier": "ctrlCmd", - "editor.snippetSuggestions": "top", - "editor.formatOnPaste": true, - - // Don't close my damn files - "workbench.editor.enablePreview": false, - "workbench.editor.enablePreviewFromQuickOpen": false, - - "workbench.editor.tabSizing": "shrink", +{ + "workbench.colorTheme": "Kimbie Dark", + + "workbench.colorCustomizations": { + "statusBar.background" : "#1A1A1A", + "statusBar.noFolderBackground" : "#212121", + "statusBar.debuggingBackground": "#263238", + + // Remove when theme changes + "editorIndentGuide.background": "#442323" + }, + "clang-format.executable": "C:/clang-format.exe", + "workbench.iconTheme": "vscode-icons", + "window.zoomLevel": 0, + "sublimeTextKeymap.promptV3Features": true, + "editor.multiCursorModifier": "ctrlCmd", + "editor.snippetSuggestions": "top", + "editor.formatOnPaste": true, + + // Don't close my damn files + "workbench.editor.enablePreview": false, + "workbench.editor.enablePreviewFromQuickOpen": false, + + "workbench.editor.tabSizing": "shrink", } \ No newline at end of file