From 5d2d7bc030a1a6f010e71db216f1aea4bbda3399 Mon Sep 17 00:00:00 2001 From: Stochastica Date: Sun, 21 Feb 2021 12:11:26 -0500 Subject: [PATCH] Add OCaml support; C++ format update --- home/clang-format | 4 +++- home/spacemacs | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/home/clang-format b/home/clang-format index 110cd32..2c82849 100644 --- a/home/clang-format +++ b/home/clang-format @@ -19,11 +19,12 @@ AlwaysBreakTemplateDeclarations: 'true' BreakBeforeBinaryOperators: All BreakBeforeBraces: Allman BreakBeforeTernaryOperators: 'true' +BreakConstructorInitializers: BeforeComma BreakConstructorInitializersBeforeComma: 'true' BreakStringLiterals: 'true' ColumnLimit: '80' ConstructorInitializerAllOnOneLineOrOnePerLine: 'true' -ConstructorInitializerIndentWidth: '0' +ConstructorInitializerIndentWidth: '2' ContinuationIndentWidth: '2' Cpp11BracedListStyle: 'false' DerivePointerAlignment: 'false' @@ -48,6 +49,7 @@ SortIncludes: 'false' SpaceAfterCStyleCast: 'true' SpaceAfterLogicalNot: 'false' SpaceBeforeAssignmentOperators: 'true' +SpaceBeforeCtorInitializerColon: 'false' SpaceBeforeParens: ControlStatements SpaceInEmptyParentheses: 'false' SpacesBeforeTrailingComments: '2' diff --git a/home/spacemacs b/home/spacemacs index 8b77479..5bf82a6 100644 --- a/home/spacemacs +++ b/home/spacemacs @@ -71,7 +71,7 @@ This function should only modify configuration layer settings." yaml shell-scripts (python :variables - python-shell-interpreter "/home/hsv/common/scr/python.sh" + python-shell-interpreter "~/common/scr/python.sh" python-shell-interpreter-args "-m IPython --simple-prompt -i") (ocaml :variables ocaml-format-on-save t) @@ -115,6 +115,8 @@ This function should only modify configuration layer settings." highlight-doxygen smart-tabs-mode tablist + exec-path-from-shell + merlin ) ;; A list of packages that cannot be updated. @@ -584,6 +586,7 @@ This function is called at the very end of Spacemacs startup, after layer configuration. Put your configuration code here, except for variables that should be set before packages are loaded." + (exec-path-from-shell-initialize) ;; Key Bindings (global-set-key (kbd "") 'centaur-tabs-backward) @@ -671,6 +674,13 @@ before packages are loaded." (set-face-attribute 'highlight-doxygen-comment nil :background nil :slant 'italic) + + (setq opam-share (substring (shell-command-to-string + "opam config var share 2> /dev/null") 0 -1)) + (add-to-list 'load-path (concat opam-share "/emacs/site-lisp")) + (with-eval-after-load 'merlin + (setq merlin-command 'opam)) + (require 'merlin) ) ;; Do not write anything past this comment. This is where Emacs will @@ -678,7 +688,7 @@ before packages are loaded." (defun dotspacemacs/emacs-custom-settings () "Emacs custom settings. This is an auto-generated function, do not modify its content directly, use -Emacs customize menu instead. +Emacs customize menu instead This function is called at the very end of Spacemacs initialization." (custom-set-variables ;; custom-set-variables was added by Custom.