From 50de1005d5ce7b1d6593585afd28f8bbe25d03f0 Mon Sep 17 00:00:00 2001 From: Sebastian Schulze Date: Mon, 26 Oct 2020 10:38:33 +0100 Subject: [PATCH] [emacs] Update spacemacs to latest master --- dot_emacs.d/CHANGELOG.develop | 105 +++++- dot_emacs.d/CHANGELOG.org | 6 +- dot_emacs.d/CONTRIBUTING.org | 2 +- dot_emacs.d/README.md | 8 +- dot_emacs.d/core/aprilfool/zemacs.el | 2 +- dot_emacs.d/core/core-command-line.el | 2 +- dot_emacs.d/core/core-configuration-layer.el | 10 +- dot_emacs.d/core/core-custom-settings.el | 2 +- dot_emacs.d/core/core-debug.el | 2 +- dot_emacs.d/core/core-display-init.el | 2 +- dot_emacs.d/core/core-documentation.el | 2 +- dot_emacs.d/core/core-dotspacemacs.el | 13 +- dot_emacs.d/core/core-dumper.el | 42 ++- dot_emacs.d/core/core-emacs-backports.el | 2 +- dot_emacs.d/core/core-env.el | 4 +- dot_emacs.d/core/core-fonts-support.el | 2 +- dot_emacs.d/core/core-funcs.el | 5 +- dot_emacs.d/core/core-hooks.el | 2 +- dot_emacs.d/core/core-jump.el | 2 +- dot_emacs.d/core/core-keybindings.el | 2 +- dot_emacs.d/core/core-load-paths.el | 2 +- dot_emacs.d/core/core-micro-state.el | 2 +- dot_emacs.d/core/core-progress-bar.el | 2 +- dot_emacs.d/core/core-release-management.el | 2 +- dot_emacs.d/core/core-spacebind.el | 2 +- dot_emacs.d/core/core-spacemacs-buffer.el | 4 +- dot_emacs.d/core/core-spacemacs.el | 7 +- dot_emacs.d/core/core-themes-support.el | 2 +- dot_emacs.d/core/core-toggle.el | 2 +- dot_emacs.d/core/core-transient-state.el | 2 +- dot_emacs.d/core/core-use-package-ext.el | 2 +- dot_emacs.d/core/core-versions.el | 2 +- dot_emacs.d/core/libs/spinner.el | 327 ++++++++++++++++++ .../core/templates/dot_spacemacs.template | 19 +- .../core/templates/packages.el.template | 2 +- dot_emacs.d/doc/BEGINNERS_TUTORIAL.org | 11 +- dot_emacs.d/doc/DOCUMENTATION.org | 21 +- dot_emacs.d/doc/FAQ.org | 2 + dot_emacs.d/doc/LAYERS.org | 2 +- dot_emacs.d/dot_circleci/config.yml | 171 +-------- dot_emacs.d/dot_circleci/executable_select | 20 +- dot_emacs.d/dot_circleci/executable_shared | 18 +- .../workflows/executable_elisp_test.yml | 62 +--- .../workflows/executable_rebase.yml | 21 ++ .../dot_github/workflows/scripts/dot_lock.el | 22 ++ .../workflows/scripts/executable_test | 2 + dot_emacs.d/dot_gitignore | 3 + dot_emacs.d/dot_travis.yml | 2 +- .../dot_travisci/executable_pub_html.sh | 2 +- .../dot_travisci/executable_pub_org.sh | 2 +- dot_emacs.d/early-init.el | 2 +- dot_emacs.d/init.el | 2 +- dot_emacs.d/layers/+chat/rcirc/README.org | 4 +- .../layers/+checkers/spell-checking/config.el | 2 +- .../layers/+checkers/spell-checking/funcs.el | 2 +- .../+checkers/spell-checking/packages.el | 2 +- .../+checkers/syntax-checking/config.el | 2 +- .../layers/+checkers/syntax-checking/funcs.el | 2 +- .../+checkers/syntax-checking/packages.el | 2 +- .../+completion/auto-completion/config.el | 2 +- .../+completion/auto-completion/funcs.el | 2 +- .../+completion/auto-completion/packages.el | 4 +- dot_emacs.d/layers/+completion/helm/config.el | 2 +- dot_emacs.d/layers/+completion/helm/funcs.el | 2 +- dot_emacs.d/layers/+completion/helm/layers.el | 2 +- .../layers/+completion/helm/packages.el | 19 +- dot_emacs.d/layers/+completion/ivy/README.org | 24 +- dot_emacs.d/layers/+completion/ivy/config.el | 2 +- dot_emacs.d/layers/+completion/ivy/funcs.el | 79 +++-- dot_emacs.d/layers/+completion/ivy/layers.el | 2 +- .../layers/+completion/ivy/packages.el | 25 +- .../layers/+completion/templates/config.el | 2 +- .../layers/+completion/templates/packages.el | 2 +- .../+distributions/spacemacs-base/layers.el | 2 +- .../spacemacs-bootstrap/README.org | 2 +- .../spacemacs-bootstrap/config.el | 2 +- .../spacemacs-bootstrap/funcs.el | 2 +- .../evil-evilified-state.el | 2 +- .../local/holy-mode/holy-mode.el | 2 +- .../local/hybrid-mode/hybrid-mode.el | 2 +- .../spacemacs-bootstrap/packages.el | 5 +- .../layers/+distributions/spacemacs/layers.el | 2 +- .../layers/+emacs/better-defaults/config.el | 2 +- .../layers/+emacs/better-defaults/funcs.el | 2 +- .../+emacs/better-defaults/keybindings.el | 2 +- .../layers/+emacs/better-defaults/packages.el | 2 +- dot_emacs.d/layers/+emacs/ibuffer/config.el | 2 +- dot_emacs.d/layers/+emacs/ibuffer/funcs.el | 2 +- dot_emacs.d/layers/+emacs/ibuffer/packages.el | 2 +- dot_emacs.d/layers/+emacs/org/README.org | 72 +++- dot_emacs.d/layers/+emacs/org/config.el | 5 +- dot_emacs.d/layers/+emacs/org/funcs.el | 2 +- dot_emacs.d/layers/+emacs/org/layers.el | 2 +- dot_emacs.d/layers/+emacs/org/packages.el | 111 ++++-- dot_emacs.d/layers/+emacs/outshine/layers.el | 2 +- .../layers/+emacs/outshine/packages.el | 2 +- dot_emacs.d/layers/+emacs/semantic/config.el | 2 +- dot_emacs.d/layers/+emacs/semantic/funcs.el | 2 +- .../layers/+emacs/semantic/packages.el | 2 +- dot_emacs.d/layers/+emacs/smex/funcs.el | 2 +- dot_emacs.d/layers/+emacs/smex/packages.el | 2 +- dot_emacs.d/layers/+emacs/tabs/README.org | 37 ++ dot_emacs.d/layers/+emacs/tabs/config.el | 57 +++ dot_emacs.d/layers/+emacs/tabs/packages.el | 41 +++ .../layers/+emacs/typography/config.el | 2 +- .../layers/+emacs/typography/packages.el | 2 +- dot_emacs.d/layers/+filetree/neotree/funcs.el | 2 +- .../layers/+filetree/neotree/layers.el | 2 +- .../layers/+filetree/neotree/packages.el | 2 +- .../layers/+filetree/treemacs/config.el | 2 +- .../layers/+filetree/treemacs/funcs.el | 2 +- .../layers/+filetree/treemacs/layers.el | 2 +- .../layers/+filetree/treemacs/packages.el | 2 +- .../layers/+fonts/unicode-fonts/README.org | 40 ++- .../layers/+fonts/unicode-fonts/config.el | 30 +- .../layers/+fonts/unicode-fonts/packages.el | 18 +- .../layers/+frameworks/django/layers.el | 2 +- .../layers/+frameworks/django/packages.el | 2 +- .../layers/+frameworks/emberjs/packages.el | 2 +- .../layers/+frameworks/phoenix/layers.el | 2 +- .../layers/+frameworks/phoenix/packages.el | 2 +- .../layers/+frameworks/react/config.el | 2 +- dot_emacs.d/layers/+frameworks/react/funcs.el | 4 +- .../layers/+frameworks/react/layers.el | 2 +- .../layers/+frameworks/react/packages.el | 2 +- .../+frameworks/ruby-on-rails/layers.el | 2 +- .../+frameworks/ruby-on-rails/packages.el | 2 +- dot_emacs.d/layers/+frameworks/vue/config.el | 2 +- dot_emacs.d/layers/+frameworks/vue/funcs.el | 5 +- dot_emacs.d/layers/+frameworks/vue/layers.el | 4 +- .../layers/+frameworks/vue/packages.el | 2 +- dot_emacs.d/layers/+fun/emoji/funcs.el | 2 +- dot_emacs.d/layers/+fun/emoji/packages.el | 2 +- dot_emacs.d/layers/+fun/games/config.el | 2 +- dot_emacs.d/layers/+fun/games/funcs.el | 2 +- dot_emacs.d/layers/+fun/games/packages.el | 2 +- dot_emacs.d/layers/+fun/selectric/packages.el | 2 +- dot_emacs.d/layers/+fun/xkcd/packages.el | 2 +- dot_emacs.d/layers/+intl/chinese/config.el | 2 +- dot_emacs.d/layers/+intl/chinese/packages.el | 2 +- dot_emacs.d/layers/+intl/japanese/README.org | 4 +- dot_emacs.d/layers/+intl/japanese/packages.el | 2 +- .../layers/+intl/keyboard-layout/config.el | 2 +- .../layers/+intl/keyboard-layout/funcs.el | 2 +- .../layers/+intl/keyboard-layout/packages.el | 2 +- dot_emacs.d/layers/+lang/agda/config.el | 2 +- dot_emacs.d/layers/+lang/agda/packages.el | 2 +- dot_emacs.d/layers/+lang/alda/packages.el | 2 +- dot_emacs.d/layers/+lang/asciidoc/packages.el | 2 +- dot_emacs.d/layers/+lang/asm/config.el | 2 +- dot_emacs.d/layers/+lang/asm/funcs.el | 2 +- dot_emacs.d/layers/+lang/asm/packages.el | 2 +- .../layers/+lang/autohotkey/packages.el | 2 +- dot_emacs.d/layers/+lang/c-c++/README.org | 7 +- dot_emacs.d/layers/+lang/c-c++/config.el | 2 +- dot_emacs.d/layers/+lang/c-c++/funcs.el | 5 +- dot_emacs.d/layers/+lang/c-c++/global_conf.py | 2 +- dot_emacs.d/layers/+lang/c-c++/layers.el | 2 +- dot_emacs.d/layers/+lang/clojure/README.org | 1 + dot_emacs.d/layers/+lang/clojure/config.el | 2 +- dot_emacs.d/layers/+lang/clojure/funcs.el | 2 +- dot_emacs.d/layers/+lang/clojure/packages.el | 31 +- .../layers/+lang/coffeescript/config.el | 2 +- .../layers/+lang/coffeescript/funcs.el | 2 +- .../layers/+lang/coffeescript/layers.el | 2 +- .../layers/+lang/coffeescript/packages.el | 2 +- .../layers/+lang/common-lisp/config.el | 2 +- dot_emacs.d/layers/+lang/common-lisp/funcs.el | 2 +- .../layers/+lang/common-lisp/packages.el | 2 +- dot_emacs.d/layers/+lang/coq/config.el | 2 +- dot_emacs.d/layers/+lang/coq/packages.el | 2 +- dot_emacs.d/layers/+lang/crystal/config.el | 2 +- dot_emacs.d/layers/+lang/crystal/funcs.el | 2 +- dot_emacs.d/layers/+lang/crystal/packages.el | 2 +- dot_emacs.d/layers/+lang/csharp/config.el | 2 +- dot_emacs.d/layers/+lang/csharp/funcs.el | 2 +- dot_emacs.d/layers/+lang/csharp/layers.el | 2 +- dot_emacs.d/layers/+lang/csharp/packages.el | 2 +- dot_emacs.d/layers/+lang/csv/packages.el | 2 +- dot_emacs.d/layers/+lang/d/config.el | 2 +- dot_emacs.d/layers/+lang/d/packages.el | 2 +- dot_emacs.d/layers/+lang/dart/config.el | 2 +- dot_emacs.d/layers/+lang/dart/funcs.el | 2 +- dot_emacs.d/layers/+lang/dart/layers.el | 2 +- dot_emacs.d/layers/+lang/dart/packages.el | 2 +- dot_emacs.d/layers/+lang/dhall/packages.el | 2 +- dot_emacs.d/layers/+lang/elixir/config.el | 2 +- dot_emacs.d/layers/+lang/elixir/funcs.el | 2 +- dot_emacs.d/layers/+lang/elixir/layers.el | 2 +- .../layers/+lang/emacs-lisp/README.org | 52 ++- dot_emacs.d/layers/+lang/emacs-lisp/config.el | 2 +- dot_emacs.d/layers/+lang/emacs-lisp/funcs.el | 2 +- .../layers/+lang/emacs-lisp/packages.el | 72 ++-- dot_emacs.d/layers/+lang/erlang/config.el | 2 +- dot_emacs.d/layers/+lang/erlang/packages.el | 2 +- dot_emacs.d/layers/+lang/ess/config.el | 2 +- dot_emacs.d/layers/+lang/ess/funcs.el | 2 +- dot_emacs.d/layers/+lang/ess/layers.el | 2 +- dot_emacs.d/layers/+lang/ess/packages.el | 2 +- dot_emacs.d/layers/+lang/factor/config.el | 2 +- dot_emacs.d/layers/+lang/factor/funcs.el | 2 +- dot_emacs.d/layers/+lang/factor/packages.el | 2 +- dot_emacs.d/layers/+lang/faust/config.el | 2 +- dot_emacs.d/layers/+lang/faust/funcs.el | 2 +- dot_emacs.d/layers/+lang/faust/packages.el | 2 +- dot_emacs.d/layers/+lang/forth/packages.el | 2 +- dot_emacs.d/layers/+lang/fsharp/README.org | 3 +- dot_emacs.d/layers/+lang/fsharp/config.el | 2 +- dot_emacs.d/layers/+lang/fsharp/packages.el | 10 +- dot_emacs.d/layers/+lang/go/README.org | 188 +++++----- dot_emacs.d/layers/+lang/go/config.el | 2 +- dot_emacs.d/layers/+lang/go/funcs.el | 45 +-- dot_emacs.d/layers/+lang/go/layers.el | 2 +- dot_emacs.d/layers/+lang/go/packages.el | 3 +- dot_emacs.d/layers/+lang/gpu/packages.el | 2 +- dot_emacs.d/layers/+lang/graphviz/packages.el | 2 +- dot_emacs.d/layers/+lang/haskell/README.org | 102 ++++-- dot_emacs.d/layers/+lang/haskell/config.el | 2 +- dot_emacs.d/layers/+lang/haskell/funcs.el | 2 +- dot_emacs.d/layers/+lang/haskell/layers.el | 2 +- dot_emacs.d/layers/+lang/haskell/packages.el | 10 +- dot_emacs.d/layers/+lang/html/README.org | 1 + dot_emacs.d/layers/+lang/html/config.el | 2 +- dot_emacs.d/layers/+lang/html/funcs.el | 2 +- dot_emacs.d/layers/+lang/html/layers.el | 2 +- dot_emacs.d/layers/+lang/html/packages.el | 7 +- dot_emacs.d/layers/+lang/hy/funcs.el | 2 +- dot_emacs.d/layers/+lang/hy/layers.el | 2 +- dot_emacs.d/layers/+lang/hy/packages.el | 2 +- dot_emacs.d/layers/+lang/idris/README.org | 2 +- dot_emacs.d/layers/+lang/idris/packages.el | 2 +- dot_emacs.d/layers/+lang/java/README.org | 2 +- dot_emacs.d/layers/+lang/java/config.el | 2 +- dot_emacs.d/layers/+lang/java/funcs.el | 2 +- dot_emacs.d/layers/+lang/java/layers.el | 2 +- dot_emacs.d/layers/+lang/javascript/config.el | 2 +- dot_emacs.d/layers/+lang/javascript/funcs.el | 4 +- dot_emacs.d/layers/+lang/javascript/layers.el | 2 +- dot_emacs.d/layers/+lang/jr/packages.el | 2 +- dot_emacs.d/layers/+lang/jsonnet/packages.el | 2 +- dot_emacs.d/layers/+lang/julia/config.el | 2 +- dot_emacs.d/layers/+lang/julia/funcs.el | 2 +- dot_emacs.d/layers/+lang/julia/layers.el | 2 +- dot_emacs.d/layers/+lang/julia/packages.el | 2 +- dot_emacs.d/layers/+lang/kivy/packages.el | 2 +- dot_emacs.d/layers/+lang/latex/config.el | 2 +- dot_emacs.d/layers/+lang/latex/funcs.el | 2 +- dot_emacs.d/layers/+lang/latex/packages.el | 2 +- dot_emacs.d/layers/+lang/lua/config.el | 2 +- dot_emacs.d/layers/+lang/lua/funcs.el | 2 +- dot_emacs.d/layers/+lang/lua/layers.el | 2 +- dot_emacs.d/layers/+lang/lua/packages.el | 2 +- .../layers/+lang/major-modes/packages.el | 2 +- dot_emacs.d/layers/+lang/markdown/config.el | 2 +- dot_emacs.d/layers/+lang/markdown/funcs.el | 2 +- dot_emacs.d/layers/+lang/markdown/packages.el | 8 +- dot_emacs.d/layers/+lang/mercury/packages.el | 3 +- dot_emacs.d/layers/+lang/ocaml/README.org | 13 +- dot_emacs.d/layers/+lang/ocaml/config.el | 5 +- dot_emacs.d/layers/+lang/ocaml/funcs.el | 2 +- dot_emacs.d/layers/+lang/ocaml/packages.el | 8 + dot_emacs.d/layers/+lang/octave/config.el | 2 +- dot_emacs.d/layers/+lang/octave/packages.el | 2 +- dot_emacs.d/layers/+lang/pact/packages.el | 2 +- dot_emacs.d/layers/+lang/perl5/config.el | 2 +- dot_emacs.d/layers/+lang/perl5/funcs.el | 2 +- dot_emacs.d/layers/+lang/perl5/packages.el | 2 +- dot_emacs.d/layers/+lang/perl6/config.el | 2 +- dot_emacs.d/layers/+lang/perl6/packages.el | 8 +- dot_emacs.d/layers/+lang/php/config.el | 2 +- dot_emacs.d/layers/+lang/php/funcs.el | 2 +- dot_emacs.d/layers/+lang/php/layers.el | 2 +- dot_emacs.d/layers/+lang/php/packages.el | 2 +- dot_emacs.d/layers/+lang/plantuml/packages.el | 2 +- dot_emacs.d/layers/+lang/prolog/config.el | 2 +- dot_emacs.d/layers/+lang/prolog/packages.el | 2 +- dot_emacs.d/layers/+lang/protobuf/funcs.el | 2 +- dot_emacs.d/layers/+lang/protobuf/packages.el | 2 +- .../layers/+lang/purescript/README.org | 28 ++ dot_emacs.d/layers/+lang/purescript/config.el | 7 +- dot_emacs.d/layers/+lang/purescript/funcs.el | 35 ++ dot_emacs.d/layers/+lang/purescript/layers.el | 6 +- .../layers/+lang/purescript/packages.el | 9 +- dot_emacs.d/layers/+lang/python/README.org | 92 +++-- dot_emacs.d/layers/+lang/python/config.el | 4 +- dot_emacs.d/layers/+lang/python/funcs.el | 64 +++- dot_emacs.d/layers/+lang/python/layers.el | 2 +- dot_emacs.d/layers/+lang/python/packages.el | 30 +- dot_emacs.d/layers/+lang/racket/config.el | 2 +- dot_emacs.d/layers/+lang/racket/packages.el | 2 +- dot_emacs.d/layers/+lang/reasonml/config.el | 2 +- dot_emacs.d/layers/+lang/reasonml/funcs.el | 2 +- dot_emacs.d/layers/+lang/reasonml/layers.el | 2 +- dot_emacs.d/layers/+lang/reasonml/packages.el | 2 +- .../layers/+lang/restructuredtext/packages.el | 2 +- dot_emacs.d/layers/+lang/ruby/config.el | 2 +- dot_emacs.d/layers/+lang/ruby/funcs.el | 2 +- dot_emacs.d/layers/+lang/ruby/layers.el | 2 +- dot_emacs.d/layers/+lang/rust/config.el | 2 +- dot_emacs.d/layers/+lang/rust/funcs.el | 2 +- dot_emacs.d/layers/+lang/rust/layers.el | 2 +- dot_emacs.d/layers/+lang/scala/config.el | 2 +- dot_emacs.d/layers/+lang/scala/funcs.el | 2 +- dot_emacs.d/layers/+lang/scala/layers.el | 2 +- dot_emacs.d/layers/+lang/scheme/config.el | 2 +- dot_emacs.d/layers/+lang/scheme/packages.el | 2 +- .../layers/+lang/semantic-web/README.org | 2 +- .../layers/+lang/semantic-web/packages.el | 2 +- .../layers/+lang/shell-scripts/config.el | 2 +- .../layers/+lang/shell-scripts/funcs.el | 2 +- .../layers/+lang/shell-scripts/layers.el | 2 +- .../layers/+lang/shell-scripts/packages.el | 2 +- dot_emacs.d/layers/+lang/sml/packages.el | 2 +- dot_emacs.d/layers/+lang/solidity/layers.el | 2 +- dot_emacs.d/layers/+lang/solidity/packages.el | 2 +- dot_emacs.d/layers/+lang/sql/config.el | 2 +- dot_emacs.d/layers/+lang/sql/packages.el | 2 +- dot_emacs.d/layers/+lang/swift/packages.el | 2 +- .../layers/+lang/typescript/README.org | 32 +- dot_emacs.d/layers/+lang/typescript/config.el | 2 +- dot_emacs.d/layers/+lang/typescript/funcs.el | 4 +- dot_emacs.d/layers/+lang/typescript/layers.el | 2 +- .../layers/+lang/typescript/packages.el | 18 +- .../layers/+lang/windows-scripts/config.el | 2 +- dot_emacs.d/layers/+lang/yaml/config.el | 2 +- dot_emacs.d/layers/+lang/yaml/layers.el | 2 +- dot_emacs.d/layers/+lang/yaml/packages.el | 2 +- dot_emacs.d/layers/+lang/yang/config.el | 2 +- dot_emacs.d/layers/+lang/yang/packages.el | 2 +- dot_emacs.d/layers/+lang/zig/packages.el | 2 +- .../layers/+misc/copy-as-format/packages.el | 2 +- .../layers/+misc/dtrt-indent/README.org | 25 ++ .../layers/+misc/dtrt-indent/packages.el | 25 ++ dot_emacs.d/layers/+misc/ietf/config.el | 2 +- dot_emacs.d/layers/+misc/ietf/packages.el | 2 +- .../layers/+misc/multiple-cursors/config.el | 2 +- .../layers/+misc/multiple-cursors/funcs.el | 2 +- .../layers/+misc/multiple-cursors/packages.el | 3 +- dot_emacs.d/layers/+misc/nlinum/funcs.el | 2 +- dot_emacs.d/layers/+misc/nlinum/packages.el | 2 +- dot_emacs.d/layers/+misc/parinfer/packages.el | 2 +- dot_emacs.d/layers/+music/pianobar/config.el | 2 +- .../layers/+music/pianobar/packages.el | 2 +- dot_emacs.d/layers/+music/spotify/packages.el | 2 +- dot_emacs.d/layers/+os/osx/README.org | 4 +- dot_emacs.d/layers/+os/osx/config.el | 2 +- dot_emacs.d/layers/+os/osx/funcs.el | 2 +- dot_emacs.d/layers/+os/osx/keybindings.el | 2 +- dot_emacs.d/layers/+os/osx/packages.el | 2 +- .../+pair-programming/floobits/packages.el | 2 +- dot_emacs.d/layers/+readers/dash/config.el | 2 +- dot_emacs.d/layers/+readers/dash/funcs.el | 2 +- dot_emacs.d/layers/+readers/deft/config.el | 2 +- dot_emacs.d/layers/+readers/deft/packages.el | 2 +- dot_emacs.d/layers/+readers/elfeed/config.el | 2 +- .../layers/+readers/elfeed/packages.el | 2 +- dot_emacs.d/layers/+readers/epub/packages.el | 2 +- dot_emacs.d/layers/+readers/pdf/packages.el | 4 +- .../layers/+readers/speed-reading/packages.el | 2 +- .../layers/+source-control/git/config.el | 6 +- .../layers/+source-control/git/funcs.el | 2 +- .../layers/+source-control/git/packages.el | 20 +- .../layers/+source-control/github/funcs.el | 2 +- .../layers/+source-control/github/layers.el | 2 +- .../layers/+source-control/github/packages.el | 2 +- .../+source-control/perforce/packages.el | 2 +- .../+source-control/version-control/config.el | 2 +- .../+source-control/version-control/funcs.el | 5 +- .../version-control/keybindings.el | 2 +- .../version-control/packages.el | 5 +- .../+spacemacs/spacemacs-completion/config.el | 2 +- .../+spacemacs/spacemacs-completion/funcs.el | 5 +- .../spacemacs-completion/packages.el | 2 +- .../+spacemacs/spacemacs-defaults/README.org | 1 + .../+spacemacs/spacemacs-defaults/config.el | 2 +- .../+spacemacs/spacemacs-defaults/funcs.el | 57 +-- .../spacemacs-defaults/keybindings.el | 6 +- .../+spacemacs/spacemacs-defaults/packages.el | 68 +++- .../spacemacs-editing-visual/funcs.el | 2 +- .../spacemacs-editing-visual/packages.el | 2 +- .../+spacemacs/spacemacs-editing/README.org | 2 +- .../+spacemacs/spacemacs-editing/funcs.el | 2 +- .../+spacemacs/spacemacs-editing/packages.el | 33 +- .../+spacemacs/spacemacs-evil/config.el | 2 +- .../layers/+spacemacs/spacemacs-evil/funcs.el | 2 +- .../+spacemacs/spacemacs-evil/packages.el | 2 +- .../+spacemacs/spacemacs-language/packages.el | 2 +- .../+spacemacs/spacemacs-layouts/config.el | 2 +- .../+spacemacs/spacemacs-layouts/funcs.el | 2 +- .../+spacemacs/spacemacs-layouts/packages.el | 2 +- .../+spacemacs/spacemacs-misc/packages.el | 2 +- .../+spacemacs/spacemacs-modeline/config.el | 2 +- .../+spacemacs/spacemacs-modeline/funcs.el | 30 +- .../+spacemacs/spacemacs-modeline/packages.el | 31 +- .../+spacemacs/spacemacs-navigation/funcs.el | 2 +- .../spacemacs-navigation/packages.el | 4 +- .../+spacemacs/spacemacs-org/README.org | 2 +- .../local/space-doc/space-doc.el | 2 +- .../+spacemacs/spacemacs-org/packages.el | 2 +- .../+spacemacs/spacemacs-project/funcs.el | 2 +- .../+spacemacs/spacemacs-project/packages.el | 2 +- .../+spacemacs/spacemacs-purpose/funcs.el | 2 +- .../+spacemacs/spacemacs-purpose/packages.el | 2 +- .../+spacemacs/spacemacs-visual/funcs.el | 2 +- .../+spacemacs/spacemacs-visual/packages.el | 2 +- dot_emacs.d/layers/+tags/cscope/config.el | 2 +- dot_emacs.d/layers/+tags/cscope/packages.el | 2 +- dot_emacs.d/layers/+tags/gtags/config.el | 2 +- dot_emacs.d/layers/+tags/gtags/funcs.el | 2 +- dot_emacs.d/layers/+tags/gtags/packages.el | 2 +- dot_emacs.d/layers/+themes/colors/config.el | 2 +- dot_emacs.d/layers/+themes/colors/funcs.el | 2 +- .../+themes/colors/local/nyan-mode/README.org | 2 +- dot_emacs.d/layers/+themes/colors/packages.el | 2 +- .../+themes/themes-megapack/packages.el | 2 +- dot_emacs.d/layers/+themes/theming/config.el | 2 +- dot_emacs.d/layers/+themes/theming/funcs.el | 2 +- .../layers/+themes/theming/packages.el | 2 +- dot_emacs.d/layers/+tools/ansible/config.el | 2 +- dot_emacs.d/layers/+tools/ansible/funcs.el | 2 +- dot_emacs.d/layers/+tools/ansible/layers.el | 2 +- dot_emacs.d/layers/+tools/ansible/packages.el | 2 +- dot_emacs.d/layers/+tools/bm/packages.el | 2 +- .../layers/+tools/cfengine/packages.el | 2 +- dot_emacs.d/layers/+tools/chrome/config.el | 2 +- dot_emacs.d/layers/+tools/chrome/funcs.el | 2 +- .../layers/+tools/chrome/keybindings.el | 2 +- dot_emacs.d/layers/+tools/chrome/packages.el | 2 +- .../layers/+tools/command-log/packages.el | 2 +- dot_emacs.d/layers/+tools/conda/layers.el | 2 +- dot_emacs.d/layers/+tools/conda/packages.el | 2 +- dot_emacs.d/layers/+tools/dap/config.el | 2 +- dot_emacs.d/layers/+tools/dap/layers.el | 2 +- dot_emacs.d/layers/+tools/dap/packages.el | 2 +- dot_emacs.d/layers/+tools/debug/config.el | 2 +- dot_emacs.d/layers/+tools/debug/funcs.el | 2 +- dot_emacs.d/layers/+tools/debug/packages.el | 2 +- dot_emacs.d/layers/+tools/docker/config.el | 2 +- dot_emacs.d/layers/+tools/docker/funcs.el | 2 +- dot_emacs.d/layers/+tools/docker/layers.el | 2 +- dot_emacs.d/layers/+tools/docker/packages.el | 2 +- dot_emacs.d/layers/+tools/fasd/packages.el | 2 +- dot_emacs.d/layers/+tools/finance/packages.el | 2 +- .../layers/+tools/geolocation/config.el | 2 +- .../layers/+tools/geolocation/extensions.el | 2 +- .../extensions/theme-changer/theme-changer.el | 2 +- .../layers/+tools/geolocation/funcs.el | 2 +- .../layers/+tools/geolocation/packages.el | 2 +- .../layers/+tools/imenu-list/packages.el | 2 +- dot_emacs.d/layers/+tools/import-js/config.el | 2 +- dot_emacs.d/layers/+tools/import-js/funcs.el | 2 +- .../layers/+tools/import-js/packages.el | 2 +- .../+tools/ipython-notebook/packages.el | 227 ++++++------ .../layers/+tools/kubernetes/packages.el | 2 +- .../layers/+tools/languagetool/README.org | 78 +++++ .../layers/+tools/languagetool/config.el | 14 + .../layers/+tools/languagetool/funcs.el | 69 ++++ .../+tools/languagetool/img/languagetool.png | Bin 0 -> 5788 bytes .../layers/+tools/languagetool/packages.el | 29 ++ dot_emacs.d/layers/+tools/lsp/README.org | 182 +++++++--- dot_emacs.d/layers/+tools/lsp/config.el | 2 +- dot_emacs.d/layers/+tools/lsp/funcs.el | 3 +- dot_emacs.d/layers/+tools/lsp/layers.el | 2 +- dot_emacs.d/layers/+tools/lsp/packages.el | 9 +- dot_emacs.d/layers/+tools/nginx/packages.el | 2 +- dot_emacs.d/layers/+tools/node/config.el | 2 +- dot_emacs.d/layers/+tools/node/packages.el | 2 +- dot_emacs.d/layers/+tools/pandoc/funcs.el | 2 +- dot_emacs.d/layers/+tools/pandoc/packages.el | 2 +- dot_emacs.d/layers/+tools/pass/README.org | 36 +- dot_emacs.d/layers/+tools/pass/funcs.el | 2 +- dot_emacs.d/layers/+tools/pass/packages.el | 23 +- dot_emacs.d/layers/+tools/prettier/config.el | 2 +- .../layers/+tools/prettier/packages.el | 2 +- dot_emacs.d/layers/+tools/prodigy/packages.el | 2 +- dot_emacs.d/layers/+tools/puppet/layers.el | 2 +- dot_emacs.d/layers/+tools/puppet/packages.el | 2 +- .../layers/+tools/quickurl/keybindings.el | 2 +- dot_emacs.d/layers/+tools/ranger/README.org | 8 +- dot_emacs.d/layers/+tools/ranger/config.el | 4 +- dot_emacs.d/layers/+tools/ranger/packages.el | 2 +- dot_emacs.d/layers/+tools/rebox/config.el | 2 +- dot_emacs.d/layers/+tools/rebox/funcs.el | 2 +- dot_emacs.d/layers/+tools/rebox/packages.el | 2 +- .../layers/+tools/restclient/config.el | 2 +- dot_emacs.d/layers/+tools/restclient/funcs.el | 2 +- .../layers/+tools/restclient/packages.el | 2 +- .../+tools/sailfish-developer/packages.el | 2 +- dot_emacs.d/layers/+tools/salt/packages.el | 2 +- dot_emacs.d/layers/+tools/sphinx/layers.el | 2 +- dot_emacs.d/layers/+tools/sphinx/packages.el | 2 +- dot_emacs.d/layers/+tools/systemd/packages.el | 2 +- dot_emacs.d/layers/+tools/tmux/packages.el | 2 +- .../layers/+tools/transmission/config.el | 2 +- .../layers/+tools/transmission/packages.el | 2 +- dot_emacs.d/layers/+tools/vagrant/README.org | 2 +- dot_emacs.d/layers/+tools/vagrant/packages.el | 2 +- .../layers/+tools/web-beautify/config.el | 2 +- .../layers/+tools/web-beautify/packages.el | 2 +- .../layers/+tools/xclipboard/config.el | 2 +- dot_emacs.d/layers/+tools/xclipboard/funcs.el | 2 +- .../spacemacs-xclipboard.el | 2 +- .../layers/+tools/xclipboard/packages.el | 2 +- .../layers/+vim/evil-commentary/packages.el | 2 +- dot_emacs.d/layers/+vim/evil-snipe/config.el | 2 +- dot_emacs.d/layers/+vim/vinegar/config.el | 2 +- dot_emacs.d/layers/+vim/vinegar/funcs.el | 2 +- .../layers/+vim/vinegar/keybindings.el | 2 +- dot_emacs.d/layers/+vim/vinegar/packages.el | 2 +- .../layers/+web-services/confluence/funcs.el | 2 +- .../+web-services/confluence/packages.el | 2 +- .../layers/+web-services/evernote/packages.el | 2 +- .../+web-services/search-engine/config.el | 2 +- .../+web-services/search-engine/funcs.el | 2 +- .../+web-services/search-engine/packages.el | 2 +- dot_emacs.d/layers/LAYERS.org | 87 +++-- dot_emacs.d/layers/auto-layer.el | 3 +- dot_emacs.d/spacemacs.mk | 2 +- dot_emacs.d/tests/core/Makefile | 2 +- .../core/core-configuration-layer-ftest.el | 10 +- .../core/core-configuration-layer-utest.el | 2 +- dot_emacs.d/tests/core/core-funcs-utest.el | 2 +- .../core/core-release-management-ftest.el | 2 +- .../tests/core/core-spacebind-utest.el | 40 +-- .../tests/core/core-spacemacs-buffer-ftest.el | 2 +- .../tests/core/core-spacemacs-ftest.el | 2 +- dot_emacs.d/tests/doc/Makefile | 2 +- dot_emacs.d/tests/doc/org-export-ftest.el | 2 +- .../+distribution/spacemacs-base/Makefile | 2 +- .../evil-evilified-state-ftest.el | 2 +- .../evil-evilified-state-utest.el | 2 +- .../layers/+distribution/spacemacs/Makefile | 2 +- 532 files changed, 2892 insertions(+), 1508 deletions(-) create mode 100644 dot_emacs.d/core/libs/spinner.el create mode 100644 dot_emacs.d/dot_github/workflows/executable_rebase.yml create mode 100644 dot_emacs.d/dot_github/workflows/scripts/dot_lock.el create mode 100644 dot_emacs.d/layers/+emacs/tabs/README.org create mode 100644 dot_emacs.d/layers/+emacs/tabs/config.el create mode 100644 dot_emacs.d/layers/+emacs/tabs/packages.el create mode 100644 dot_emacs.d/layers/+lang/purescript/funcs.el create mode 100644 dot_emacs.d/layers/+misc/dtrt-indent/README.org create mode 100644 dot_emacs.d/layers/+misc/dtrt-indent/packages.el create mode 100644 dot_emacs.d/layers/+tools/languagetool/README.org create mode 100644 dot_emacs.d/layers/+tools/languagetool/config.el create mode 100644 dot_emacs.d/layers/+tools/languagetool/funcs.el create mode 100644 dot_emacs.d/layers/+tools/languagetool/img/languagetool.png create mode 100644 dot_emacs.d/layers/+tools/languagetool/packages.el diff --git a/dot_emacs.d/CHANGELOG.develop b/dot_emacs.d/CHANGELOG.develop index ee837b8..cee3409 100644 --- a/dot_emacs.d/CHANGELOG.develop +++ b/dot_emacs.d/CHANGELOG.develop @@ -118,6 +118,7 @@ the [[file:CHANGELOG.org][CHANGELOG.org]] file. (thanks to duianto and Sylvain Benner) - Scrolling key bindings are now under ~SPC N~ instead of ~SPC n~ to be able to define more key bindings to scroll. + - Changed decribe themes from ~SPC h d t~ to ~SPC h d T~. - ~SPC q z~ is now ~SPC q f~ to kill a frame. - Remove ~SPC T N~ and make ~SPC T n~ cycle and start the theme transient state (thanks to Sylvain Benner) @@ -286,6 +287,7 @@ sane way, here is the complete list of changed key bindings - New keybinding for =org-table-field-info= ~SPC m t f~ (thanks to Dominik Schrempf) ***** Python +- fix/implement pyvenv-tracking-mode (thanks to Daniel Nicolai) - Key bindings (thanks to Danny Freeman): - Changed ~SPC m s F~ to ~SPC m e F~ for =lisp-eval-defun-and-go= - Changed ~SPC m s R~ to ~SPC m e R~ for =lisp-eval-region-and-go= @@ -341,6 +343,7 @@ sane way, here is the complete list of changed key bindings - templates (thanks to YasuharuIida and Eivind Fonn) **** Emacs - helpful (thanks to Johnson Denen, Andriy Kmit) +- tabs (thanks to Deepu Mohan Puthrote) - verb (thanks to Federico Tedin) **** Email - notmuch (thanks to Francesc Elies Henar, Leonard Lausen, Willian Casarin, @@ -391,6 +394,7 @@ sane way, here is the complete list of changed key bindings - zig (thanks to Michael Hauser-Raspe) **** Misc - copy-as-format (thanks to Ruslan Kamashev) +- dtrt-indent (thanks to Kevin Doherty) - ietf (thanks to Christian Hopps and Robby O'Connor) - multiple-cursors (thanks to Codruț Constantin Gușoi and Thomas de Beauchêne) - parinfer (thanks to Tianshu Shi) @@ -417,6 +421,7 @@ sane way, here is the complete list of changed key bindings - dotnet (thanks to Jordan Kaye) - import-js (thanks to Thanh Vuong and Seong Yong-ju) - kubernetes with tramp support (thanks to Matt Bray and Maximilian Wolff) +- languagetool (thanks to Robbert van der Helm) - lsp (thanks to Fangrui Song, 0bl.blwl, Cormac Cannon, Juuso Valkeejärvi, Guan Xipeng, Ivan Yonchovski, Justin Martin, dscole and Sylvain Benner) - node (thanks to jupl) @@ -516,6 +521,8 @@ Other: terminal mode, but no longer in GUI mode. (emacs18) *** Core changes - Improvements: + - Make =describe-text-properties= available in the help -> describe menu via + ~SPC h d t~ (thanks to Keith Pinson) - Bind ~SPC c n~ to ~:cn~ / ~next-error~ and ~SPC c N~ to ~:cN~ / ~previous-error~ (thanks to Keith Pinson) - Display time spent in =user-config= in home buffer (thanks to Sylvain Benner) @@ -590,6 +597,8 @@ Other: (thanks to duianto) - Add =emacs-version= to the default value for =dotspacemacs-emacs-dumper-dump-file= (thanks to Evan Klitzke) + - Add =spacemacs-scratch-mode-hook= to run functions + after =spacemacs-scratch-mode= is applied to =*scratch*= buffer (thanks to rayw000) - Fixes: - Avoid non-idempotent use of push in init code (thanks to Miciah Masters) - Moved Spacemacs startup progress bar to =core-progress-bar.el=, removed @@ -688,6 +697,8 @@ Other: - Fixed broken --timed-requires and --adv-timers under Emacs 27 and above (thanks to Ying Qu) - Removed nils from =dotspacemacs-configuration-layers= when running tests (thanks to Ag Ibragimov) + - Fixed duplicate quick help and release notes in home buffer + (thanks to mark30247) - Other: - New function =configuration-layer/message= to display message in =*Messages*= buffer (thanks to Sylvain Benner) @@ -718,6 +729,8 @@ Other: - Added reference handler as per jump handler (thanks to Fangrui Song) - Added =spacemacs/iwb-region-or-buffer= (thanks to bb2020) - Enabled eager spacebind bindings by default (thanks to JAremko) + - Add info about requirement to also load additional-package in user-config + section (thank to Daniel Nicolai) *** Distribution changes - Refactored =spacemacs-bootstrap=, =spacemacs-ui=, and =spacemacs-ui-visual= layers: @@ -752,6 +765,7 @@ Other: - Added =symbol-overlay= to the =spacemacs-navigation= layer (thanks to kenkangxgwe) - Key bindings: + - Evilify =Custom-mode= (thanks to Keith Pinson) - Fixed ~M-x~ prefix visualization for ~dotspacemacs-emacs-command-key~ - New ~SPC a Q~ prefix for dispatching quickurl (thanks to Spenser "equwal" Truex:) @@ -1353,6 +1367,9 @@ Other: - Fixed ~SPC h f~ =helm-spacemacs-help-faq= (thanks to duianto) - Fixed =cl= package deprecated =letf= (thanks to duianto) - Fixed origami bindings in normal mode (thanks to Tomasz Kowal) + - Handled buffer move/select/swap to last window nr +1 (thanks to duianto) + - Set =evil-undo-system= to =undo-tree= (thanks to duianto) + - Checked that =evil-undo-system= exists before it's called (thanks to khjcph) *** Layer changes and fixes **** Agda - Fixes @@ -1626,6 +1643,10 @@ Other: ~raN~ 'clojure-insert-ns-form-at-point ~rsn~ 'clojure-sort-ns (thanks to John Stevenson) + - Add key binding for new function cider-eval-list-around-point + added in CIDER 0.26 + ~SPC m e (~ 'cider-eval-list-at-point + (thanks to John Stevenson) - Fixes: - Removed =cider.nrepl/cider-middleware= in lein quick start setting - Fixed =cider-inspector-prev-page= binding, also add ~p~ as another key @@ -1972,6 +1993,9 @@ Other: - ~SPC g l P~ adds region permalink URL to clipboard - Moved =magit-find-file= to view a file at a specific branch or commit from ~SPC g f f~ to ~SPC g f F~ (thanks to duianto and Hong Xu) + - Unbind ~C-f~ from =magit-gitflow-popup= (thanks to rayw000) + - Implement performance hack for MacOS mentioned in Magit manual (thanks to + Keith Pinson) - Fixes: - Install magit-svn by default and activate with git-enable-magit-svn-plugin - Added feature to toggle =evil-magit= based on editing style @@ -2147,6 +2171,8 @@ Other: - Updated =helm-xref= to set the correct =xref-show-xrefs-function= for Emacs 27 (thanks to Junxuan) - Hide =helm-ff-cache-mode= mode-line indicator (thanks to duianto) + - Ignored =helm-full-frame= and =pop-up-windows= in =helm-swoop= to fix + selection navigation (thanks to Boris Sergeyev) - Key bindings: - Added Key bindings for directory search: - ~SPC s d for =spacemacs/helm-dir-smart-do-search= @@ -2190,6 +2216,9 @@ Other: - Fixed searching in a project with ~C-s~ from ~SPC p p~ (thanks to duianto) - Fixed ~C-c C-e~ =helm-find-files-edit= action (thanks to duianto) - Added =spacemacs/helm-dir-do-grep= to fix #13167 (thanks to Richard Kim) + - Moved the =helm-org= definition from the =org= layer to =helm= so that + =helm-spacemacs-faq= (~SPC h f~) works without the =org= layer + (thanks to Nicholas Kirchner) **** HTML - Added =impatient-mode= under ~SPC m i~ (thanks to geo7) - Added =counsel-css= as an =ivy= alternative to =helm-css-scss= @@ -2267,6 +2296,19 @@ Other: - Add ~d~ to create a project perspective and open a project root dired buffer, from the ~SPC p l~ persp switch project prompt (thanks to Magnus Therning and Muneeb Shaikh) + - Rebind =SPC s S= from =spacemacs/swiper-region-or-symbol= to Ivy native + =swiper-thing-at-point= + - Rebind =SPC s S= from =spacemacs/swiper-all-region-or-symbol= to Ivy native + =swiper-all-thing-at-point= + (last two points thanks to Daniel Nicolai) + - Bound =SPC s l= to =ivy-resume= (thanks to Wieland Hoffmann) + - Rebind =C-k= to =C-M-k= in =ivy-reverse-i-search= (=C-r= at a prompt) + (thanks to duianto) +- Removed definitions for =spacemacs/swiper-region-or-symbol= and + =spacemacs/swiper-all-region-or-symbol= and updated keybindings, because Ivy has + more advanced implementation via =swiper-thing-at-point= and + =swiper-all-thing-at-point= + - Add C-RET for ivy-alt-done (thanks to Daniel Nicolai) - Limit =ripgrep= results to 150 columns (thanks to Aaron Jensen) - Use new API to register additional transient state bindings (thanks to Andriy Kmit') @@ -2318,6 +2360,8 @@ Other: - Fix visual selection expansion across the buffer on `SPC s S` and `SPC s B` (thanks to Andriy Kmit) - Fixed =cl= package deprecated =letf*= (thanks to duianto) +- Fixed counsel find-file functions to use Spacemacs check for opening large +files (thanks to Daniel Nicolai) **** Imenu-list - Changed ~SPC b i~ to ~SPC b t~ for =imenu= tree view (thansk to Sylvain Benner) @@ -2504,6 +2548,10 @@ Other: - Removed =company-lsp=. Now =lsp-mode= is responsible for configuring =company-backends= and it will use =company-capf=. - Fixed upstream removal of =lsp-clients= (thanks to Colin Woodbury) +- Added documentation for =lsp-headerline-breadcrumb-mode=, =lsp-lens-mode=, + =lsp-modeline-diagnostics-mode=, and =lsp-modeline-code-actions-mode= + (thanks to Lucius Hu) +- Added =lsp-version= to ~SPC m b v~ (thanks to nanashi0x74) **** Debug Adapter Protocol (DAP) - Layer variables: - Added variable =dap-enable-mouse-support= @@ -2619,6 +2667,7 @@ Other: - ~grI~ =evil-mc-make-cursor-in-visual-selection-beg= - ~grA~ =evil-mc-make-cursor-in-visual-selection-end= (thanks to duianto) +- Disabled =evil-mc-mode= in =magit-mode= (thanks to duianto) **** Neotree - Made neotree an optional instead of a default layer - Move neotree to its own layer in new +filetree folder @@ -2677,6 +2726,8 @@ Other: - Added shortcuts for handling scheduled entries (thanks to Daniel Nicolai) - Added package for =org-sticky-header-mode= (thanks to Langston Barret) - Added package =org-jira= (thanks to Kirill A. Korinsky) + - Added package =org-rich-yank= (thanks to Keith Pinson) + - Added package =org-roam= (thanks to Mariusz Klochowicz) - Key bindings: - ~SPC m T i~ to toggle inline images - Move clock related key bindings to ~SPC a o C~ @@ -2766,11 +2817,28 @@ Other: - Key binding changes for archiving (thanks to Ag Ibragimov): - Added ~SPC m s a~ to toggle archive tag for subtree - Added ~SPC m s A~ to archive subtree (previously ~SPC m s a~) + - Change key binding for widening from Org menu from ~SPC m s N~ to ~SPC m s w~ + to match mnemonics of regular binding ~SPC n w~ (thanks to Keith Pinson) - Added ~SPC m i L~ as =org-cliplink= into =org= layer (thanks to bb2020) - Added ~SPC m e s~ =org-mime-org-subtree-htmlize= (thanks to Nick Anderson) - Documented more insertion bindings (thanks to Lorenzo Manacorda): - ~C-RET~ Insert heading at end of current subtree - ~C-S-RET~ Insert TODO heading at end of current subtree + - Changed =helm-org-rifle= keybindings to ~SPC a o /~, falling back to its + previous functionality if using ivy (thanks to Mariusz Klochowicz) + - Added keybindings for =org-roam= under menu prefix ~SPC a o r~ and ~SPC m r~ + - ~SPC a o r l~ (~SPC m r l~) Toggle org-roam links visibility + - ~SPC a o r f~ (~SPC m r f~) Find file in org-roam + - ~SPC a o r i~ (~SPC m r i~) Insert file into org-roam + - ~SPC a o r I~ (~SPC m r I~) Immediately insert file into org-roam + - ~SPC a o r g~ (~SPC m r g~) Visualize org-roam graph + - ~SPC a o r b~ (~SPC m r b~) Switch org-roam buffer + - ~SPC a o r d y~ (~SPC m r d y~) Open yesterday's daily note + - ~SPC a o r d t~ (~SPC m r d t~) Open today's daily note + - ~SPC a o r d T~ (~SPC m r d T~) Open tomorrow's daily note + (thanks to Mariusz Klochowicz) + - Added additional prefix (~SPC m m j~) for org-jira bindings + (thanks to Mariusz Klochowicz) - Made =org= layer depend on =spacemacs-org= (thanks to Eivind Fonn) - Remove =mu4e= and =notmuch= from =org= (thanks to Sylvain Benner) - Use evil-org from MELPA (thanks to Eivind Fonn) @@ -2891,6 +2959,9 @@ Other: - bind ~q~ to quit-window in view mode (thanks to Saulius Menkevičius) **** Prolog - Fixed autoloading error (thanks to jpathy) +**** Protobuf +- Prompt user to install the =protobuf= layer if a =.proto= file is opened + (thanks to duianto) **** Purescript - Enabled =purescript-decl-scan-mode= when loading =purescript-mode= (thanks to Bjarke Vad Andersen) @@ -2981,6 +3052,8 @@ Other: - Fixed directory selection for self compiled mspyls (thanks Jee Lee) - Add python-test-last support for pytest runner - Added --last-failed support for pytest (thanks to Jaakko Luttinen) +- Added =spacemacs/python-shell-send-statement= support (thanks to Lin Sun) +- Added =sphinx-doc= support (thanks to Stefan Ruschke) **** Racket - Restore smart closing paren behavior in racket-mode (thanks to Don March) - Updated racket logo (thanks to Vityou) @@ -2992,6 +3065,7 @@ Other: - Added ~-~ to enter (thanks to Rich Alesi) - Fixed conflict with =golden-ratio= (thanks to Thomas de Beauchêne) - Load =helm= before =ranger= (thanks to duianto) +- Add instruction to use ranger by default (thanks to Daniel Nicolai) **** Rcirc - New variable =rcirc-enable-late-fix= to enable or disable the included =rcirc-late-fix= package (disabled by default). @@ -3500,6 +3574,7 @@ Other: - Avoided installing unused diff packages (thanks to Andriy Kmit) - Fixed error on =diff-hl-margin-mode= function being nil during startup (thanks to Voleking) +- Fixed =git-gutter+= refresh when a buffer is staged or unstaged in Magit **** Vue - Added a toggle state minified/full to the transient state (thanks to duianto) **** Xclipboard @@ -3557,21 +3632,21 @@ Other: Stone, Kainalu Hagiwara, Kalle Lindqvist, Kechao Cai, Keith Simmons, Keith Wygant, Kenji Miyazaki ,Kevin Ji, Kristoffer Haugsbakk, lawrsp, Leo Joseph Buchignani III, liuchong, Lucius Hu, Luke Winship, Luke Worth, Marco Ieni, - Marco Zucconelli, Martin Sosic, Max Beutelspacher, Max Deineko, Max Nordlund, - Maximilian Wolff, Miciah Dashiel Butler Masters, mjkramer, Mikhail Yakutovich, - Miloš Mošić, milserk, Muneeb Shaikh, Nasser Alshammari, Niko Felger, Nikolai - Myllymäki, nikolaiam, Nicolas Forgerit, Oguz Serbetci, Olivier Verdier, Pancho - Horrillo, Paul Milla, Paulo Schneider, Pawan Dubey, Paweł Siudak, Phil - Pirozhkov, Philippe Bourdages, Piotr Grzesik, Rafi Khan, Rand01ph, rakyi, - Raymond Wanyoike, Reverend Homer, Robby O'Connor, Robert Roland, Rhommel - Lamas, Sam Pablo Kuper, Saulius Menkevičius, sduthil, Serghei Iakovlev, Sergio - Ugalde, Shane Kilkelly, Sid Kapur, Som Poddar, Somelauw, Soobin Rho, sorawee, - SteveJobzniak, Sunghyun Hwang, Sunlin7, Swaroop C H, Sylvain Benner, Szunti, - Thijs Vermeir, Tianyi Wang, Tim Stewart, timor, TinySong, Titov Andrey, Thomas - de Beauchêne, Tomasz Cichocinski, Trey Merkley, tzhao11, Vincent Taing, Ullas - Holla, Vlad Bokov, Vladimir Kochnev, weihua-lu, wenpin, Wieland Hoffmann, - Witoslaw Koczewski, Xiang Ji, Yi Liu, Zach Latta, Zane Sterling, zer09, Zhige - Xin) + Marco Zucconelli, mark30247, Martin Sosic, Max Beutelspacher, Max Deineko, Max + Nordlund, Maximilian Wolff, Miciah Dashiel Butler Masters, mjkramer, Mikhail + Yakutovich, Miloš Mošić, milserk, Muneeb Shaikh, nanashi0x74, Nasser + Alshammari, Niko Felger, Nikolai Myllymäki, nikolaiam, Nicolas Forgerit, Oguz + Serbetci, Olivier Verdier, Pancho Horrillo, Paul Milla, Paulo Schneider, Pawan + Dubey, Paweł Siudak, Phil Pirozhkov, Philippe Bourdages, Piotr Grzesik, Rafi + Khan, Rand01ph, rakyi, Raymond Wanyoike, Reverend Homer, Robby O'Connor, + Robert Roland, Rhommel Lamas, Sam Pablo Kuper, Saulius Menkevičius, sduthil, + Serghei Iakovlev, Sergio Ugalde, Shane Kilkelly, Sid Kapur, Som Poddar, + Somelauw, Soobin Rho, sorawee, SteveJobzniak, Sunghyun Hwang, Sunlin7, Swaroop + C H, Sylvain Benner, Szunti, Thijs Vermeir, Tianyi Wang, Tim Ruffing, Tim + Stewart, timor, TinySong, Titov Andrey, Thomas de Beauchêne, Tomasz + Cichocinski, Trey Merkley, tzhao11, Vincent Taing, Ullas Holla, Vlad Bokov, + Vladimir Kochnev, weihua-lu, wenpin, Wieland Hoffmann, Witoslaw Koczewski, + Xiang Ji, Yi Liu, Zach Latta, Zane Sterling, zer09, Zhige Xin) **** Documentation and website - DOCUMENTATION.org: - Fixed the example for how to change the separator style diff --git a/dot_emacs.d/CHANGELOG.org b/dot_emacs.d/CHANGELOG.org index 539f891..a6bea17 100644 --- a/dot_emacs.d/CHANGELOG.org +++ b/dot_emacs.d/CHANGELOG.org @@ -1310,7 +1310,7 @@ =dotspacemacs-command-key=. This variable represents the key to press after the leader key to execute =M-x=. Default value is ~SPC~. - New variable =dotspacemacs-folding-method= to allow choosing between - different code folding methods. Currently supported are =evil= and =origami=. + different code folding methods. Currently supported are =evil=, =origami= and =vimish=. Default value is =evil=. (thanks to ralesi) - New variable =dotspacemacs-ex-substitute-global=, if non-nil then the behavior of the =g= flag in =:substitute= ex-command is inverted. @@ -1342,7 +1342,9 @@ *** Distribution layer changes - Add package =evil-ediff= (thanks to justbur) - Add package =evil-visual-mark-mode= (thanks to nixmaniack) -- Add package =origmai= (used only if new variable =dotspacemacs-folding-method= +- Add packages =vimish-fold= and =evil-vimish-fold= (used only if new variable =dotspacemacs-folding-method= + is set to =origami=) (thanks to Keith Pinson) +- Add package =origami= (used only if new variable =dotspacemacs-folding-method= is set to =origami=) (thanks to ralesi) - Add package =link-hint=: - ~SPC x o~ to use avy to select a link in the frame and open it diff --git a/dot_emacs.d/CONTRIBUTING.org b/dot_emacs.d/CONTRIBUTING.org index 97a1e68..010bb70 100644 --- a/dot_emacs.d/CONTRIBUTING.org +++ b/dot_emacs.d/CONTRIBUTING.org @@ -181,7 +181,7 @@ The file header for =elisp= files should look like the following template: #+BEGIN_EXAMPLE ;;; FILENAME --- NAME Layer packages File for Spacemacs ;; - ;; Copyright (c) 2012-2018 Sylvain Benner & Contributors + ;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: YOUR_NAME ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/README.md b/dot_emacs.d/README.md index 076cd8e..6440abc 100644 --- a/dot_emacs.d/README.md +++ b/dot_emacs.d/README.md @@ -511,19 +511,19 @@ the spacemacs badge: [![Built with Spacemacs](https://cdn.rawgit.com/syl20bnr/sp - For Markdown: - ``` + ```markdown [![Built with Spacemacs](https://cdn.rawgit.com/syl20bnr/spacemacs/442d025779da2f62fc86c2082703697714db6514/assets/spacemacs-badge.svg)](http://spacemacs.org) ``` - For HTML: - ``` - + ```html + Built with Spacemacs ``` - For Org-mode: - ``` + ```org [[http://spacemacs.org][file:https://cdn.rawgit.com/syl20bnr/spacemacs/442d025779da2f62fc86c2082703697714db6514/assets/spacemacs-badge.svg]] ``` diff --git a/dot_emacs.d/core/aprilfool/zemacs.el b/dot_emacs.d/core/aprilfool/zemacs.el index c14e009..7e82046 100644 --- a/dot_emacs.d/core/aprilfool/zemacs.el +++ b/dot_emacs.d/core/aprilfool/zemacs.el @@ -1,6 +1,6 @@ ;;; zemacs.el --- Spacemacs 2016 April Fools File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-command-line.el b/dot_emacs.d/core/core-command-line.el index ea03ad4..8fe71d8 100644 --- a/dot_emacs.d/core/core-command-line.el +++ b/dot_emacs.d/core/core-command-line.el @@ -1,6 +1,6 @@ ;;; core-command-line.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-configuration-layer.el b/dot_emacs.d/core/core-configuration-layer.el index b6608aa..57d3674 100644 --- a/dot_emacs.d/core/core-configuration-layer.el +++ b/dot_emacs.d/core/core-configuration-layer.el @@ -1,7 +1,7 @@ ;; -*- nameless-current-name: "configuration-layer" -*- ;;; core-configuration-layer.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -214,7 +214,7 @@ LAYER has to be installed for this method to work properly." (when (and (numberp rank) (not (eq 'unspecified shadow-candidates)) (listp shadow-candidates)) - (mapcar + (mapc (lambda (other) (let ((orank (cl-position other configuration-layer--used-layers))) ;; OTHER shadows LAYER if and only if OTHER's rank is bigger than @@ -2458,7 +2458,7 @@ depends on it." (let ((layer-name (intern (completing-read "Choose a used layer" - (sort (copy-list configuration-layer--used-layers) #'string<))))) + (sort (cl-copy-list configuration-layer--used-layers) #'string<))))) (let ((mode-exts (configuration-layer//lazy-install-extensions-for-layer layer-name))) (dolist (x mode-exts) @@ -2604,7 +2604,7 @@ Returns nil if the version is unknown." (when (file-exists-p configuration-layer--stable-elpa-version-file) (with-current-buffer (find-file-noselect configuration-layer--stable-elpa-version-file) - (when (called-interactively-p) + (when (called-interactively-p 'interactive) (message "Stable ELPA repository version is: %s" (buffer-string))) (buffer-string)))) @@ -2652,7 +2652,7 @@ MSG is an additional message append to the generic error." (with-current-buffer (find-file-noselect configuration-layer--stable-elpa-version-file) (erase-buffer) - (beginning-of-buffer) + (goto-char (point-min)) (insert (format "%s" configuration-layer-stable-elpa-version)) (save-buffer))) diff --git a/dot_emacs.d/core/core-custom-settings.el b/dot_emacs.d/core/core-custom-settings.el index 33c0e78..ec15dff 100644 --- a/dot_emacs.d/core/core-custom-settings.el +++ b/dot_emacs.d/core/core-custom-settings.el @@ -1,6 +1,6 @@ ;;; core-custom-settings.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-debug.el b/dot_emacs.d/core/core-debug.el index 403d86c..571377b 100644 --- a/dot_emacs.d/core/core-debug.el +++ b/dot_emacs.d/core/core-debug.el @@ -1,6 +1,6 @@ ;;; core-debug.el --- Spacemacs Core File -*- lexical-binding: t; -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-display-init.el b/dot_emacs.d/core/core-display-init.el index bd45e7d..89d6c9f 100644 --- a/dot_emacs.d/core/core-display-init.el +++ b/dot_emacs.d/core/core-display-init.el @@ -1,6 +1,6 @@ ;;; core-display-init.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-documentation.el b/dot_emacs.d/core/core-documentation.el index 96bfc4a..e74b7f9 100644 --- a/dot_emacs.d/core/core-documentation.el +++ b/dot_emacs.d/core/core-documentation.el @@ -1,6 +1,6 @@ ;;; core-spacemacs.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-dotspacemacs.el b/dot_emacs.d/core/core-dotspacemacs.el index b2f897a..ad61517 100644 --- a/dot_emacs.d/core/core-dotspacemacs.el +++ b/dot_emacs.d/core/core-dotspacemacs.el @@ -1,6 +1,6 @@ ;;; core-dotspacemacs.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -61,7 +61,7 @@ or `spacemacs'.") (defvar dotspacemacs-enable-emacs-pdumper nil "If non-nil then enable support for the portable dumper. You'll need to compile Emacs 27 from source following the instructions in file -EXPERIMENTAL.org at to root of the git repository.") +EXPERIMENTAL.org at the root of the git repository.") (defvar dotspacemacs-emacs-pdumper-executable-file "emacs" "File path pointing to emacs 27 or later executable.") @@ -96,7 +96,8 @@ environment, otherwise it is strongly recommended to let it set to t.") (defvar dotspacemacs-use-spacelpa nil "If non-nil then Spacelpa repository is the primary source to install a locked version of packages. If nil then Spacemacs will install the latest -version of packages from MELPA.") +version of packages from MELPA. Spacelpa is currently in experimental +state and should only be used for testing.") (defvar dotspacemacs-verify-spacelpa-archives nil "If non-nil then verify the signature for downloaded Spacelpa archives.") @@ -242,7 +243,7 @@ pressing ` m`. Set it to `nil` to disable it.") running Emacs in terminal.") (defvar dotspacemacs-folding-method 'evil - "Code folding method. Possible values are `evil' and `origami'.") + "Code folding method. Possible values are `evil', `origami' and `vimish'.") (defvar dotspacemacs-default-layout-name "Default" "Name of the default layout.") @@ -542,7 +543,7 @@ the symbol of an editing style and the cdr is a list of keyword arguments like Returns non nil if the layer has been effectively inserted." (unless (configuration-layer/layer-used-p layer-name) (with-current-buffer (find-file-noselect (dotspacemacs/location)) - (beginning-of-buffer) + (goto-char (point-min)) (let ((insert-point (re-search-forward "[^`]dotspacemacs-configuration-layers\\s-*\n?[^(]*\\((\\)"))) @@ -757,7 +758,7 @@ If ARG is non nil then ask questions to the user before installing the dotfile." (fs (format-spec-make ?a abbreviated-file-name ?t project-name - ?S system-name + ?S (system-name) ?I invocation-name ?U (or (getenv "USER") "") ?b "%b" diff --git a/dot_emacs.d/core/core-dumper.el b/dot_emacs.d/core/core-dumper.el index 7b8d708..526b13a 100644 --- a/dot_emacs.d/core/core-dumper.el +++ b/dot_emacs.d/core/core-dumper.el @@ -1,6 +1,6 @@ ;;; core-dumper.el --- Spacemacs Core File -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -9,6 +9,8 @@ ;; ;;; License: GPLv3 +(require 'spinner) + (defvar spacemacs-dump-mode 'not-dumped "Spacemacs dump mode, can be `not-dumped', `dumped' or `dumping'.") @@ -21,11 +23,20 @@ (defvar spacemacs-dump-load-path nil "Variable to backup the `load-path' variable built during the dump creation.") +(defvar spacemacs-dump-spinner nil + "Spinner curently being displayed on the `global-mode-string'.") + +(defvar spacemacs--dump-old-global-mode-string nil + "Copy of `global-mode-string' before the spinner is created") + (defconst spacemacs-dump-directory (concat spacemacs-cache-directory "dumps/")) (defconst spacemacs-dump-buffer-name "*spacemacs-dumper*") +(defconst spacemacs--dump-spinner-construct + '("" (:eval (spinner-print spacemacs-dump-spinner)))) + (defun spacemacs/dump-save-load-path () "Save `load-path' variable." (setq spacemacs-dump-load-path load-path)) @@ -41,7 +52,7 @@ (when (eq 'not-dumped spacemacs-dump-mode) (or idle-time t))) -(defmacro spacemacs|require (&rest args) +(defmacro spacemacs|require-when-dumping (&rest args) "Require feature if dumping." (spacemacs|when-dumping-strict `(require ,@args))) @@ -101,18 +112,26 @@ the end of the loading of the dump file." (message "Loading mode %S..." mode) (funcall-interactively mode))))) -(defun spacemacs/dump-emacs () - "Dump emacs in a subprocess." - (interactive) +(defun spacemacs/dump-emacs (&optional display-buffer) + "Dump emacs in a subprocess. +When universal prefix argument is passed then display the process buffer." + (interactive "P") (when spacemacs-dump-process (message "Cancel running dumping process to start a new one.") + (spinner-stop) (delete-process spacemacs-dump-process)) (when-let ((buf (get-buffer spacemacs-dump-buffer-name))) (with-current-buffer buf (erase-buffer))) (make-directory spacemacs-dump-directory t) - (let* ((dump-file (concat spacemacs-dump-directory dotspacemacs-emacs-dumper-dump-file)) + (let* ((dump-file (concat spacemacs-dump-directory + dotspacemacs-emacs-dumper-dump-file)) (dump-file-temp (concat dump-file ".new"))) + (unless (equal global-mode-string spacemacs--dump-spinner-construct) + (setq spacemacs--dump-old-global-mode-string global-mode-string)) + (setq spacemacs-dump-spinner (make-spinner 'progress-bar nil 1)) + (spinner-start spacemacs-dump-spinner) + (setq global-mode-string spacemacs--dump-spinner-construct) (setq spacemacs-dump-process (make-process :name "spacemacs-dumper" @@ -125,19 +144,24 @@ the end of the loading of the dump file." (with-current-buffer spacemacs-dump-buffer-name (rename-file dump-file-temp dump-file t) (goto-char (point-max)) + (message "Successfully dumped Spacemacs!") (insert (format "Done!\n" dump-file-temp dump-file))) (with-current-buffer spacemacs-dump-buffer-name (delete-file dump-file-temp nil) (goto-char (point-max)) - (insert "Failed\n"))) + (message "Error while dumping Spacemacs!") + (insert "Failed!\n"))) + (spinner-stop) + (setq global-mode-string spacemacs--dump-old-global-mode-string) (delete-process spacemacs-dump-process) (setq spacemacs-dump-process nil))) :command (list dotspacemacs-emacs-pdumper-executable-file "--batch" "-l" (concat spacemacs-start-directory "dump-init.el") - "-eval" (concat "(dump-emacs-portable \"" dump-file-temp "\")") - ))))) + "-eval" (concat "(dump-emacs-portable \"" dump-file-temp "\")")))) + (when (equal '(4) display-buffer) + (pop-to-buffer spacemacs-dump-buffer-name)))) (defun spacemacs/dump-eval-delayed-functions () "Evaluate delayed functions." diff --git a/dot_emacs.d/core/core-emacs-backports.el b/dot_emacs.d/core/core-emacs-backports.el index c629dd5..ed3cad0 100644 --- a/dot_emacs.d/core/core-emacs-backports.el +++ b/dot_emacs.d/core/core-emacs-backports.el @@ -1,6 +1,6 @@ ;;; core-emacs-backports.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-env.el b/dot_emacs.d/core/core-env.el index 8743947..1ff4db2 100644 --- a/dot_emacs.d/core/core-env.el +++ b/dot_emacs.d/core/core-env.el @@ -1,6 +1,6 @@ ;;; core-env.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -87,7 +87,7 @@ current contents of the file will be overwritten." (dolist (shell-command-switch shell-command-switches) (call-process-shell-command (concat executable " > " (shell-quote-argument tmpfile))) - (insert-file tmpfile)) + (insert-file-contents tmpfile)) (delete-file tmpfile) ;; sort the environment variables (sort-regexp-fields nil "^.*$" ".*?=" env-point (point-max)) diff --git a/dot_emacs.d/core/core-fonts-support.el b/dot_emacs.d/core/core-fonts-support.el index d5842d1..954a667 100644 --- a/dot_emacs.d/core/core-fonts-support.el +++ b/dot_emacs.d/core/core-fonts-support.el @@ -1,6 +1,6 @@ ;;; core-fonts-support.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-funcs.el b/dot_emacs.d/core/core-funcs.el index 75be6b2..ebaa47f 100644 --- a/dot_emacs.d/core/core-funcs.el +++ b/dot_emacs.d/core/core-funcs.el @@ -1,6 +1,6 @@ ;;; core-funcs.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -416,7 +416,8 @@ set." (min spacemacs--gne-max-line (max spacemacs--gne-min-line (+ num spacemacs--gne-cur-line)))) - (goto-line spacemacs--gne-cur-line) + (goto-char (point-min)) + (forward-line (1- spacemacs--gne-cur-line)) (funcall spacemacs--gne-line-func (buffer-substring (point-at-bol) (point-at-eol)))) diff --git a/dot_emacs.d/core/core-hooks.el b/dot_emacs.d/core/core-hooks.el index 1724d6e..733270e 100644 --- a/dot_emacs.d/core/core-hooks.el +++ b/dot_emacs.d/core/core-hooks.el @@ -1,6 +1,6 @@ ;;; core-hooks.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-jump.el b/dot_emacs.d/core/core-jump.el index ad2fc2a..3af4566 100644 --- a/dot_emacs.d/core/core-jump.el +++ b/dot_emacs.d/core/core-jump.el @@ -1,6 +1,6 @@ ;;; core-jump.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-keybindings.el b/dot_emacs.d/core/core-keybindings.el index b9a62f1..fed186e 100644 --- a/dot_emacs.d/core/core-keybindings.el +++ b/dot_emacs.d/core/core-keybindings.el @@ -1,6 +1,6 @@ ;;; core-keybindings.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-load-paths.el b/dot_emacs.d/core/core-load-paths.el index 718b27c..184d53e 100644 --- a/dot_emacs.d/core/core-load-paths.el +++ b/dot_emacs.d/core/core-load-paths.el @@ -1,6 +1,6 @@ ;;; core-load-paths.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-micro-state.el b/dot_emacs.d/core/core-micro-state.el index c62bced..8e437be 100644 --- a/dot_emacs.d/core/core-micro-state.el +++ b/dot_emacs.d/core/core-micro-state.el @@ -1,7 +1,7 @@ ;;; -*- lexical-binding: t -*- ;;; core-micro-state.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-progress-bar.el b/dot_emacs.d/core/core-progress-bar.el index c19fb90..5fd028c 100644 --- a/dot_emacs.d/core/core-progress-bar.el +++ b/dot_emacs.d/core/core-progress-bar.el @@ -1,6 +1,6 @@ ;;; core-progress-bar.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-release-management.el b/dot_emacs.d/core/core-release-management.el index 989ccb1..df6b775 100644 --- a/dot_emacs.d/core/core-release-management.el +++ b/dot_emacs.d/core/core-release-management.el @@ -1,6 +1,6 @@ ;;; core-spacemacs.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-spacebind.el b/dot_emacs.d/core/core-spacebind.el index 6bcf94b..cb1bf9b 100644 --- a/dot_emacs.d/core/core-spacebind.el +++ b/dot_emacs.d/core/core-spacebind.el @@ -73,7 +73,7 @@ Otherwise binding happens at the next event loop.") (let ((mode (car args)) (prefix (string-join (cadr args) " ")) (label (caddr args))) - (spacemacs/declare-prefix prefix label))) + (spacemacs/declare-prefix-for-mode mode prefix label))) ;; `spacemacs/set-leader-keys' (dolist (args spacebind--bs-set-leader-keys) diff --git a/dot_emacs.d/core/core-spacemacs-buffer.el b/dot_emacs.d/core/core-spacemacs-buffer.el index 4dc6a77..45bc387 100644 --- a/dot_emacs.d/core/core-spacemacs-buffer.el +++ b/dot_emacs.d/core/core-spacemacs-buffer.el @@ -1,6 +1,6 @@ ;;; core-spacemacs-buffer.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -382,7 +382,7 @@ ADDITIONAL-WIDGETS: a function for inserting a widget under the frame." 80)))) (save-restriction (narrow-to-region (point) (point)) - (add-to-list 'spacemacs-buffer--note-widgets (widget-create 'text note)) + (add-to-list 'spacemacs-buffer--note-widgets (widget-create 'text :format "%v" note)) (let* ((width (spacemacs-buffer//get-buffer-width)) (padding (max 0 (floor (/ (- spacemacs-buffer--window-width width) 2))))) diff --git a/dot_emacs.d/core/core-spacemacs.el b/dot_emacs.d/core/core-spacemacs.el index 0d036bd..8c785be 100644 --- a/dot_emacs.d/core/core-spacemacs.el +++ b/dot_emacs.d/core/core-spacemacs.el @@ -1,6 +1,6 @@ ;;; core-spacemacs.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -43,6 +43,8 @@ "Hook run after dotspacemacs/user-config") (defvar spacemacs-post-user-config-hook-run nil "Whether `spacemacs-post-user-config-hook' has been run") +(defvar spacemacs-scratch-mode-hook nil + "Hook run on buffer *scratch* after `dotspacemacs-scratch-mode' is invoked.") (defvar spacemacs--default-mode-line mode-line-format "Backup of default mode line format.") @@ -230,7 +232,8 @@ Note: the hooked function is not executed when in dumped mode." (setq spacemacs-post-user-config-hook-run t) (when (fboundp dotspacemacs-scratch-mode) (with-current-buffer "*scratch*" - (funcall dotspacemacs-scratch-mode))) + (funcall dotspacemacs-scratch-mode) + (run-hooks 'spacemacs-scratch-mode-hook))) (when spacemacs--delayed-user-theme (spacemacs/load-theme spacemacs--delayed-user-theme spacemacs--fallback-theme t)) diff --git a/dot_emacs.d/core/core-themes-support.el b/dot_emacs.d/core/core-themes-support.el index ae27805..693f607 100644 --- a/dot_emacs.d/core/core-themes-support.el +++ b/dot_emacs.d/core/core-themes-support.el @@ -1,6 +1,6 @@ ;;; core-themes-support.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-toggle.el b/dot_emacs.d/core/core-toggle.el index b5818f3..706d8b1 100644 --- a/dot_emacs.d/core/core-toggle.el +++ b/dot_emacs.d/core/core-toggle.el @@ -1,6 +1,6 @@ ;;; core-toggle.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-transient-state.el b/dot_emacs.d/core/core-transient-state.el index fecbed8..9133e86 100644 --- a/dot_emacs.d/core/core-transient-state.el +++ b/dot_emacs.d/core/core-transient-state.el @@ -1,7 +1,7 @@ ;;; -*- lexical-binding: t -*- ;;; core-transient-state.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Justin Burkett ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-use-package-ext.el b/dot_emacs.d/core/core-use-package-ext.el index 930ff1d..72df553 100644 --- a/dot_emacs.d/core/core-use-package-ext.el +++ b/dot_emacs.d/core/core-use-package-ext.el @@ -1,6 +1,6 @@ ;;; core-use-package-ext.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/core-versions.el b/dot_emacs.d/core/core-versions.el index 17e619a..fcfc400 100644 --- a/dot_emacs.d/core/core-versions.el +++ b/dot_emacs.d/core/core-versions.el @@ -1,6 +1,6 @@ ;;; core-versions.el --- Spacemacs Core File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/core/libs/spinner.el b/dot_emacs.d/core/libs/spinner.el new file mode 100644 index 0000000..2ec7d1f --- /dev/null +++ b/dot_emacs.d/core/libs/spinner.el @@ -0,0 +1,327 @@ +;;; spinner.el --- Add spinners and progress-bars to the mode-line for ongoing operations -*- lexical-binding: t; -*- + +;; Copyright (C) 2015 Free Software Foundation, Inc. + +;; Author: Artur Malabarba +;; Version: 1.7.3 +;; Package-Requires: ((emacs "24.3")) +;; URL: https://github.com/Malabarba/spinner.el +;; Keywords: processes mode-line + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: +;; +;; 1 Usage +;; ═══════ +;; +;; First of all, don’t forget to add `(spinner "VERSION")' to your +;; package’s dependencies. +;; +;; +;; 1.1 Major-modes +;; ─────────────── +;; +;; 1. Just call `(spinner-start)' and a spinner will be added to the +;; mode-line. +;; 2. Call `(spinner-stop)' on the same buffer when you want to remove +;; it. +;; +;; The default spinner is a line drawing that rotates. You can pass an +;; argument to `spinner-start' to specify which spinner you want. All +;; possibilities are listed in the `spinner-types' variable, but here are +;; a few examples for you to try: +;; +;; • `(spinner-start 'vertical-breathing 10)' +;; • `(spinner-start 'minibox)' +;; • `(spinner-start 'moon)' +;; • `(spinner-start 'triangle)' +;; +;; You can also define your own as a vector of strings (see the examples +;; in `spinner-types'). +;; +;; +;; 1.2 Minor-modes +;; ─────────────── +;; +;; Minor-modes can create a spinner with `spinner-create' and then add it +;; to their mode-line lighter. They can then start the spinner by setting +;; a variable and calling `spinner-start-timer'. Finally, they can stop +;; the spinner (and the timer) by just setting the same variable to nil. +;; +;; Here’s an example for a minor-mode named `foo'. Assuming that +;; `foo--lighter' is used as the mode-line lighter, the following code +;; will add an *inactive* global spinner to the mode-line. +;; ┌──── +;; │ (defvar foo--spinner (spinner-create 'rotating-line)) +;; │ (defconst foo--lighter +;; │ '(" foo" (:eval (spinner-print foo--spinner)))) +;; └──── +;; +;; 1. To activate the spinner, just call `(spinner-start foo--spinner)'. +;; It will show up on the mode-line and start animating. +;; 2. To get rid of it, call `(spinner-stop foo--spinner)'. It will then +;; disappear again. +;; +;; Some minor-modes will need spinners to be buffer-local. To achieve +;; that, just make the `foo--spinner' variable buffer-local and use the +;; third argument of the `spinner-create' function. The snippet below is an +;; example. +;; +;; ┌──── +;; │ (defvar-local foo--spinner nil) +;; │ (defconst foo--lighter +;; │ '(" foo" (:eval (spinner-print foo--spinner)))) +;; │ (defun foo--start-spinner () +;; │ "Create and start a spinner on this buffer." +;; │ (unless foo--spinner +;; │ (setq foo--spinner (spinner-create 'moon t))) +;; │ (spinner-start foo--spinner)) +;; └──── +;; +;; 1. To activate the spinner, just call `(foo--start-spinner)'. +;; 2. To get rid of it, call `(spinner-stop foo--spinner)'. +;; +;; This will use the `moon' spinner, but you can use any of the names +;; defined in the `spinner-types' variable or even define your own. + + +;;; Code: +(eval-when-compile + (require 'cl-lib)) + +(defconst spinner-types + '((3-line-clock . ["┤" "┘" "┴" "└" "├" "┌" "┬" "┐"]) + (2-line-clock . ["┘" "└" "┌" "┐"]) + (flipping-line . ["_" "\\" "|" "/"]) + (rotating-line . ["-" "\\" "|" "/"]) + (progress-bar . ["[ ]" "[= ]" "[== ]" "[=== ]" "[====]" "[ ===]" "[ ==]" "[ =]"]) + (progress-bar-filled . ["| |" "|█ |" "|██ |" "|███ |" "|████|" "| ███|" "| ██|" "| █|"]) + (vertical-breathing . ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" "▇" "▆" "▅" "▄" "▃" "▂" "▁" " "]) + (vertical-rising . ["▁" "▄" "█" "▀" "▔"]) + (horizontal-breathing . [" " "▏" "▎" "▍" "▌" "▋" "▊" "▉" "▉" "▊" "▋" "▌" "▍" "▎" "▏"]) + (horizontal-breathing-long + . [" " "▎ " "▌ " "▊ " "█ " "█▎" "█▌" "█▊" "██" "█▊" "█▌" "█▎" "█ " "▊ " "▋ " "▌ " "▍ " "▎ " "▏ "]) + (horizontal-moving . [" " "▌ " "█ " "▐▌" " █" " ▐"]) + (minibox . ["▖" "▘" "▝" "▗"]) + (triangle . ["◢" "◣" "◤" "◥"]) + (box-in-box . ["◰" "◳" "◲" "◱"]) + (box-in-circle . ["◴" "◷" "◶" "◵"]) + (half-circle . ["◐" "◓" "◑" "◒"]) + (moon . ["🌑" "🌘" "🌗" "🌖" "🌕" "🌔" "🌓" "🌒"])) + "Predefined alist of spinners. +Each car is a symbol identifying the spinner, and each cdr is a +vector, the spinner itself.") + +(defun spinner-make-progress-bar (width &optional char) + "Return a vector of strings of the given WIDTH. +The vector is a valid spinner type and is similar to the +`progress-bar' spinner, except without the sorrounding brackets. +CHAR is the character to use for the moving bar (defaults to =)." + (let ((whole-string (concat (make-string (1- width) ?\s) + (make-string 4 (or char ?=)) + (make-string width ?\s)))) + (apply #'vector (mapcar (lambda (n) (substring whole-string n (+ n width))) + (number-sequence (+ width 3) 0 -1))))) + +(defvar spinner-current nil + "Spinner curently being displayed on the `mode-line-process'.") +(make-variable-buffer-local 'spinner-current) + +(defconst spinner--mode-line-construct + '(:eval (spinner-print spinner-current)) + "Construct used to display a spinner in `mode-line-process'.") +(put 'spinner--mode-line-construct 'risky-local-variable t) + +(defvar spinner-frames-per-second 10 + "Default speed at which spinners spin, in frames per second. +Each spinner can override this value.") + + +;;; The spinner object. +(defun spinner--type-to-frames (type) + "Return a vector of frames corresponding to TYPE. +The list of possible built-in spinner types is given by the +`spinner-types' variable, but you can also use your own (see +below). +If TYPE is nil, the frames of this spinner are given by the first +element of `spinner-types'. +If TYPE is a symbol, it specifies an element of `spinner-types'. +If TYPE is 'random, use a random element of `spinner-types'. +If TYPE is a list, it should be a list of symbols, and a random +one is chosen as the spinner type. +If TYPE is a vector, it should be a vector of strings and these +are used as the spinner's frames. This allows you to make your +own spinner animations." + (cond + ((vectorp type) type) + ((not type) (cdr (car spinner-types))) + ((eq type 'random) + (cdr (elt spinner-types + (random (length spinner-types))))) + ((listp type) + (cdr (assq (elt type (random (length type))) + spinner-types))) + ((symbolp type) (cdr (assq type spinner-types))) + (t (error "Unknown spinner type: %s" type)))) + +(cl-defstruct (spinner + (:copier nil) + (:conc-name spinner--) + (:constructor make-spinner (&optional type buffer-local frames-per-second delay-before-start))) + (frames (spinner--type-to-frames type)) + (counter 0) + (fps (or frames-per-second spinner-frames-per-second)) + (timer (timer-create)) + (active-p nil) + (buffer (when buffer-local + (if (bufferp buffer-local) + buffer-local + (current-buffer)))) + (delay (or delay-before-start 0))) + +;;;###autoload +(defun spinner-create (&optional type buffer-local fps delay) + "Create a spinner of the given TYPE. +The possible TYPEs are described in `spinner--type-to-frames'. +FPS, if given, is the number of desired frames per second. +Default is `spinner-frames-per-second'. +If BUFFER-LOCAL is non-nil, the spinner will be automatically +deactivated if the buffer is killed. If BUFFER-LOCAL is a +buffer, use that instead of current buffer. +When started, in order to function properly, the spinner runs a +timer which periodically calls `force-mode-line-update' in the +curent buffer. If BUFFER-LOCAL was set at creation time, then +`force-mode-line-update' is called in that buffer instead. When +the spinner is stopped, the timer is deactivated. +DELAY, if given, is the number of seconds to wait after starting +the spinner before actually displaying it. It is safe to cancel +the spinner before this time, in which case it won't display at +all." + (make-spinner type buffer-local fps delay)) + +(defun spinner-print (spinner) + "Return a string of the current frame of SPINNER. +If SPINNER is nil, just return nil. +Designed to be used in the mode-line with: + (:eval (spinner-print some-spinner))" + (when (and spinner (spinner--active-p spinner)) + (let ((frame (spinner--counter spinner))) + (when (>= frame 0) + (elt (spinner--frames spinner) frame))))) + +(defun spinner--timer-function (spinner) + "Function called to update SPINNER. +If SPINNER is no longer active, or if its buffer has been killed, +stop the SPINNER's timer." + (let ((buffer (spinner--buffer spinner))) + (if (or (not (spinner--active-p spinner)) + (and buffer (not (buffer-live-p buffer)))) + (spinner-stop spinner) + ;; Increment + (cl-callf (lambda (x) (if (< x 0) + (1+ x) + (% (1+ x) (length (spinner--frames spinner))))) + (spinner--counter spinner)) + ;; Update mode-line. + (if (buffer-live-p buffer) + (with-current-buffer buffer + (force-mode-line-update)) + (force-mode-line-update))))) + +(defun spinner--start-timer (spinner) + "Start a SPINNER's timer." + (let ((old-timer (spinner--timer spinner))) + (when (timerp old-timer) + (cancel-timer old-timer)) + + (setf (spinner--active-p spinner) t) + + (unless (ignore-errors (> (spinner--fps spinner) 0)) + (error "A spinner's FPS must be a positive number")) + (setf (spinner--counter spinner) (round (- (* (or (spinner--delay spinner) 0) + (spinner--fps spinner))))) + ;; Create timer. + (let* ((repeat (/ 1.0 (spinner--fps spinner))) + (time (timer-next-integral-multiple-of-time (current-time) repeat)) + ;; Create the timer as a lex variable so it can cancel itself. + (timer (spinner--timer spinner))) + (timer-set-time timer time repeat) + (timer-set-function timer #'spinner--timer-function (list spinner)) + (timer-activate timer) + ;; Return a stopping function. + (lambda () (spinner-stop spinner))))) + + +;;; The main functions +;;;###autoload +(defun spinner-start (&optional type-or-object fps delay) + "Start a mode-line spinner of given TYPE-OR-OBJECT. +If TYPE-OR-OBJECT is an object created with `make-spinner', +simply activate it. This method is designed for minor modes, so +they can use the spinner as part of their lighter by doing: + '(:eval (spinner-print THE-SPINNER)) +To stop this spinner, call `spinner-stop' on it. +If TYPE-OR-OBJECT is anything else, a buffer-local spinner is +created with this type, and it is displayed in the +`mode-line-process' of the buffer it was created it. Both +TYPE-OR-OBJECT and FPS are passed to `make-spinner' (which see). +To stop this spinner, call `spinner-stop' in the same buffer. +Either way, the return value is a function which can be called +anywhere to stop this spinner. You can also call `spinner-stop' +in the same buffer where the spinner was created. +FPS, if given, is the number of desired frames per second. +Default is `spinner-frames-per-second'. +DELAY, if given, is the number of seconds to wait until actually +displaying the spinner. It is safe to cancel the spinner before +this time, in which case it won't display at all." + (unless (spinner-p type-or-object) + ;; Choose type. + (if (spinner-p spinner-current) + (setf (spinner--frames spinner-current) (spinner--type-to-frames type-or-object)) + (setq spinner-current (make-spinner type-or-object (current-buffer) fps delay))) + (setq type-or-object spinner-current) + ;; Maybe add to mode-line. + (unless (and (listp mode-line-process) + (memq 'spinner--mode-line-construct mode-line-process)) + (setq mode-line-process + (list (or mode-line-process "") + 'spinner--mode-line-construct)))) + + ;; Create timer. + (when fps (setf (spinner--fps type-or-object) fps)) + (when delay (setf (spinner--delay type-or-object) delay)) + (spinner--start-timer type-or-object)) + +(defun spinner-start-print (spinner) + "Like `spinner-print', but also start SPINNER if it's not active." + (unless (spinner--active-p spinner) + (spinner-start spinner)) + (spinner-print spinner)) + +(defun spinner-stop (&optional spinner) + "Stop SPINNER, defaulting to the current buffer's spinner. +It is always safe to call this function, even if there is no +active spinner." + (let ((spinner (or spinner spinner-current))) + (when (spinner-p spinner) + (let ((timer (spinner--timer spinner))) + (when (timerp timer) + (cancel-timer timer))) + (setf (spinner--active-p spinner) nil) + (force-mode-line-update)))) + +(provide 'spinner) + +;;; spinner.el ends here diff --git a/dot_emacs.d/core/templates/dot_spacemacs.template b/dot_emacs.d/core/templates/dot_spacemacs.template index 4f3b064..3e40350 100644 --- a/dot_emacs.d/core/templates/dot_spacemacs.template +++ b/dot_emacs.d/core/templates/dot_spacemacs.template @@ -56,12 +56,13 @@ This function should only modify configuration layer settings." treemacs) - ;; List of additional packages that will be installed without being - ;; wrapped in a layer. If you need some configuration for these - ;; packages, then consider creating a layer. You can also put the - ;; configuration in `dotspacemacs/user-config'. - ;; To use a local version of a package, use the `:location' property: - ;; '(your-package :location "~/path/to/your-package/") + ;; List of additional packages that will be installed without being wrapped + ;; in a layer (generally the packages are installed only and should still be + ;; loaded using load/require/use-package in the user-config section below in + ;; this file). If you need some configuration for these packages, then + ;; consider creating a layer. You can also put the configuration in + ;; `dotspacemacs/user-config'. To use a local version of a package, use the + ;; `:location' property: '(your-package :location "~/path/to/your-package/") ;; Also include the dependencies as they will not be resolved automatically. dotspacemacs-additional-packages '() @@ -134,7 +135,9 @@ It should only modify the values of Spacemacs settings." ;; If non-nil then Spacelpa repository is the primary source to install ;; a locked version of packages. If nil then Spacemacs will install the - ;; latest version of packages from MELPA. (default nil) + ;; latest version of packages from MELPA. Spacelpa is currently in + ;; experimental state please use only for testing purposes. + ;; (default nil) dotspacemacs-use-spacelpa nil ;; If non-nil then verify the signature for downloaded Spacelpa archives. @@ -374,7 +377,7 @@ It should only modify the values of Spacemacs settings." ;; (default nil) dotspacemacs-line-numbers nil - ;; Code folding method. Possible values are `evil' and `origami'. + ;; Code folding method. Possible values are `evil', `origami' and `vimish'. ;; (default 'evil) dotspacemacs-folding-method 'evil diff --git a/dot_emacs.d/core/templates/packages.el.template b/dot_emacs.d/core/templates/packages.el.template index 4046356..c220277 100644 --- a/dot_emacs.d/core/templates/packages.el.template +++ b/dot_emacs.d/core/templates/packages.el.template @@ -1,6 +1,6 @@ ;;; packages.el --- %LAYER_NAME% layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: %USER_FULL_NAME% <%USER_MAIL_ADDRESS%> ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/doc/BEGINNERS_TUTORIAL.org b/dot_emacs.d/doc/BEGINNERS_TUTORIAL.org index 2d9a362..a1abb6a 100644 --- a/dot_emacs.d/doc/BEGINNERS_TUTORIAL.org +++ b/dot_emacs.d/doc/BEGINNERS_TUTORIAL.org @@ -39,12 +39,11 @@ using a program called Git. The steps are easy and detailed in the [[https://git The power of Spacemacs lies in its efficient key bindings. Because it is built on Emacs, we will use Emacs conventions for key binding notation. The most important modifier keys are: - -~SPC~ = ~Space~, used as the leader key in Vim editing style. -~RET~ = ~Return~ (also known as ~Enter~) -~C-~ = ~Ctrl~ -~M-~ (for "meta") = ~Alt~ -~S-~ = ~Shift~ +- ~SPC~ = ~Space~, used as the leader key in Vim editing style. +- ~RET~ = ~Return~ (also known as ~Enter~) +- ~C-~ = ~Ctrl~ +- ~M-~ (for "meta") = ~Alt~ +- ~S-~ = ~Shift~ The modifier keys can be used either in a sequence or as key chords by pressing two keys at the same time. ~SPC 1~ is notation for a key sequence and means diff --git a/dot_emacs.d/doc/DOCUMENTATION.org b/dot_emacs.d/doc/DOCUMENTATION.org index 7f1e6e4..a254430 100644 --- a/dot_emacs.d/doc/DOCUMENTATION.org +++ b/dot_emacs.d/doc/DOCUMENTATION.org @@ -210,7 +210,6 @@ - [[#emacs-server][Emacs Server]] - [[#connecting-to-the-emacs-server][Connecting to the Emacs server]] - [[#keeping-the-server-alive][Keeping the server alive]] - - [[#disabling-the-emacs-server][Disabling the Emacs server]] - [[#troubleshoot][Troubleshoot]] - [[#loading-fails][Loading fails]] - [[#upgradingdowngrading-emacs-version][Upgrading/Downgrading Emacs version]] @@ -2005,7 +2004,8 @@ thusly: | ~SPC h d p~ | describe a package (Emacs built-in function) | | ~SPC h d P~ | describe a package (Spacemacs layer information) | | ~SPC h d s~ | copy system information that you can paste in gitter chat | -| ~SPC h d t~ | describe a theme | +| ~SPC h d t~ | describe text properties | +| ~SPC h d T~ | describe a theme | | ~SPC h d v~ | describe a variable | Other help key bindings: @@ -3633,8 +3633,13 @@ To customize your editorconfig experience, read [[https://github.com/editorconfi documentation]]. * Emacs Server -Spacemacs starts a server at launch. This server is killed whenever you close -your Emacs windows. +Spacemacs provides the ability to start a server at launch, and to kill that +server whenever you close your Emacs windows. This can be enabled by setting the +variable =dotspacemacs-enable-server= to =t= in your =~./spacemacs=. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-enable-server t) +#+END_SRC ** Connecting to the Emacs server You can open a file in Emacs from the terminal using =emacsclient=. Use @@ -3688,14 +3693,6 @@ server is to use the following bindings: | ~SPC q t~ | Restart Emacs and debug with --with-timed-requires | | ~SPC q T~ | Restart Emacs and debug with --adv-timers | -** Disabling the Emacs server -You can disable the built-in server by setting the variable -=dotspacemacs-enable-server= to =nil= in your =~/.spacemacs=. - -#+BEGIN_SRC emacs-lisp - (setq-default dotspacemacs-enable-server nil) -#+END_SRC - * Troubleshoot ** Loading fails If any errors happen during the loading the mode-line will turn red and the diff --git a/dot_emacs.d/doc/FAQ.org b/dot_emacs.d/doc/FAQ.org index 508c77b..7aed519 100644 --- a/dot_emacs.d/doc/FAQ.org +++ b/dot_emacs.d/doc/FAQ.org @@ -378,6 +378,8 @@ include this on your =dotspacemacs/user-config=. (add-hook 'js2-mode-hook #'(lambda () (modify-syntax-entry ?_ "w"))) ;; For all programming modes (add-hook 'prog-mode-hook #'(lambda () (modify-syntax-entry ?_ "w"))) + ;; For all modes + (add-hook 'after-change-major-mode-hook #'(lambda () (modify-syntax-entry ?_ "w"))) #+END_SRC ** Setup =$PATH=? diff --git a/dot_emacs.d/doc/LAYERS.org b/dot_emacs.d/doc/LAYERS.org index 021503c..9a12638 100644 --- a/dot_emacs.d/doc/LAYERS.org +++ b/dot_emacs.d/doc/LAYERS.org @@ -60,7 +60,7 @@ To understand how to best implement a layer, we have to investigate how Emacs loads code. ** Emacs Lisp files -Emacs Lisp files contains code that can be evaluated. When evaluated, the +Emacs Lisp files contain code that can be evaluated. When evaluated, the functions, macros and modes defined in that file become available to the current Emacs session. Henceforth, this will be termed as /loading/ a file. diff --git a/dot_emacs.d/dot_circleci/config.yml b/dot_emacs.d/dot_circleci/config.yml index 9f1a914..869021c 100644 --- a/dot_emacs.d/dot_circleci/config.yml +++ b/dot_emacs.d/dot_circleci/config.yml @@ -2,53 +2,6 @@ # Circle CI YAML file version: 2.0 -references: - steps_core_steps: &steps_core_steps - steps: - - checkout - - run: - name: core tests installation - command: - ./.circleci/test core installation - - run: - name: core unit tests - command: - ./.circleci/test core unit_tests - - run: - name: core functional tests - command: - ./.circleci/test core func_tests - spacemacs_base_steps: &spacemacs_base_steps - steps: - - checkout - - run: - name: spacemacs-base distribution tests installation - command: - ./.circleci/test layers/+distribution/spacemacs-base installation - - run: - name: spacemacs-base distribution unit tests - command: - ./.circleci/test layers/+distribution/spacemacs-base unit_tests - - run: - name: spacemacs-base distribution functional tests - command: - ./.circleci/test layers/+distribution/spacemacs-base func_tests - spacemacs_steps: &spacemacs_steps - steps: - - checkout - - run: - name: spacemacs distribution tests installation - command: - ./.circleci/test layers/+distribution/spacemacs installation - - run: - name: spacemac distribution unit tests - command: - ./.circleci/test layers/+distribution/spacemacs unit_tests - - run: - name: spacemacs distribution functional tests - command: - ./.circleci/test layers/+distribution/spacemacs func_tests - jobs: "Validate PR": docker: @@ -64,98 +17,7 @@ jobs: - run: name: Make sure that this PR doesn't need rebase command: ./.circleci/PR_rebased - - # Emacs 25 - "core Emacs25 (required)": - docker: - - image: jare/spacemacs-circleci:emacs25 - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *steps_core_steps - - "spacemacs-base dist. Emacs25 (required)": - docker: - - image: jare/spacemacs-circleci:emacs25 - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *spacemacs_base_steps - - "spacemacs dist. Emacs25 (required)": - docker: - - image: jare/spacemacs-circleci:emacs25 - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *spacemacs_steps - - # Emacs 26 - "core Emacs26 (required)": - docker: - - image: jare/spacemacs-circleci:latest - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *steps_core_steps - - "spacemacs-base dist. Emacs26 (required)": - docker: - - image: jare/spacemacs-circleci:latest - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *spacemacs_base_steps - - "spacemacs dist. Emacs26 (required)": - docker: - - image: jare/spacemacs-circleci:latest - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *spacemacs_steps - - # Emacs snapshot - "core Emacs snapshot (optional)": - docker: - - image: jare/spacemacs-circleci:emacs-snapshot - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *steps_core_steps - - "spacemacs-base dist. Emacs snapshot (optional)": - docker: - - image: jare/spacemacs-circleci:emacs-snapshot - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *spacemacs_base_steps - - "spacemacs dist. Emacs snapshot (optional)": - docker: - - image: jare/spacemacs-circleci:emacs-snapshot - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - <<: *spacemacs_steps - - "CHANGELOG.develop updated (optional)": - docker: - - image: jare/spacemacs-circleci:latest - environment: - BASH_ENV: ".circleci/shared" - working_directory: ~/.emacs.d - steps: - - checkout - - run: - name: Select changed files - command: ./.circleci/select - - run: - name: Check CHANGELOG.develop - command: ./.circleci/PR_changelong - - "Validate Documentation (required)": + "Validate Documentation": docker: - image: jare/spacemacs-circleci:latest environment: @@ -178,33 +40,4 @@ workflows: build: jobs: - "Validate PR" - # - "core Emacs25 (required)": - # requires: - # - "Validate PR" - # - "spacemacs-base dist. Emacs25 (required)": - # requires: - # - "Validate PR" - # - "core Emacs26 (required)": - # requires: - # - "Validate PR" - # - "spacemacs-base dist. Emacs26 (required)": - # requires: - # - "Validate PR" - # - "spacemacs dist. Emacs25 (required)": - # requires: - # - "Validate PR" - # - "core Emacs snapshot (optional)": - # requires: - # - "Validate PR" - # - "spacemacs-base dist. Emacs snapshot (optional)": - # requires: - # - "Validate PR" - # - "spacemacs dist. Emacs snapshot (optional)": - # requires: - # - "Validate PR" - - "Validate Documentation (required)": - requires: - - "Validate PR" - # - "CHANGELOG.develop updated (optional)": - # requires: - # - "Validate PR" + - "Validate Documentation" diff --git a/dot_emacs.d/dot_circleci/executable_select b/dot_emacs.d/dot_circleci/executable_select index 7cfd92a..8f77c4d 100644 --- a/dot_emacs.d/dot_circleci/executable_select +++ b/dot_emacs.d/dot_circleci/executable_select @@ -14,23 +14,11 @@ skip_when_branch_update fail_when_undefined_pr_number -echo "PATCH_URL: \"${pr_patch_URL}\"" +files_json=$(curl "${pr_file_list_URL}" --silent) -curl "${pr_patch_URL}" --output /tmp/patch --silent -first_commit=$(echo $(head -n 1 /tmp/patch) | sed -n 's/From \([a-zA-Z0-9]\+\).*/\1/p') - -if [[ -z "${first_commit// }" ]]; then - echo "Can't find first commit" - exit 1 -else - echo "First commit: ${first_commit}" -fi - -git diff --name-only "${first_commit}^" HEAD > /tmp/changed_files -if [ $? -ne 0 ]; then - echo "Git diff failed" - exit 1 -fi +for file_name in $(echo "${files_json}" | jq -r '.[].filename'); do + echo "${file_name}" >> /tmp/changed_files +done echo_headline "CHANGED FILES:" cat /tmp/changed_files diff --git a/dot_emacs.d/dot_circleci/executable_shared b/dot_emacs.d/dot_circleci/executable_shared index 5482dbe..caf4c01 100644 --- a/dot_emacs.d/dot_circleci/executable_shared +++ b/dot_emacs.d/dot_circleci/executable_shared @@ -17,16 +17,24 @@ mst_b="master" prj_owner="syl20bnr" prj_repo="spacemacs" bot_login="emacspace" -upstream_data_URL_root="https://api.github.com/repos/" +api_URL_root="https://api.github.com" + +upstream_data_URL_root="${api_URL_root}/" +upstream_data_URL_root+="repos/" upstream_data_URL_root+="${prj_owner}/" upstream_data_URL_root+="${prj_repo}" + CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}" pr_data_URL="${upstream_data_URL_root}/pulls/${CIRCLE_PR_NUMBER}" upstream_data_URL="${upstream_data_URL_root}/branches/develop" -pr_patch_URL="https://patch-diff.githubusercontent.com/raw/" -pr_patch_URL+="${prj_owner}/" -pr_patch_URL+="${prj_repo}/pull/" -pr_patch_URL+="${CIRCLE_PR_NUMBER}.patch" + +pr_file_list_URL="${api_URL_root}/" +pr_file_list_URL+="repos/" +pr_file_list_URL+="${prj_owner}/" +pr_file_list_URL+="${prj_repo}/" +pr_file_list_URL+="pulls/" +pr_file_list_URL+="${CIRCLE_PR_NUMBER}/" +pr_file_list_URL+="files" # Helpers echo_headline () { diff --git a/dot_emacs.d/dot_github/workflows/executable_elisp_test.yml b/dot_emacs.d/dot_github/workflows/executable_elisp_test.yml index f5c4949..2756ab1 100644 --- a/dot_emacs.d/dot_github/workflows/executable_elisp_test.yml +++ b/dot_emacs.d/dot_github/workflows/executable_elisp_test.yml @@ -1,9 +1,6 @@ -name: elisp_tests +name: elisp tests on: - schedule: - # Every 4 hours - - cron: '0 */4 * * *' pull_request: push: branches: @@ -12,15 +9,8 @@ on: env: TEST_SCRIPT: ./.github/workflows/scripts/test - MIRROR_SCRIPT: ./.github/workflows/scripts/create_mirror - EM_SCRIPT_PATH: $HOME/elpa-mirror.el - MIRROR_DIR: $HOME/elpa - MIRROR_NAME: elpa-mirror - EM_SCRIPT_URL: "https://raw.githubusercontent.com/\ - redguardtoo/\ - elpa-mirror/\ - master/\ - elpa-mirror.el" + TESTELPA_REPO: JAremko/testelpa-develop + GITHUB_WORKSPACE: ${{ github.workspace }} defaults: run: @@ -28,13 +18,12 @@ defaults: jobs: test: - if: ${{ github.event_name != 'schedule' }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - emacs_version: [25.3, 26.3, 27.1, snapshot] + emacs_version: [26.3, 27.1, snapshot] test_root: - core - layers/+distribution/spacemacs-base @@ -52,45 +41,20 @@ jobs: version: ${{ matrix.emacs_version }} if: ${{ matrix.os == 'windows-latest' }} - - name: Download elpa mirror - continue-on-error: true - uses: actions/download-artifact@v2 - with: - name: ${{ env.MIRROR_NAME }} - path: ${{ env.MIRROR_DIR }} - - - name: List mirror content - continue-on-error: true - run: find ${{ env.MIRROR_DIR }} - - uses: actions/checkout@v2 + - name: Fetch Spacemacs elpa mirror + run: | + curl -L \ + https://github.com/$TESTELPA_REPO/releases/latest/download/elpa.zip \ + --output /tmp/elpa.zip + + - name: Unpack elpa mirror + run: unzip /tmp/elpa.zip -d ../testelpa_mirror + - name: Dependencies installation run: ${{ env.TEST_SCRIPT }} ${{ matrix.test_root }} installation - name: Unit testing run: ${{ env.TEST_SCRIPT }} ${{ matrix.test_root }} unit_tests - name: Functional testing run: ${{ env.TEST_SCRIPT }} ${{ matrix.test_root }} func_tests - - update_elpa_mirror: - if: ${{ github.event_name == 'schedule' }} - runs-on: ubuntu-latest - steps: - - name: Install Emacs - uses: purcell/setup-emacs@master - with: - version: 27.1 - - - name: Download elpa-mirror.el - run: curl -o ${{ env.EM_SCRIPT_PATH }} ${{ env.EM_SCRIPT_URL }} - - - uses: actions/checkout@v2 - - - name: Create local mirror - run: ${{ env.MIRROR_SCRIPT }} - - - name: Upload mirror artifact - uses: actions/upload-artifact@v2 - with: - name: ${{ env.MIRROR_NAME }} - path: ${{ env.MIRROR_DIR }} diff --git a/dot_emacs.d/dot_github/workflows/executable_rebase.yml b/dot_emacs.d/dot_github/workflows/executable_rebase.yml new file mode 100644 index 0000000..a5799d3 --- /dev/null +++ b/dot_emacs.d/dot_github/workflows/executable_rebase.yml @@ -0,0 +1,21 @@ +on: + issue_comment: + types: [created] +name: Automatic Rebase +jobs: + rebase: + name: Rebase + if: | + github.event.issue.pull_request != '' && + contains(github.event.comment.body, '/rebase') && + github.event.comment.author_association == 'COLLABORATOR' + runs-on: ubuntu-latest + steps: + - name: Checkout the latest code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Automatic Rebase + uses: cirrus-actions/rebase@1.3.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/dot_emacs.d/dot_github/workflows/scripts/dot_lock.el b/dot_emacs.d/dot_github/workflows/scripts/dot_lock.el new file mode 100644 index 0000000..9a44fcb --- /dev/null +++ b/dot_emacs.d/dot_github/workflows/scripts/dot_lock.el @@ -0,0 +1,22 @@ +(setq configuration-layer-elpa-archives + `(("melpa" . "melpa.org/packages/") + ("org" . "orgmode.org/elpa/") + ("gnu" . "elpa.gnu.org/packages/") + ("spacelpa" . ,(concat configuration-layer-stable-elpa-directory + "spacelpa-" + configuration-layer-stable-elpa-version)) + ("testelpa" . ,(format "%s/../testelpa_mirror" + (getenv "GITHUB_WORKSPACE"))))) + +(setq package-archive-priorities + '(("testelpa" . 9) + ("spacelpa" . 8) + ("melpa" . 4) + ("org" . 2) + ("gnu" . 1))) + + +;; NOTE: Testing if that bug with hanging/crushing dependency +;; installation from local repos caused by child Emacs async process. +(with-eval-after-load 'async-bytecomp + (setq async-bytecomp-allowed-packages nil)) diff --git a/dot_emacs.d/dot_github/workflows/scripts/executable_test b/dot_emacs.d/dot_github/workflows/scripts/executable_test index 00806c2..bc72b8f 100644 --- a/dot_emacs.d/dot_github/workflows/scripts/executable_test +++ b/dot_emacs.d/dot_github/workflows/scripts/executable_test @@ -17,6 +17,8 @@ abs_p() { } ln -s "$(pwd)" $HOME/.emacs.d +cp .github/workflows/scripts/dot_lock.el ~/.emacs.d/.lock + testdir=$(abs_p tests/$1) cd .. diff --git a/dot_emacs.d/dot_gitignore b/dot_emacs.d/dot_gitignore index 50f94e2..256548c 100644 --- a/dot_emacs.d/dot_gitignore +++ b/dot_emacs.d/dot_gitignore @@ -91,3 +91,6 @@ tags .tags !tags/ gtags.files +eln-cache/ +meghanada/ +vimish-fold/ diff --git a/dot_emacs.d/dot_travis.yml b/dot_emacs.d/dot_travis.yml index 872fe87..a7ff3c4 100644 --- a/dot_emacs.d/dot_travis.yml +++ b/dot_emacs.d/dot_travis.yml @@ -1,5 +1,5 @@ --- -# TravisCI YAML file +# TravisCI YAML file for publishing/updating/formatting Spacemacs documentation. language: generic sudo: required services: diff --git a/dot_emacs.d/dot_travisci/executable_pub_html.sh b/dot_emacs.d/dot_travisci/executable_pub_html.sh index 9a87d5a..21d9904 100644 --- a/dot_emacs.d/dot_travisci/executable_pub_html.sh +++ b/dot_emacs.d/dot_travisci/executable_pub_html.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -## Documentation publishing script for Travis CI integration +## HTML documentation publishing script for Travis CI integration ## ## Copyright (c) 2012-2014 Sylvain Benner ## Copyright (c) 2014-2018 Sylvain Benner & Contributors diff --git a/dot_emacs.d/dot_travisci/executable_pub_org.sh b/dot_emacs.d/dot_travisci/executable_pub_org.sh index ead5d8a..b15f106 100644 --- a/dot_emacs.d/dot_travisci/executable_pub_org.sh +++ b/dot_emacs.d/dot_travisci/executable_pub_org.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -## Documentation publishing script for Travis CI integration +## ORG documentation publishing script for Travis CI integration ## ## Copyright (c) 2012-2014 Sylvain Benner ## Copyright (c) 2014-2018 Sylvain Benner & Contributors diff --git a/dot_emacs.d/early-init.el b/dot_emacs.d/early-init.el index 6231b79..b893050 100644 --- a/dot_emacs.d/early-init.el +++ b/dot_emacs.d/early-init.el @@ -1,6 +1,6 @@ ;;; early-init.el --- Spacemacs Early Init File ;; -;; Copyright (c) 2018 Sylvain Benner & Contributors +;; Copyright (c) 2020 Sylvain Benner & Contributors ;; ;; Author: Miciah Dashiel Butler Masters ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/init.el b/dot_emacs.d/init.el index 481524e..32ffd10 100644 --- a/dot_emacs.d/init.el +++ b/dot_emacs.d/init.el @@ -1,6 +1,6 @@ ;;; init.el --- Spacemacs Initialization File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+chat/rcirc/README.org b/dot_emacs.d/layers/+chat/rcirc/README.org index 6ed51f5..34d5dbe 100644 --- a/dot_emacs.d/layers/+chat/rcirc/README.org +++ b/dot_emacs.d/layers/+chat/rcirc/README.org @@ -68,8 +68,8 @@ is convenient but not recommended. #+BEGIN_SRC emacs-lisp (setq rcirc-server-alist '(("irc.freenode.net" - :user-name "spacemacs_user" - :port "1337" + :user-name "spacemacs_user" :encryption tls + :port "6697" :password "le_passwd" :channels ("#emacs")))) #+END_SRC diff --git a/dot_emacs.d/layers/+checkers/spell-checking/config.el b/dot_emacs.d/layers/+checkers/spell-checking/config.el index 282d330..269cd03 100644 --- a/dot_emacs.d/layers/+checkers/spell-checking/config.el +++ b/dot_emacs.d/layers/+checkers/spell-checking/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spell Checking Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+checkers/spell-checking/funcs.el b/dot_emacs.d/layers/+checkers/spell-checking/funcs.el index af9d6cb..7a875e1 100644 --- a/dot_emacs.d/layers/+checkers/spell-checking/funcs.el +++ b/dot_emacs.d/layers/+checkers/spell-checking/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spell Checking Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+checkers/spell-checking/packages.el b/dot_emacs.d/layers/+checkers/spell-checking/packages.el index 3f3f42d..e412086 100644 --- a/dot_emacs.d/layers/+checkers/spell-checking/packages.el +++ b/dot_emacs.d/layers/+checkers/spell-checking/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spell Checking Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+checkers/syntax-checking/config.el b/dot_emacs.d/layers/+checkers/syntax-checking/config.el index 72bc445..1e28daf 100644 --- a/dot_emacs.d/layers/+checkers/syntax-checking/config.el +++ b/dot_emacs.d/layers/+checkers/syntax-checking/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Syntax Checking Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+checkers/syntax-checking/funcs.el b/dot_emacs.d/layers/+checkers/syntax-checking/funcs.el index fb77248..3e0a867 100644 --- a/dot_emacs.d/layers/+checkers/syntax-checking/funcs.el +++ b/dot_emacs.d/layers/+checkers/syntax-checking/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Syntax Checking Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+checkers/syntax-checking/packages.el b/dot_emacs.d/layers/+checkers/syntax-checking/packages.el index 3e30400..12c103f 100644 --- a/dot_emacs.d/layers/+checkers/syntax-checking/packages.el +++ b/dot_emacs.d/layers/+checkers/syntax-checking/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Syntax Checking Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/auto-completion/config.el b/dot_emacs.d/layers/+completion/auto-completion/config.el index 84cdd8b..13b1ef3 100644 --- a/dot_emacs.d/layers/+completion/auto-completion/config.el +++ b/dot_emacs.d/layers/+completion/auto-completion/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Auto-completion configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/auto-completion/funcs.el b/dot_emacs.d/layers/+completion/auto-completion/funcs.el index 4011478..76447ba 100644 --- a/dot_emacs.d/layers/+completion/auto-completion/funcs.el +++ b/dot_emacs.d/layers/+completion/auto-completion/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Auto-completion functions File -*- lexical-binding: t; -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/auto-completion/packages.el b/dot_emacs.d/layers/+completion/auto-completion/packages.el index 77dd63f..aa66cbb 100644 --- a/dot_emacs.d/layers/+completion/auto-completion/packages.el +++ b/dot_emacs.d/layers/+completion/auto-completion/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Auto-completion Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -334,7 +334,7 @@ 'spacemacs/force-yasnippet-off '(term-mode-hook shell-mode-hook eshell-mode-hook)) - (spacemacs|require 'yasnippet) + (spacemacs|require-when-dumping 'yasnippet) (spacemacs/add-to-hooks 'spacemacs/load-yasnippet '(prog-mode-hook markdown-mode-hook org-mode-hook)) diff --git a/dot_emacs.d/layers/+completion/helm/config.el b/dot_emacs.d/layers/+completion/helm/config.el index ce08391..99b7f17 100644 --- a/dot_emacs.d/layers/+completion/helm/config.el +++ b/dot_emacs.d/layers/+completion/helm/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Helm Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/helm/funcs.el b/dot_emacs.d/layers/+completion/helm/funcs.el index 7a4aaa1..42d7c33 100644 --- a/dot_emacs.d/layers/+completion/helm/funcs.el +++ b/dot_emacs.d/layers/+completion/helm/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Helm Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/helm/layers.el b/dot_emacs.d/layers/+completion/helm/layers.el index 424c50e..9337418 100644 --- a/dot_emacs.d/layers/+completion/helm/layers.el +++ b/dot_emacs.d/layers/+completion/helm/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Helm layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/helm/packages.el b/dot_emacs.d/layers/+completion/helm/packages.el index ab3f611..85478a9 100644 --- a/dot_emacs.d/layers/+completion/helm/packages.el +++ b/dot_emacs.d/layers/+completion/helm/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Helm Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -21,6 +21,7 @@ (helm-ls-git :require git) helm-make helm-mode-manager + helm-org helm-projectile helm-swoop helm-themes @@ -160,7 +161,7 @@ (advice-add 'helm-grep-save-results-1 :after 'spacemacs//gne-init-helm-grep) ;; helm-locate uses es (from everything on windows which doesn't like fuzzy) (helm-locate-set-command) - (setq helm-locate-fuzzy-match (string-match "locate" helm-locate-command)) + (setq helm-locate-fuzzy-match (and helm-use-fuzzy (string-match "locate" helm-locate-command))) (setq helm-boring-buffer-regexp-list (append helm-boring-buffer-regexp-list spacemacs-useless-buffers-regexp)) @@ -320,6 +321,11 @@ ;; "hm" 'helm-disable-minor-mode "h C-m" 'helm-enable-minor-mode))) +(defun helm/init-helm-org () + (use-package helm-org + :commands (helm-org-in-buffer-headings) + :defer (spacemacs/defer))) + (defun helm/pre-init-helm-projectile () ;; overwrite projectile settings (spacemacs|use-package-add-hook projectile @@ -388,9 +394,16 @@ (setq helm-swoop-split-with-multiple-windows t helm-swoop-split-direction 'split-window-vertically helm-swoop-speed-or-color t - helm-swoop-split-window-function 'helm-default-display-buffer + helm-swoop-split-window-function 'spacemacs/helm-swoop-split-window-function helm-swoop-pre-input-function (lambda () "")) + (defun spacemacs/helm-swoop-split-window-function (&rest args) + "Override to make helm settings (like `helm-split-window-default-side') work" + (let (;; current helm-swoop implemenatation prevents it from being used fullscreen + (helm-full-frame nil) + (pop-up-windows t)) + (apply 'helm-default-display-buffer args))) + (defun spacemacs/helm-swoop-region-or-symbol () "Call `helm-swoop' with default input." (interactive) diff --git a/dot_emacs.d/layers/+completion/ivy/README.org b/dot_emacs.d/layers/+completion/ivy/README.org index fd228da..d2c84c1 100644 --- a/dot_emacs.d/layers/+completion/ivy/README.org +++ b/dot_emacs.d/layers/+completion/ivy/README.org @@ -77,17 +77,19 @@ In case you don't want to read everything, at least familiarise with Some useful key bindings are presented in the following table. -| Key binding | Description | -|-------------+------------------------------------------------------------------------------------------------------| -| ~RET~ | call default action on current candidate | -| ~M-RET~ | the same as ~RET~ but doesn't close completion minibuffer | -| ~C-M-j~ | use current input immediately (this can be used to create a new file in Find File) | -| ~TAB~ | complete partially | -| ~M-o~ | show the list of valid actions on current candidate (then press any of described keys to execute it) | -| ~C-M-o~ | the same as ~M-o~ but doesn't close completion minibuffer | -| ~C-'~ | use avy to quickly select completion on current page (sometimes faster than using arrows) | -| ~~ | close minibuffer | -| ~C-M-k~ | kill buffer (in =ivy-switch-buffer= (~SPC b b~)) | +| Key binding | Description | +|-------------+-----------------------------------------------------------------------------------------------------------------------------------------------------| +| ~RET~ | call default action on current candidate | +| ~M-RET~ | the same as ~RET~ but doesn't close completion minibuffer | +| ~C-RET~ | when completing file names, selects the current directory candidate and starts a new completion session there, otherwise it is the same as ivy-done | +| ~C-M-j~ | use current input immediately (this can be used to create a new file in Find File) | +| ~TAB~ | complete partially | +| ~M-o~ | show the list of valid actions on current candidate (then press any of described keys to execute it) | +| ~C-M-o~ | the same as ~M-o~ but doesn't close completion minibuffer | +| ~C-'~ | use avy to quickly select completion on current page (sometimes faster than using arrows) | +| ~~ | close minibuffer | +| ~C-M-k~ | kill buffer (in =ivy-switch-buffer= (~SPC b b~)) | +| ~C-M-k~ | kill buffer (in =ivy-reverse-i-search= (~C-r~ at a prompt)) | ** Transient state Press ~M-SPC~ (~m-M-SPC~ [[https://github.com/syl20bnr/spacemacs/blob/cb48ec74c1f401bd2945760799633c0e81e69088/doc/CONVENTIONS.org#transient-state][on macOS]]) anytime in Ivy to get into the transient state. Additional actions diff --git a/dot_emacs.d/layers/+completion/ivy/config.el b/dot_emacs.d/layers/+completion/ivy/config.el index 89d06a0..8fe7951 100644 --- a/dot_emacs.d/layers/+completion/ivy/config.el +++ b/dot_emacs.d/layers/+completion/ivy/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Ivy Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/ivy/funcs.el b/dot_emacs.d/layers/+completion/ivy/funcs.el index 773520b..18b43be 100644 --- a/dot_emacs.d/layers/+completion/ivy/funcs.el +++ b/dot_emacs.d/layers/+completion/ivy/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Ivy Layer functions File for Spacemacs -*- lexical-binding: t; -*- ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -12,7 +12,7 @@ ;; Counsel -;; async +;;; async (defvar spacemacs--counsel-initial-cands-shown nil) @@ -61,7 +61,42 @@ (ivy--insert-prompt)))) (setq counsel--async-time (current-time)))) -;; search +;;; find-file functions, leaving large file check to `spacemacs/check-large-file' + +(defun spacemacs//counsel-find-file-action (x) + "Find file X." + (with-ivy-window + (cond ((and counsel-find-file-speedup-remote + (file-remote-p ivy--directory)) + (let ((find-file-hook nil)) + (find-file (expand-file-name x ivy--directory)))) + ((member (file-name-extension x) counsel-find-file-extern-extensions) + (counsel-find-file-extern x)) + (t + (switch-to-buffer (find-file-noselect (expand-file-name x ivy--directory) t nil t)))))) + +(defun spacemacs/counsel-find-file (&optional initial-input) + "Forward to `find-file'. +When INITIAL-INPUT is non-nil, use it in the minibuffer during completion." + (interactive) + (counsel--find-file-1 + "Find file: " initial-input + #'spacemacs//counsel-find-file-action + 'counsel-find-file)) + +(defun spacemacs/counsel-recentf () + "Find a file on `recentf-list'." + (interactive) + (require 'recentf) + (recentf-mode) + (ivy-read "Recentf: " (counsel-recentf-candidates) + :action (lambda (f) + (with-ivy-window + (switch-to-buffer (find-file-noselect f t nil t)))) + :require-match t + :caller 'counsel-recentf)) + +;;; search (defvar spacemacs--counsel-search-cmd) @@ -193,7 +228,7 @@ that directory." (counsel-delete-process) (swiper--cleanup))))))) -;; Define search functions for each tool +;;; Define search functions for each tool (cl-loop for (tools tool-name) in '((dotspacemacs-search-tools "auto") ((list "rg") "rg") @@ -327,7 +362,7 @@ To prevent this error we just wrap `describe-mode' to defeat the (swiper--cleanup) (swiper--add-overlays (ivy--regex ivy-text))))))) -;; org +;;; org ;; see https://github.com/abo-abo/swiper/issues/177 (defun spacemacs//counsel-org-ctrl-c-ctrl-c-org-tag () @@ -373,7 +408,7 @@ To prevent this error we just wrap `describe-mode' to defeat the (t 'counsel-imenu)))) -;; Ivy +;;; Ivy (defun spacemacs//ivy-command-not-implemented-yet (key) (let ((-key key)) @@ -399,7 +434,7 @@ To prevent this error we just wrap `describe-mode' to defeat the (ivy-wgrep-change-to-wgrep-mode) (evil-normal-state)) -;; Evil +;;; Evil (defun spacemacs/ivy-evil-registers () "Show evil registers" @@ -418,7 +453,7 @@ To prevent this error we just wrap `describe-mode' to defeat the (insert (replace-regexp-in-string "\\^J" "\n" (substring-no-properties candidate 4)))) -;; Layouts +;;; Layouts (defun spacemacs/ivy-spacemacs-layouts () "Control Panel for Spacemacs layouts. Has many actions. @@ -461,31 +496,3 @@ Closing doesn't kill buffers inside the layout while killing layouts does." (spacemacs//current-layout-name)) (persp-names) :action 'persp-kill)) - - -;; Swiper - -(defun spacemacs//counsel-current-region-or-symbol () - "Return contents of the region or symbol at point. - -If region is active, mark will be deactivated in order to prevent region -expansion when jumping around the buffer with counsel. See `deactivate-mark'." - (if (region-active-p) - (prog1 - (buffer-substring-no-properties (region-beginning) (region-end)) - (deactivate-mark)) - (thing-at-point 'symbol t))) - -(defun spacemacs/swiper-region-or-symbol () - "Run `swiper' with the selected region or the symbol -around point as the initial input." - (interactive) - (let ((input (spacemacs//counsel-current-region-or-symbol))) - (swiper input))) - -(defun spacemacs/swiper-all-region-or-symbol () - "Run `swiper-all' with the selected region or the symbol -around point as the initial input." - (interactive) - (let ((input (spacemacs//counsel-current-region-or-symbol))) - (swiper-all input))) diff --git a/dot_emacs.d/layers/+completion/ivy/layers.el b/dot_emacs.d/layers/+completion/ivy/layers.el index ac64722..c988204 100644 --- a/dot_emacs.d/layers/+completion/ivy/layers.el +++ b/dot_emacs.d/layers/+completion/ivy/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Ivy Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/ivy/packages.el b/dot_emacs.d/layers/+completion/ivy/packages.el index b84f37e..f0f976f 100644 --- a/dot_emacs.d/layers/+completion/ivy/packages.el +++ b/dot_emacs.d/layers/+completion/ivy/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Ivy Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -20,6 +20,7 @@ helm-make imenu ivy + ivy-avy ivy-hydra (ivy-rich :toggle ivy-enable-advanced-buffer-information) (ivy-spacemacs-help :location local) @@ -42,8 +43,8 @@ spacemacs--symbol-highlight-transient-state-doc " Search: [_s_] swiper [_b_] buffers [_f_] files [_/_] project")) (spacemacs/transient-state-register-add-bindings 'symbol-highlight - '(("s" spacemacs/swiper-region-or-symbol :exit t) - ("b" spacemacs/swiper-all-region-or-symbol :exit t) + '(("s" swiper-thing-at-point :exit t) + ("b" swiper-all-thing-at-point :exit t) ("f" spacemacs/search-auto-region-or-symbol :exit t) ("/" spacemacs/search-project-auto-region-or-symbol :exit t))))) @@ -57,7 +58,7 @@ (spacemacs/set-leader-keys dotspacemacs-emacs-command-key 'counsel-M-x ;; files - "ff" 'counsel-find-file + "ff" 'spacemacs/counsel-find-file "fel" 'counsel-find-library "fL" 'counsel-locate ;; help @@ -205,12 +206,14 @@ "Ce" 'counsel-colors-emacs "Cf" 'counsel-faces "Cw" 'counsel-colors-web - "fr" 'counsel-recentf + "fr" 'spacemacs/counsel-recentf "rl" 'ivy-resume + "sl" 'ivy-resume "bb" 'ivy-switch-buffer) ;; Moved C-k to C-M-k - (define-key ivy-switch-buffer-map (kbd "C-M-k") 'ivy-switch-buffer-kill)) - + (define-key ivy-switch-buffer-map (kbd "C-M-k") 'ivy-switch-buffer-kill) + (define-key ivy-reverse-i-search-map + (kbd "C-M-k") 'ivy-reverse-i-search-kill)) :config (progn ;; custom actions for recentf @@ -224,6 +227,7 @@ ;; mappings to quit minibuffer or enter transient state (define-key ivy-minibuffer-map [escape] 'minibuffer-keyboard-quit) (define-key ivy-minibuffer-map (kbd "M-SPC") 'hydra-ivy/body) + (define-key ivy-minibuffer-map (kbd "C-") #'ivy-alt-done) (when ivy-ret-visits-directory (define-key ivy-minibuffer-map (kbd "RET") #'ivy-alt-done) @@ -246,6 +250,9 @@ ;; allow to select prompt in some ivy functions (setq ivy-use-selectable-prompt t)))) +(defun ivy/init-ivy-avy () + (use-package ivy-avy)) + (defun ivy/init-ivy-hydra () (use-package ivy-hydra) (define-key hydra-ivy/keymap [escape] 'hydra-ivy/keyboard-escape-quit-and-exit)) @@ -366,9 +373,9 @@ (progn (spacemacs/set-leader-keys "ss" 'swiper - "sS" 'spacemacs/swiper-region-or-symbol + "sS" 'swiper-thing-at-point "sb" 'swiper-all - "sB" 'spacemacs/swiper-all-region-or-symbol) + "sB" 'swiper-all-thing-at-point) (global-set-key "\C-s" 'swiper)))) (defun ivy/init-wgrep () diff --git a/dot_emacs.d/layers/+completion/templates/config.el b/dot_emacs.d/layers/+completion/templates/config.el index d093572..769192e 100644 --- a/dot_emacs.d/layers/+completion/templates/config.el +++ b/dot_emacs.d/layers/+completion/templates/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Tempalte Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+completion/templates/packages.el b/dot_emacs.d/layers/+completion/templates/packages.el index b3296e8..0821e2a 100644 --- a/dot_emacs.d/layers/+completion/templates/packages.el +++ b/dot_emacs.d/layers/+completion/templates/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Template Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+distributions/spacemacs-base/layers.el b/dot_emacs.d/layers/+distributions/spacemacs-base/layers.el index 248296d..717cc1d 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-base/layers.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-base/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Spacemacs base distribution layers File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/README.org b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/README.org index aec5620..4a54a2b 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/README.org +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/README.org @@ -10,7 +10,7 @@ This layer loads the necessary packages for spacemacs to start-up. ** Features: -- Loads =evil= key bindings and macros for auto-evilifcation of maps +- Loads =evil= key bindings and macros for auto-evilification of maps - Loads =holy= and =hybrid= modes - Loads the official Spacemacs theme - Loads =use-package= which is used to load other packages more easily diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/config.el b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/config.el index 9aa5401..7c8d43f 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/config.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spacemacs Bootstrap Layer configuration File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/funcs.el b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/funcs.el index dcec71f..02fe7a4 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/funcs.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Bootstrap Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/evil-evilified-state/evil-evilified-state.el b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/evil-evilified-state/evil-evilified-state.el index 186897b..70548a5 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/evil-evilified-state/evil-evilified-state.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/evil-evilified-state/evil-evilified-state.el @@ -1,6 +1,6 @@ ;;; evil-evilified-state.el --- A minimalistic evil state ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; Keywords: convenience editing evil spacemacs diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/holy-mode/holy-mode.el b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/holy-mode/holy-mode.el index 1ffb003..c30cd63 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/holy-mode/holy-mode.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/holy-mode/holy-mode.el @@ -1,6 +1,6 @@ ;;; holy-mode.el --- Enter the church of Emacs -;; Copyright (c) 2015-2018 Sylvain Benner +;; Copyright (c) 2015-2020 Sylvain Benner ;; ;; Author: Sylvain Benner ;; Keywords: convenience editing diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/hybrid-mode/hybrid-mode.el b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/hybrid-mode/hybrid-mode.el index 9816f56..7d6fbce 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/hybrid-mode/hybrid-mode.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/local/hybrid-mode/hybrid-mode.el @@ -1,6 +1,6 @@ ;;; hybrid-mode.el --- Put one foot in the church of Emacs -;; Copyright (C) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Authors: Justin Burkett ;; Chris Ewald diff --git a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/packages.el b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/packages.el index a4cc01e..bdd7e77 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/packages.el +++ b/dot_emacs.d/layers/+distributions/spacemacs-bootstrap/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Mandatory Bootstrap Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -67,6 +67,9 @@ (require 'evil) (evil-mode 1) + (when (fboundp 'evil-set-undo-system) + (evil-set-undo-system 'undo-tree)) + ;; Use evil as a default jump handler (add-to-list 'spacemacs-default-jump-handlers 'evil-goto-definition) diff --git a/dot_emacs.d/layers/+distributions/spacemacs/layers.el b/dot_emacs.d/layers/+distributions/spacemacs/layers.el index 880fe8a..69463cd 100644 --- a/dot_emacs.d/layers/+distributions/spacemacs/layers.el +++ b/dot_emacs.d/layers/+distributions/spacemacs/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Spacemacs distribution Layer layers File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/better-defaults/config.el b/dot_emacs.d/layers/+emacs/better-defaults/config.el index ffe7e0e..9254103 100644 --- a/dot_emacs.d/layers/+emacs/better-defaults/config.el +++ b/dot_emacs.d/layers/+emacs/better-defaults/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Better Emacs Defaults Layer configuration variables File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thomas de Beauchêne ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/better-defaults/funcs.el b/dot_emacs.d/layers/+emacs/better-defaults/funcs.el index 7509edf..975c2e4 100644 --- a/dot_emacs.d/layers/+emacs/better-defaults/funcs.el +++ b/dot_emacs.d/layers/+emacs/better-defaults/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Better Emacs Defaults Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/better-defaults/keybindings.el b/dot_emacs.d/layers/+emacs/better-defaults/keybindings.el index 00f16e8..2856ae8 100644 --- a/dot_emacs.d/layers/+emacs/better-defaults/keybindings.el +++ b/dot_emacs.d/layers/+emacs/better-defaults/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Better Emacs Defaults Layer key bindings File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/better-defaults/packages.el b/dot_emacs.d/layers/+emacs/better-defaults/packages.el index f6d6d04..63ee029 100644 --- a/dot_emacs.d/layers/+emacs/better-defaults/packages.el +++ b/dot_emacs.d/layers/+emacs/better-defaults/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Better Emacs Defaults Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thomas de Beauchêne ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/ibuffer/config.el b/dot_emacs.d/layers/+emacs/ibuffer/config.el index 3a538bb..b07d206 100644 --- a/dot_emacs.d/layers/+emacs/ibuffer/config.el +++ b/dot_emacs.d/layers/+emacs/ibuffer/config.el @@ -1,6 +1,6 @@ ;;; config.el --- ibuffer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Aleksandr Guljajev ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/ibuffer/funcs.el b/dot_emacs.d/layers/+emacs/ibuffer/funcs.el index b2e5f0e..8fdc15b 100644 --- a/dot_emacs.d/layers/+emacs/ibuffer/funcs.el +++ b/dot_emacs.d/layers/+emacs/ibuffer/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- ibuffer Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Aleksandr Guljajev ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/ibuffer/packages.el b/dot_emacs.d/layers/+emacs/ibuffer/packages.el index f926b4d..3803220 100644 --- a/dot_emacs.d/layers/+emacs/ibuffer/packages.el +++ b/dot_emacs.d/layers/+emacs/ibuffer/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- ibuffer Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Aleksandr Guljajev ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/org/README.org b/dot_emacs.d/layers/+emacs/org/README.org index 7fe4e0a..3490ec6 100644 --- a/dot_emacs.d/layers/+emacs/org/README.org +++ b/dot_emacs.d/layers/+emacs/org/README.org @@ -21,6 +21,7 @@ - [[#different-bullets][Different bullets]] - [[#project-support][Project support]] - [[#org-brain-support][Org-brain support]] + - [[#org-roam-support][Org-roam support]] - [[#mode-line-support][Mode line support]] - [[#sticky-header-support][Sticky header support]] - [[#epub-support][Epub support]] @@ -57,6 +58,7 @@ - [[#verb-mode-bindings][Verb-mode bindings]] - [[#verb-response-body-mode-bindings][Verb-response-body-mode bindings]] - [[#verb-response-headers-mode-bindings][Verb-response-headers-mode bindings]] + - [[#org-roam][Org-roam]] * Description This layer enables [[http://orgmode.org/][org mode]] for Spacemacs. @@ -69,6 +71,7 @@ This layer enables [[http://orgmode.org/][org mode]] for Spacemacs. - Insertion of images via [[https://github.com/abo-abo/org-download][org-download]] - Project-specific TODOs via [[https://github.com/IvanMalison/org-projectile][org-projectile]] - Easy insert of URLs from clipboard with org format via [[https://github.com/rexim/org-cliplink][org-cliplink]] +- Rich insert of code (into a source block with highlighting, and a link) from other buffers via [[https://github.com/unhammer/org-rich-yank][org-rich-yank]] * BibTeX For more extensive support of references through BibTeX files, have a look at @@ -293,6 +296,17 @@ the following snippet. For Emacs 25 or later, support for [[https://kungsgeten.github.io/org-brain.html][org-brain]] is included. See the [[https://github.com/Kungsgeten/org-brain][org-brain package documentation]] for more information. +** Org-roam support +To install org-roam support set the variable =org-enable-roam-support= to =t=. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers '( + (org :variables + org-enable-roam-support t))) +#+END_SRC + +More information about org-roam package (including manual) can be found at [[https://www.orgroam.com/][Org-roam]] website. + ** Mode line support To temporarily enable mode line display of org clock, press ~SPC t m c~. @@ -383,6 +397,7 @@ To install [[https://github.com/federicotdn/verb][Verb]], an HTTP client based o | ~SPC m T c~ | org-toggle-checkbox | | ~SPC m T e~ | org-toggle-pretty-entities | | ~SPC m T i~ | org-toggle-inline-images | +| ~SPC m T n~ | org-num-mode | | ~SPC m T l~ | org-toggle-link-display | | ~SPC m T t~ | org-show-todo-tree | | ~SPC m T T~ | org-todo | @@ -513,7 +528,7 @@ are also available. | ~SPC m s k~ | org-move-subtree-up | | ~SPC m s j~ | org-move-subtree-down | | ~SPC m s n~ | org-narrow-to-subtree | -| ~SPC m s N~ | widen narrowed subtree | +| ~SPC m s w~ | widen narrowed subtree | | ~SPC m s r~ | org-refile | | ~SPC m s s~ | show sparse tree | | ~SPC m s S~ | sort trees | @@ -537,6 +552,7 @@ are also available. | ~SPC m i L~ | insert URL with its page title from clipboard | | ~SPC m i n~ | org-add-note | | ~SPC m i p~ | org-set-property | +| ~SPC m i r~ | org-rich-yank (paste code into a =src= block) | | ~SPC m i s~ | org-insert-subheading | | ~SPC m i t~ | org-set-tags | @@ -750,7 +766,7 @@ org-present must be activated explicitly by typing: ~SPC SPC org-present~ | Key binding | Description | |-------------+--------------------------------------------| -| ~SPC a o r~ | Search org files for keywords and headings | +| ~SPC a o /~ | Search org files for keywords and headings | ** Org-projectile @@ -834,23 +850,26 @@ are available. | ~r~ | Rename this, or another, entry | ** Org-jira +Key binding prefixes: +- ~SPC a o J~ (everywhere) +- ~SPC m m j~ (in an org-mode buffer) -| Key binding | Description | -|-----------------+--------------------------------------------------| -| ~SPC a o J p g~ | Get projects list | -| ~SPC a o J i b~ | Open the current issue in a WWW browser | -| ~SPC a o J i g~ | Get issues | -| ~SPC a o J i h~ | Get only head of issues | -| ~SPC a o J i f~ | Get only head of issues from filter | -| ~SPC a o J i u~ | Update an issue at point | -| ~SPC a o J i w~ | Progress an issue at point | -| ~SPC a o J i r~ | Refresh an issue at point | -| ~SPC a o J i c~ | Create an issue at point | -| ~SPC a o J i y~ | Copy current issue key | -| ~SPC a o J s c~ | Create a subtask | -| ~SPC a o J s g~ | Get subtasks | -| ~SPC a o J c u~ | Update the comment at point or add a new comment | -| ~SPC a o J t j~ | Convert the TODO item at point to a Jira ticket | +| Key binding | Description | +|----------------+--------------------------------------------------| +| ~[prefix] p g~ | Get projects list | +| ~[prefix] i b~ | Open the current issue in a WWW browser | +| ~[prefix] i g~ | Get issues | +| ~[prefix] i h~ | Get only head of issues | +| ~[prefix] i f~ | Get only head of issues from filter | +| ~[prefix] i u~ | Update an issue at point | +| ~[prefix] i w~ | Progress an issue at point | +| ~[prefix] i r~ | Refresh an issue at point | +| ~[prefix] i c~ | Create an issue at point | +| ~[prefix] i y~ | Copy current issue key | +| ~[prefix] s c~ | Create a subtask | +| ~[prefix] s g~ | Get subtasks | +| ~[prefix] c u~ | Update the comment at point or add a new comment | +| ~[prefix] t j~ | Convert the TODO item at point to a Jira ticket | ** Verb *** Verb-mode bindings @@ -880,3 +899,20 @@ are available. | Key binding | Description | |-------------+-----------------------------------------------------| | ~SPC m r q~ | Kill current response headers buffer and its window | + +** Org-roam +Key binding prefixes: +- ~SPC a o r~ (anywhere) +- ~SPC m r~ (in an org-mode buffer) + +| Key binding | Description | +|------------------+---------------------------------------| +| ~[prefix] r l~ | Toggle org-roam links visibility | +| ~[prefix] r f~ | Find file in org-roam | +| ~[prefix] r i~ | Insert file into org-roam | +| ~[prefix] r I~ | Immediately insert file into org-roam | +| ~[prefix] r g~ | Visualize org-roam graph | +| ~[prefix] r b~ | Switch org-roam buffer | +| ~[prefix] r d y~ | Open yesterday's daily note | +| ~[prefix] r d t~ | Open today's daily note | +| ~[prefix] r d T~ | Open tomorrow's daily note | diff --git a/dot_emacs.d/layers/+emacs/org/config.el b/dot_emacs.d/layers/+emacs/org/config.el index 45ac039..8f72345 100644 --- a/dot_emacs.d/layers/+emacs/org/config.el +++ b/dot_emacs.d/layers/+emacs/org/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Org configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -55,3 +55,6 @@ are configured.") (defvar org-enable-verb-support nil "If non-nil, Verb (https://github.com/federicotdn/verb) is configured.") + +(defvar org-enable-roam-support nil + "If non-nil, org-roam (https://www.orgroam.com/) is configured") diff --git a/dot_emacs.d/layers/+emacs/org/funcs.el b/dot_emacs.d/layers/+emacs/org/funcs.el index 7d014f7..7360962 100644 --- a/dot_emacs.d/layers/+emacs/org/funcs.el +++ b/dot_emacs.d/layers/+emacs/org/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Org Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/org/layers.el b/dot_emacs.d/layers/+emacs/org/layers.el index fa6a1dc..8399901 100644 --- a/dot_emacs.d/layers/+emacs/org/layers.el +++ b/dot_emacs.d/layers/+emacs/org/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Org layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/org/packages.el b/dot_emacs.d/layers/+emacs/org/packages.el index 80534fb..ed52b24 100644 --- a/dot_emacs.d/layers/+emacs/org/packages.el +++ b/dot_emacs.d/layers/+emacs/org/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Org Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -17,7 +17,6 @@ evil-org evil-surround gnuplot - (helm-org :toggle (configuration-layer/layer-used-p 'helm)) (helm-org-rifle :toggle (configuration-layer/layer-used-p 'helm)) htmlize ;; ob, org and org-agenda are installed by `org-plus-contrib' @@ -33,6 +32,7 @@ org-pomodoro org-present org-cliplink + org-rich-yank (org-projectile :requires projectile) (ox-epub :toggle org-enable-epub-support) (ox-twbs :toggle org-enable-bootstrap-support) @@ -46,6 +46,7 @@ (org-trello :toggle org-enable-trello-support) (org-sticky-header :toggle org-enable-sticky-header) (verb :toggle org-enable-verb-support) + (org-roam :toggle org-enable-roam-support) )) (defun org/post-init-company () @@ -83,12 +84,7 @@ (defun org/init-helm-org-rifle () (use-package helm-org-rifle :defer t - :init (spacemacs/set-leader-keys "aor" 'helm-org-rifle))) - -(defun org/init-helm-org () - (use-package helm-org - :commands (helm-org-in-buffer-headings) - :defer t)) + :init (spacemacs/set-leader-keys "ao/" 'helm-org-rifle))) (defun org/init-htmlize () (use-package htmlize @@ -113,7 +109,7 @@ :commands (orgtbl-mode) :init (progn - (spacemacs|require 'org) + (spacemacs|require-when-dumping 'org) (setq org-clock-persist-file (concat spacemacs-cache-directory "org-clock-save.el") org-id-locations-file (concat spacemacs-cache-directory @@ -133,7 +129,7 @@ org-imenu-depth 8) (with-eval-after-load 'org-agenda - (add-to-list 'org-modules 'org-habit)) + (add-to-list 'org-modules 'org-habit)) (with-eval-after-load 'org-indent (spacemacs|hide-lighter org-indent-mode)) @@ -236,6 +232,7 @@ Will work on both org-mode and any mode that accepts plain html." "Tc" 'org-toggle-checkbox "Te" 'org-toggle-pretty-entities "Ti" 'org-toggle-inline-images + "Tn" 'org-num-mode "Tl" 'org-toggle-link-display "Tt" 'org-show-todo-tree "TT" 'org-todo @@ -264,7 +261,7 @@ Will work on both org-mode and any mode that accepts plain html." "sk" 'org-move-subtree-up "sl" 'org-demote-subtree "sn" 'org-narrow-to-subtree - "sN" 'widen + "sw" 'widen "sr" 'org-refile "ss" 'org-sparse-tree "sS" 'org-sort @@ -360,10 +357,11 @@ Will work on both org-mode and any mode that accepts plain html." (spacemacs/declare-prefix "ao" "org") (spacemacs/declare-prefix "aof" "feeds") (spacemacs/declare-prefix "aoC" "clock") + ;; org-agenda + (when (configuration-layer/layer-used-p 'ivy) + (spacemacs/set-leader-keys "ao/" 'org-occur-in-agenda-files)) (spacemacs/set-leader-keys - ;; org-agenda "ao#" 'org-agenda-list-stuck-projects - "ao/" 'org-occur-in-agenda-files "aoa" 'org-agenda-list "aoo" 'org-agenda "aoc" 'org-capture @@ -648,7 +646,28 @@ Headline^^ Visit entry^^ Filter^^ Da "aoJsc" 'org-jira-create-subtask "aoJsg" 'org-jira-get-subtasks "aoJcu" 'org-jira-update-comment - "aoJtj" 'org-jira-todo-to-jira)))) + "aoJtj" 'org-jira-todo-to-jira) + (spacemacs/declare-prefix-for-mode 'org-mode "mmj" "jira") + (spacemacs/declare-prefix-for-mode 'org-mode "mmjp" "projects") + (spacemacs/declare-prefix-for-mode 'org-mode "mmji" "issues") + (spacemacs/declare-prefix-for-mode 'org-mode "mmjs" "subtasks") + (spacemacs/declare-prefix-for-mode 'org-mode "mmjc" "comments") + (spacemacs/declare-prefix-for-mode 'org-mode "mmjt" "todos") + (spacemacs/set-leader-keys-for-major-mode 'org-mode + "mjpg" 'org-jira-get-projects + "mjib" 'org-jira-browse-issue + "mjig" 'org-jira-get-issues + "mjih" 'org-jira-get-issues-headonly + "mjif" 'org-jira-get-issues-from-filter-headonly + "mjiu" 'org-jira-update-issue + "mjiw" 'org-jira-progress-issue + "mjir" 'org-jira-refresh-issue + "mjic" 'org-jira-create-issue + "mjiy" 'org-jira-copy-current-issue-key + "mjsc" 'org-jira-create-subtask + "mjsg" 'org-jira-get-subtasks + "mjcu" 'org-jira-update-comment + "mjtj" 'org-jira-todo-to-jira)))) (defun org/init-org-mime () (use-package org-mime @@ -711,6 +730,16 @@ Headline^^ Visit entry^^ Filter^^ Da (spacemacs/set-leader-keys-for-major-mode 'org-mode "iL" 'org-cliplink))) +(defun org/init-org-rich-yank () + (use-package org-rich-yank + :ensure t + :demand t + :init + (spacemacs/set-leader-keys-for-major-mode 'org-mode + ;; yank is a misnomer for this function which actually puts/pastes + ;; ir = "insert rich" + "ir" 'org-rich-yank))) + (defun org/init-org-projectile () (use-package org-projectile :commands (org-projectile-location-for-project) @@ -812,6 +841,38 @@ Headline^^ Visit entry^^ Filter^^ Da "mtub" 'spacemacs/org-trello-push-buffer "mtuc" 'spacemacs/org-trello-push-card)))) +(defun org/init-org-roam () + (use-package org-roam + :init + (progn + (spacemacs/declare-prefix "aor" "org-roam") + (spacemacs/declare-prefix "aord" "org-roam-dailies") + (spacemacs/set-leader-keys + "aordy" 'org-roam-dailies-yesterday + "aordt" 'org-roam-dailies-today + "aordT" 'org-roam-dailies-tomorrow + "aorf" 'org-roam-find-file + "aorg" 'org-roam-graph + "aori" 'org-roam-insert + "aorI" 'org-roam-insert-immediate + "aorl" 'org-roam) + + (spacemacs/declare-prefix-for-mode 'org-mode "mr" "org-roam") + (spacemacs/declare-prefix-for-mode 'org-mode "mrd" "org-roam-dailies") + (spacemacs/set-leader-keys-for-major-mode 'org-mode + "rb" 'org-roam-switch-to-buffer + "rdy" 'org-roam-dailies-yesterday + "rdt" 'org-roam-dailies-today + "rdT" 'org-roam-dailies-tomorrow + "rf" 'org-roam-find-file + "rg" 'org-roam-graph + "ri" 'org-roam-insert + "rI" 'org-roam-insert-immediate + "rl" 'org-roam)) + :config + (progn + (spacemacs|hide-lighter org-roam-mode)))) + (defun org/init-org-sticky-header () (use-package org-sticky-header :defer t @@ -822,17 +883,17 @@ Headline^^ Visit entry^^ Filter^^ Da (use-package verb :defer t :init - (spacemacs/set-leader-keys-for-major-mode - 'org-mode - "rf" #'verb-send-request-on-point - "rs" #'verb-send-request-on-point-other-window - "rr" #'verb-send-request-on-point-other-window-stay - "rm" #'verb-send-request-on-point-no-window - "rk" #'verb-kill-all-response-buffers - "re" #'verb-export-request-on-point - "ru" #'verb-export-request-on-point-curl - "rb" #'verb-export-request-on-point-verb - "rv" #'verb-set-var) + (spacemacs/set-leader-keys-for-major-mode + 'org-mode + "rf" #'verb-send-request-on-point + "rs" #'verb-send-request-on-point-other-window + "rr" #'verb-send-request-on-point-other-window-stay + "rm" #'verb-send-request-on-point-no-window + "rk" #'verb-kill-all-response-buffers + "re" #'verb-export-request-on-point + "ru" #'verb-export-request-on-point-curl + "rb" #'verb-export-request-on-point-verb + "rv" #'verb-set-var) :config (progn (spacemacs/set-leader-keys-for-minor-mode diff --git a/dot_emacs.d/layers/+emacs/outshine/layers.el b/dot_emacs.d/layers/+emacs/outshine/layers.el index c0c78df..ce5421f 100644 --- a/dot_emacs.d/layers/+emacs/outshine/layers.el +++ b/dot_emacs.d/layers/+emacs/outshine/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Outshine layers File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Langston Barrett ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/outshine/packages.el b/dot_emacs.d/layers/+emacs/outshine/packages.el index a696761..f46072f 100644 --- a/dot_emacs.d/layers/+emacs/outshine/packages.el +++ b/dot_emacs.d/layers/+emacs/outshine/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Outshine layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Langston Barrett ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/semantic/config.el b/dot_emacs.d/layers/+emacs/semantic/config.el index c3cefce..07af517 100644 --- a/dot_emacs.d/layers/+emacs/semantic/config.el +++ b/dot_emacs.d/layers/+emacs/semantic/config.el @@ -1,6 +1,6 @@ ;;; config.el --- semantic Layer configuration ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sebastian Wiesner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/semantic/packages.el b/dot_emacs.d/layers/+emacs/semantic/packages.el index bcb116f..03b0de3 100644 --- a/dot_emacs.d/layers/+emacs/semantic/packages.el +++ b/dot_emacs.d/layers/+emacs/semantic/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- semantic Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/smex/funcs.el b/dot_emacs.d/layers/+emacs/smex/funcs.el index 193f59e..75e29c4 100644 --- a/dot_emacs.d/layers/+emacs/smex/funcs.el +++ b/dot_emacs.d/layers/+emacs/smex/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Smex Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/smex/packages.el b/dot_emacs.d/layers/+emacs/smex/packages.el index b4c273a..ff2a9e2 100644 --- a/dot_emacs.d/layers/+emacs/smex/packages.el +++ b/dot_emacs.d/layers/+emacs/smex/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- smex Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+emacs/tabs/README.org b/dot_emacs.d/layers/+emacs/tabs/README.org new file mode 100644 index 0000000..e868b75 --- /dev/null +++ b/dot_emacs.d/layers/+emacs/tabs/README.org @@ -0,0 +1,37 @@ +#+TITLE: Tabs layer + +#+TAGS: emacs|layer|spacemacs + +* Table of Contents :TOC_5_gh:noexport: +- [[#description][Description]] + - [[#features][Features:]] +- [[#install][Install]] +- [[#hide-tabs][Hide tabs]] +- [[#key-bindings][Key bindings]] + +* Description +This layer adds support for tabs. Implementation is done using [[https://github.com/ema2159/centaur-tabs][Centaur Tabs]]. + +** Features: +- Sets up tabs using Centaur tabs as backend + +* Install +To use this configuration layer, add it to your =~/.spacemacs=. You will need to +add =tabs= to the existing =dotspacemacs-configuration-layers= list in this +file. + +* Hide tabs +You can set hooks for buffers in which it isn't desired to have tabs by +customizing =centaur-tabs-hide-tabs-hooks= + +* Key bindings + +| Key binding | Description | +|-------------+-------------------------------------------------------| +| ~C-{~ | Select the previous available tab | +| ~C-}~ | Select the next available tab | +| ~C-M-{~ | Move current tabe to left | +| ~C-M-}~ | Move current tabe to right | +| ~C-c t s~ | Display a list of current buffer groups using Counsel | +| ~C-c t p~ | Group buffer tabs by projectile | +| ~C-c t g~ | Group buffer tabs by groups | diff --git a/dot_emacs.d/layers/+emacs/tabs/config.el b/dot_emacs.d/layers/+emacs/tabs/config.el new file mode 100644 index 0000000..b0106c1 --- /dev/null +++ b/dot_emacs.d/layers/+emacs/tabs/config.el @@ -0,0 +1,57 @@ +;;; config.el --- tabs configuration File for Spacemacs +;; +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors +;; +;; Author: Sylvain Benner +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defvar tabs-navigation nil + "*Specify the scope of cyclic navigation through tabs. +The following scopes are possible: + +- `tabs' + Navigate through visible tabs only. +- `groups' + Navigate through tab groups only. +- nil + Navigate through visible tabs, then through tab groups.") + +(defvar tabs-gray-out-unselected nil + "When non nil, enable gray icons for unselected buffer.") + +(defvar tabs-height 22 + "The height of tab") + +(defvar tabs-show-icons t + "When non nil, show icon from all-the-icons") + +(defvar tabs-set-modified-marker t + "When non nil, display a marker when buffer is modified") + +(defvar tabs-modified-marker "⚠" + "Display appearance of modified marker if enabled") + +(defvar tabs-show-navigation-buttons nil + "When non-nil, show buttons for backward/forward tabs") + +(defvar tabs-style "bar" + "Style of tab; available values are \"bar\", \"alternate\", \"box\", \"chamfer\", \"rounded\", \"slant\", \"wave\", \"zigzag\" ") + +(defvar tabs-group-by-project t + "When non-nil, group tabs by projectile project. Default t. + If non-nil calls (centaur-tabs-group-by-projectile-project) + Otherwise calls (centaur-tabs-group-buffer-groups)") + +(defvar tabs-headline-match t + "When non-nil, make headline use centaur-tabs-default-face. Default t. Calls (centaur-tabs-headline-match)") + +(defvar tabs-set-bar 'left + "When non-nil, display a bar to show currently selected tab. + There are three options: + - 'left: displays the bar at the left of the currently selected tab. + - 'under: displays the bar under the currently selected tab. + - 'over: displays the bar over the currently selected tab.") diff --git a/dot_emacs.d/layers/+emacs/tabs/packages.el b/dot_emacs.d/layers/+emacs/tabs/packages.el new file mode 100644 index 0000000..4ae209e --- /dev/null +++ b/dot_emacs.d/layers/+emacs/tabs/packages.el @@ -0,0 +1,41 @@ +;;; packages.el --- tabs layer packages file for Spacemacs. +;; +;; Copyright (c) 2012-2018, 2020 Sylvain Benner & Contributors +;; +;; Author: Deepu Puthrote +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defconst tabs-packages + '(centaur-tabs)) + +(defun tabs/init-centaur-tabs () + (use-package centaur-tabs + :demand + :config + (setq centaur-tabs-cycle-scope tabs-navigation + centaur-tabs-gray-out-icons tabs-gray-out-unselected + centaur-tabs-height tabs-height + centaur-tabs-modified-marker tabs-modified-marker + centaur-tabs-set-bar tabs-set-bar + centaur-tabs-set-icons tabs-show-icons + centaur-tabs-set-modified-marker tabs-set-modified-marker + centaur-tabs-show-navigation-buttons t + centaur-tabs-style tabs-style) + (when tabs-headline-match + (centaur-tabs-headline-match)) + (if tabs-group-by-project + (centaur-tabs-group-by-projectile-project) + (centaur-tabs-group-buffer-groups)) + (centaur-tabs-mode t) + :bind + ("C-{" . centaur-tabs-backward) + ("C-}" . centaur-tabs-forward) + ("C-M-{" . centaur-tabs-move-current-tab-to-left) + ("C-M-}" . centaur-tabs-move-current-tab-to-right) + ("C-c t s" . centaur-tabs-counsel-switch-group) + ("C-c t p" . centaur-tabs-group-by-projectile-project) + ("C-c t g" . centaur-tabs-group-buffer-groups))) diff --git a/dot_emacs.d/layers/+emacs/typography/config.el b/dot_emacs.d/layers/+emacs/typography/config.el index 2f4c584..070f9b1 100644 --- a/dot_emacs.d/layers/+emacs/typography/config.el +++ b/dot_emacs.d/layers/+emacs/typography/config.el @@ -1,6 +1,6 @@ ;;; config.el --- typography Layer configuration ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sebastian Wiesner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/neotree/funcs.el b/dot_emacs.d/layers/+filetree/neotree/funcs.el index 73ee2be..22cbd49 100644 --- a/dot_emacs.d/layers/+filetree/neotree/funcs.el +++ b/dot_emacs.d/layers/+filetree/neotree/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Neotree Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/neotree/layers.el b/dot_emacs.d/layers/+filetree/neotree/layers.el index a9f8d8c..8d05a5c 100644 --- a/dot_emacs.d/layers/+filetree/neotree/layers.el +++ b/dot_emacs.d/layers/+filetree/neotree/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Neotree layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/neotree/packages.el b/dot_emacs.d/layers/+filetree/neotree/packages.el index 71266c3..64f80b7 100644 --- a/dot_emacs.d/layers/+filetree/neotree/packages.el +++ b/dot_emacs.d/layers/+filetree/neotree/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Neotree Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/treemacs/config.el b/dot_emacs.d/layers/+filetree/treemacs/config.el index 488fad2..bfcf685 100644 --- a/dot_emacs.d/layers/+filetree/treemacs/config.el +++ b/dot_emacs.d/layers/+filetree/treemacs/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Treemacs Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Alexander Miller ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/treemacs/funcs.el b/dot_emacs.d/layers/+filetree/treemacs/funcs.el index 2a67581..29bcd01 100644 --- a/dot_emacs.d/layers/+filetree/treemacs/funcs.el +++ b/dot_emacs.d/layers/+filetree/treemacs/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Treemacs Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/treemacs/layers.el b/dot_emacs.d/layers/+filetree/treemacs/layers.el index 64b03b2..f4963f2 100644 --- a/dot_emacs.d/layers/+filetree/treemacs/layers.el +++ b/dot_emacs.d/layers/+filetree/treemacs/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Treemacs layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+filetree/treemacs/packages.el b/dot_emacs.d/layers/+filetree/treemacs/packages.el index a5e060f..e7fe5ab 100644 --- a/dot_emacs.d/layers/+filetree/treemacs/packages.el +++ b/dot_emacs.d/layers/+filetree/treemacs/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Treemacs Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Alexander Miller ;; Hong Xu diff --git a/dot_emacs.d/layers/+fonts/unicode-fonts/README.org b/dot_emacs.d/layers/+fonts/unicode-fonts/README.org index ead473e..960a65d 100644 --- a/dot_emacs.d/layers/+fonts/unicode-fonts/README.org +++ b/dot_emacs.d/layers/+fonts/unicode-fonts/README.org @@ -6,9 +6,10 @@ - [[#description][Description]] - [[#features][Features:]] - [[#install][Install]] +- [[#ligature-fonts][Ligature Fonts]] * Description -This layer adds support for the [[https://github.com/rolandwalker/unicode-fonts][unicode-fonts]] package. It is recommended to +This layer adds support for [[https://github.com/rolandwalker/unicode-fonts][unicode-fonts]] package. It is recommended to install the fonts listed in the [[https://github.com/rolandwalker/unicode-fonts#quickstart][Quickstart]] section of the unicode-fonts README. ** Features: @@ -16,6 +17,7 @@ install the fonts listed in the [[https://github.com/rolandwalker/unicode-fonts# - Easily override glyphs or sections of glyphs. - Display color emoji on both the macOS port version of Emacs and emacs-plus (with =unicode-fonts-force-multi-color-on-mac= set to non nil). +- Enable support for font ligature in Emacs 27 + via [[https://github.com/mickeynp/ligature.el][ligatures.el]]. * Install To use this configuration layer, add it to your =~/.spacemacs=. You will need to @@ -28,3 +30,39 @@ enable color emoji. #+BEGIN_SRC elisp (unicode-fonts :variables unicode-fonts-force-multi-color-on-mac t) #+END_SRC + +If you want ligature support Emacs must be built with =Harfbuzz= and a ligature +font must be installed and configured you can see the [[https://github.com/mickeynp/ligature.el#compatibility-and-version-requirements][upstream]] docs for a full +list of requirements. By default this is not enabled you can enable it with +=unicode-fonts-enable-ligatures=. + +#+BEGIN_SRC elisp + (unicode-fonts :variables unicode-fonts-enable-ligatures t) +#+END_SRC + +By default when ligatures are enabled all modes will have ligatures. You can +enable ligatures for specific modes with the =unicode-fonts-ligature-modes= +variable. + +#+BEGIN_SRC elisp + (unicode-fonts :variables unicode-fonts-ligature-modes '(php-mode js-mode)) +#+END_SRC + +To enable only for programming modes you can use =prog-mode= + +#+BEGIN_SRC elisp + (unicode-fonts :variables unicode-fonts-ligature-modes '(prog-mode)) +#+END_SRC + +To configure the ligature set that gets used with your font there is a +=unicode-fonts-ligature-set= variable. To only enable the ligatures in +=if= statements you can limit the =unicode-fonts-ligature-set= + +#+BEGIN_SRC elisp + (unicode-fonts :variables unicode-fonts-ligature-set '("==" "===" "!=" "!==" "||" "&&")) +#+END_SRC + +* Ligature Fonts +- [[https://github.com/tonsky/FiraCode][Fira Code]] +- [[https://github.com/microsoft/cascadia-code][Cascadia Code]] +- [[https://github.com/be5invis/Iosevka/][Iosevka]] diff --git a/dot_emacs.d/layers/+fonts/unicode-fonts/config.el b/dot_emacs.d/layers/+fonts/unicode-fonts/config.el index 8d81ea4..029ca5a 100644 --- a/dot_emacs.d/layers/+fonts/unicode-fonts/config.el +++ b/dot_emacs.d/layers/+fonts/unicode-fonts/config.el @@ -1,6 +1,6 @@ ;;; config.el --- unicode-fonts configuration file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Aaron Jensen ;; URL: https://github.com/syl20bnr/spacemacs @@ -11,6 +11,28 @@ (defvar unicode-fonts-force-multi-color-on-mac nil "If non nil unicode-fonts will enable multi-color fonts (emoji) - on macs. This should only be set when using the multi-color - patch as emacs-plus does. It is unnecessary to set this when - using the macOS port version.") +on macs. + +This should only be set when using the multi-color patch as +emacs-plus does. It is unnecessary to set this when using the +macOS port version.") +(defvar unicode-fonts-enable-ligatures nil + "If you want to enable font ligatures") + +(defvar unicode-fonts-ligature-set '("|||>" "<|||" "<==>" "" "---" "-<<" + "<~~" "<~>" "<*>" "<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->" + "<--" "<-<" "<<=" "<<-" "<<<" "<+>" "" "###" "#_(" "..<" + "..." "+++" "/==" "///" "_|_" "www" "&&" "^=" "~~" "~@" "~=" + "~>" "~-" "**" "*>" "*/" "||" "|}" "|]" "|=" "|>" "|-" "{|" + "[|" "]#" "::" ":=" ":>" ":<" "$>" "==" "=>" "!=" "!!" ">:" + ">=" ">>" ">-" "-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:" + "<$" "<=" "<>" "<-" "<<" "<+" "" "++" "?:" + "?=" "?." "??" ";;" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)" + "\\" "://") + "List of ligatures you would like enabled") + +(defvar unicode-fonts-ligature-modes '(t) + "The modes ligatures are enabled in, default is in all modes") diff --git a/dot_emacs.d/layers/+fonts/unicode-fonts/packages.el b/dot_emacs.d/layers/+fonts/unicode-fonts/packages.el index 9a59617..0d05724 100644 --- a/dot_emacs.d/layers/+fonts/unicode-fonts/packages.el +++ b/dot_emacs.d/layers/+fonts/unicode-fonts/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- unicode-fonts layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Aaron Jensen ;; URL: https://github.com/syl20bnr/spacemacs @@ -9,13 +9,13 @@ ;; ;;; License: GPLv3 -;;; Code: - (defconst unicode-fonts-packages - '( - unicode-fonts + '(unicode-fonts persistent-soft - )) + (ligature :location (recipe + :fetcher github + :repo "mickeynp/ligature.el") + :toggle (and (> emacs-major-version 26) unicode-fonts-enable-ligatures)))) (defun unicode-fonts/init-persistent-soft () (use-package persistent-soft @@ -30,4 +30,8 @@ (setq unicode-fonts-skip-font-groups '(decorative low-quality-glyphs))) (unicode-fonts-setup)))) -;;; packages.el ends here +(defun unicode-fonts/init-ligature () + "Initialise the ligatures for emacs 27+" + (dolist (mode unicode-fonts-ligature-modes) + (ligature-set-ligatures mode unicode-fonts-ligature-set)) + (global-ligature-mode t)) diff --git a/dot_emacs.d/layers/+frameworks/django/layers.el b/dot_emacs.d/layers/+frameworks/django/layers.el index 250b682..96c302f 100644 --- a/dot_emacs.d/layers/+frameworks/django/layers.el +++ b/dot_emacs.d/layers/+frameworks/django/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Django Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrea Moretti ;; URL: https://github.com/axyz diff --git a/dot_emacs.d/layers/+frameworks/django/packages.el b/dot_emacs.d/layers/+frameworks/django/packages.el index ba63715..fd845b3 100644 --- a/dot_emacs.d/layers/+frameworks/django/packages.el +++ b/dot_emacs.d/layers/+frameworks/django/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Django Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+frameworks/emberjs/packages.el b/dot_emacs.d/layers/+frameworks/emberjs/packages.el index f80ee6a..eb46ccc 100644 --- a/dot_emacs.d/layers/+frameworks/emberjs/packages.el +++ b/dot_emacs.d/layers/+frameworks/emberjs/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- emberjs layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Robert O'Connor ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+frameworks/phoenix/layers.el b/dot_emacs.d/layers/+frameworks/phoenix/layers.el index 5321e3d..eafb2ed 100644 --- a/dot_emacs.d/layers/+frameworks/phoenix/layers.el +++ b/dot_emacs.d/layers/+frameworks/phoenix/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- phoenix Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Lyuben Petrov ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+frameworks/phoenix/packages.el b/dot_emacs.d/layers/+frameworks/phoenix/packages.el index d6dd28d..60bb0e4 100644 --- a/dot_emacs.d/layers/+frameworks/phoenix/packages.el +++ b/dot_emacs.d/layers/+frameworks/phoenix/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- phoenix layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Lyuben Petrov ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+frameworks/react/config.el b/dot_emacs.d/layers/+frameworks/react/config.el index 291ea95..377b2f4 100644 --- a/dot_emacs.d/layers/+frameworks/react/config.el +++ b/dot_emacs.d/layers/+frameworks/react/config.el @@ -1,6 +1,6 @@ ;;; config.el --- react layer config file for Spacemacs. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrea Moretti ;; URL: https://github.com/axyz diff --git a/dot_emacs.d/layers/+frameworks/react/funcs.el b/dot_emacs.d/layers/+frameworks/react/funcs.el index 4aa0aa1..9760cd7 100644 --- a/dot_emacs.d/layers/+frameworks/react/funcs.el +++ b/dot_emacs.d/layers/+frameworks/react/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- react layer funcs file for Spacemacs. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Muneeb Shaikh ;; URL: https://github.com/syl20bnr/spacemacs @@ -35,7 +35,7 @@ (if (configuration-layer/layer-used-p 'lsp) (progn (when (not javascript-lsp-linter) - (setq-local lsp-diagnostic-package :none)) + (setq-local lsp-diagnostics-provider :none)) (lsp)) (message "`lsp' layer is not installed, please add `lsp' layer to your dotfile."))) diff --git a/dot_emacs.d/layers/+frameworks/react/layers.el b/dot_emacs.d/layers/+frameworks/react/layers.el index 750a43b..eb5e3d1 100644 --- a/dot_emacs.d/layers/+frameworks/react/layers.el +++ b/dot_emacs.d/layers/+frameworks/react/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- react Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrea Moretti ;; URL: https://github.com/axyz diff --git a/dot_emacs.d/layers/+frameworks/react/packages.el b/dot_emacs.d/layers/+frameworks/react/packages.el index 4514dd0..77e6a5e 100644 --- a/dot_emacs.d/layers/+frameworks/react/packages.el +++ b/dot_emacs.d/layers/+frameworks/react/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- react layer packages file for Spacemacs. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrea Moretti ;; URL: https://github.com/axyz diff --git a/dot_emacs.d/layers/+frameworks/ruby-on-rails/layers.el b/dot_emacs.d/layers/+frameworks/ruby-on-rails/layers.el index 5f9bd55..db85321 100644 --- a/dot_emacs.d/layers/+frameworks/ruby-on-rails/layers.el +++ b/dot_emacs.d/layers/+frameworks/ruby-on-rails/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Ruby on Rails Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrea Moretti ;; URL: https://github.com/axyz diff --git a/dot_emacs.d/layers/+frameworks/ruby-on-rails/packages.el b/dot_emacs.d/layers/+frameworks/ruby-on-rails/packages.el index dcf505e..0f93d68 100644 --- a/dot_emacs.d/layers/+frameworks/ruby-on-rails/packages.el +++ b/dot_emacs.d/layers/+frameworks/ruby-on-rails/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Ruby on Rails Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+frameworks/vue/config.el b/dot_emacs.d/layers/+frameworks/vue/config.el index 1234ca8..12458ae 100644 --- a/dot_emacs.d/layers/+frameworks/vue/config.el +++ b/dot_emacs.d/layers/+frameworks/vue/config.el @@ -1,6 +1,6 @@ ;;; config.el --- vue layer config file for Spacemacs. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/thanhvg diff --git a/dot_emacs.d/layers/+frameworks/vue/funcs.el b/dot_emacs.d/layers/+frameworks/vue/funcs.el index cd81763..2f29e12 100644 --- a/dot_emacs.d/layers/+frameworks/vue/funcs.el +++ b/dot_emacs.d/layers/+frameworks/vue/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- vue layer funcs file for Spacemacs. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/thanhvg @@ -30,7 +30,7 @@ (progn ;; error checking from lsp langserver sucks, turn it off ;; so eslint won't be overriden - (setq-local lsp-diagnostic-package :none) + (setq-local lsp-diagnostics-provider :none) (lsp)) (message (concat "`lsp' layer is not installed, " "please add `lsp' layer to your dotfile.")))) @@ -73,6 +73,7 @@ "such as indent rules comment style etc" ;; https://stackoverflow.com/questions/36701024/how-can-i-indent-inline-javascript-in-web-mode (setq web-mode-script-padding 0) + (setq web-mode-style-padding 0) ;; https://emacs.stackexchange.com/questions/27683/change-comment-style-in-web-mode (add-to-list 'web-mode-comment-formats '("javascript" . "//"))) diff --git a/dot_emacs.d/layers/+frameworks/vue/layers.el b/dot_emacs.d/layers/+frameworks/vue/layers.el index 3f3a5a5..a1ccd0c 100644 --- a/dot_emacs.d/layers/+frameworks/vue/layers.el +++ b/dot_emacs.d/layers/+frameworks/vue/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- react Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/thanhvg @@ -9,4 +9,4 @@ ;; ;;; License: GPLv3 -(configuration-layer/declare-layers '(node html prettier)) +(configuration-layer/declare-layers '(node html prettier javascript)) diff --git a/dot_emacs.d/layers/+frameworks/vue/packages.el b/dot_emacs.d/layers/+frameworks/vue/packages.el index 6f2de6c..98ebf71 100644 --- a/dot_emacs.d/layers/+frameworks/vue/packages.el +++ b/dot_emacs.d/layers/+frameworks/vue/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- vue layer packages file for Spacemacs. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/thanhvg diff --git a/dot_emacs.d/layers/+fun/emoji/funcs.el b/dot_emacs.d/layers/+fun/emoji/funcs.el index f719218..9836399 100644 --- a/dot_emacs.d/layers/+fun/emoji/funcs.el +++ b/dot_emacs.d/layers/+fun/emoji/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Emoji Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+fun/emoji/packages.el b/dot_emacs.d/layers/+fun/emoji/packages.el index 70a7c29..af4008b 100644 --- a/dot_emacs.d/layers/+fun/emoji/packages.el +++ b/dot_emacs.d/layers/+fun/emoji/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- emoji Layer Packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+fun/games/config.el b/dot_emacs.d/layers/+fun/games/config.el index bc11641..82663ee 100644 --- a/dot_emacs.d/layers/+fun/games/config.el +++ b/dot_emacs.d/layers/+fun/games/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Games Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+fun/games/funcs.el b/dot_emacs.d/layers/+fun/games/funcs.el index 1ba77fd..8b3ee00 100644 --- a/dot_emacs.d/layers/+fun/games/funcs.el +++ b/dot_emacs.d/layers/+fun/games/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Games Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+fun/games/packages.el b/dot_emacs.d/layers/+fun/games/packages.el index 8098d85..59655a9 100644 --- a/dot_emacs.d/layers/+fun/games/packages.el +++ b/dot_emacs.d/layers/+fun/games/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- games Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+fun/selectric/packages.el b/dot_emacs.d/layers/+fun/selectric/packages.el index 8b99107..899c221 100644 --- a/dot_emacs.d/layers/+fun/selectric/packages.el +++ b/dot_emacs.d/layers/+fun/selectric/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- selectric Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Gergely Nagy ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+fun/xkcd/packages.el b/dot_emacs.d/layers/+fun/xkcd/packages.el index 9e40c4c..1806d9c 100644 --- a/dot_emacs.d/layers/+fun/xkcd/packages.el +++ b/dot_emacs.d/layers/+fun/xkcd/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- xkcd Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+intl/chinese/config.el b/dot_emacs.d/layers/+intl/chinese/config.el index fadd855..8e68a0c 100644 --- a/dot_emacs.d/layers/+intl/chinese/config.el +++ b/dot_emacs.d/layers/+intl/chinese/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Chinese Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+intl/chinese/packages.el b/dot_emacs.d/layers/+intl/chinese/packages.el index 876afe8..7bf325b 100644 --- a/dot_emacs.d/layers/+intl/chinese/packages.el +++ b/dot_emacs.d/layers/+intl/chinese/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Chinese Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+intl/japanese/README.org b/dot_emacs.d/layers/+intl/japanese/README.org index 6549c34..e776cb3 100644 --- a/dot_emacs.d/layers/+intl/japanese/README.org +++ b/dot_emacs.d/layers/+intl/japanese/README.org @@ -26,7 +26,7 @@ This Layer adds Japanese related packages. - [[https://github.com/emacs-jp/migemo][migemo]]: Japanese incremental search through dynamic pattern expansion - [[https://github.com/emacs-helm/helm/wiki/Migemo][helm-migemo-mode]]: helm with migemo - [[https://github.com/momomo5717/avy-migemo/blob/master/README.jp.org][avy-migemo]]: avy with migemo -- [[https://github.com/hsaito/ddskk][ddskk]]: Simple Kana to Kanji conversion program (SKK) +- [[https://github.com/skk-dev/ddskk][ddskk]]: Simple Kana to Kanji conversion program (SKK) - [[https://github.com/emacs-jp/japanese-holidays][japanese-holidays]]: calendar functions for the Japanese calendar - [[https://github.com/coldnew/pangu-spacing][pangu-spacing]]: emacs minor-mode to add space between Japanese and English characters. @@ -101,7 +101,7 @@ inside =dotspacemacs/user-config=. *** ddskk You can write a configuration file =​~/.skk=. For detailed configuration, see -some [[https://skk-dev.github.io/ddskk/skk.html][documents]]. +some [[http://openlab.ring.gr.jp/skk/ddskk.html][documents]]. *** pangu-spacing By default, =pangu-spacing-mode= is applied to =text-mode=. If you prefer the diff --git a/dot_emacs.d/layers/+intl/japanese/packages.el b/dot_emacs.d/layers/+intl/japanese/packages.el index cdb5ff1..c039444 100644 --- a/dot_emacs.d/layers/+intl/japanese/packages.el +++ b/dot_emacs.d/layers/+intl/japanese/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Japanese Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Kenji Miyazaki ;; URL: https://github.com/kenjimyzk/ diff --git a/dot_emacs.d/layers/+intl/keyboard-layout/config.el b/dot_emacs.d/layers/+intl/keyboard-layout/config.el index 563b071..6321552 100644 --- a/dot_emacs.d/layers/+intl/keyboard-layout/config.el +++ b/dot_emacs.d/layers/+intl/keyboard-layout/config.el @@ -1,6 +1,6 @@ ;;; config.el --- keyboard-layout Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fabien Dubosson ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+intl/keyboard-layout/funcs.el b/dot_emacs.d/layers/+intl/keyboard-layout/funcs.el index 333ebd6..541a58c 100644 --- a/dot_emacs.d/layers/+intl/keyboard-layout/funcs.el +++ b/dot_emacs.d/layers/+intl/keyboard-layout/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- keyboard-layout Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fabien Dubosson ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+intl/keyboard-layout/packages.el b/dot_emacs.d/layers/+intl/keyboard-layout/packages.el index 38fbf0b..098258a 100644 --- a/dot_emacs.d/layers/+intl/keyboard-layout/packages.el +++ b/dot_emacs.d/layers/+intl/keyboard-layout/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- keyboard-layout Layer Packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fabien Dubosson ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/agda/config.el b/dot_emacs.d/layers/+lang/agda/config.el index 1a5e816..f9f19a7 100644 --- a/dot_emacs.d/layers/+lang/agda/config.el +++ b/dot_emacs.d/layers/+lang/agda/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Agda2 Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: FreeSalad ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/agda/packages.el b/dot_emacs.d/layers/+lang/agda/packages.el index b15742c..3ac9338 100644 --- a/dot_emacs.d/layers/+lang/agda/packages.el +++ b/dot_emacs.d/layers/+lang/agda/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Agda2 Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Oliver Charles ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/alda/packages.el b/dot_emacs.d/layers/+lang/alda/packages.el index 23c3eff..03ce85d 100644 --- a/dot_emacs.d/layers/+lang/alda/packages.el +++ b/dot_emacs.d/layers/+lang/alda/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Alda Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrew Hill ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/asciidoc/packages.el b/dot_emacs.d/layers/+lang/asciidoc/packages.el index d2508af..959eb7d 100644 --- a/dot_emacs.d/layers/+lang/asciidoc/packages.el +++ b/dot_emacs.d/layers/+lang/asciidoc/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Asciidoc Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Mark Safronov ;; Author: Torben Hoffmann diff --git a/dot_emacs.d/layers/+lang/asm/config.el b/dot_emacs.d/layers/+lang/asm/config.el index 35d23b2..ca7ea8d 100644 --- a/dot_emacs.d/layers/+lang/asm/config.el +++ b/dot_emacs.d/layers/+lang/asm/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Asm Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Tu, Do Hoang ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/asm/funcs.el b/dot_emacs.d/layers/+lang/asm/funcs.el index 14db2db..6595986 100644 --- a/dot_emacs.d/layers/+lang/asm/funcs.el +++ b/dot_emacs.d/layers/+lang/asm/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Asm Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Tu, Do Hoang ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/asm/packages.el b/dot_emacs.d/layers/+lang/asm/packages.el index 72b8d51..68ae8f0 100644 --- a/dot_emacs.d/layers/+lang/asm/packages.el +++ b/dot_emacs.d/layers/+lang/asm/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Asm Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Tu, Do Hoang ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/autohotkey/packages.el b/dot_emacs.d/layers/+lang/autohotkey/packages.el index 0d8d385..5d4d36a 100644 --- a/dot_emacs.d/layers/+lang/autohotkey/packages.el +++ b/dot_emacs.d/layers/+lang/autohotkey/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- autohotkey Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; Author: Rich Alesi diff --git a/dot_emacs.d/layers/+lang/c-c++/README.org b/dot_emacs.d/layers/+lang/c-c++/README.org index 6429fb9..60d7279 100644 --- a/dot_emacs.d/layers/+lang/c-c++/README.org +++ b/dot_emacs.d/layers/+lang/c-c++/README.org @@ -108,7 +108,7 @@ The backend can be chosen on a per project basis using directory local variables *Note:* you can easily add a directory local variable with ~SPC f v d~. *** LSP -LSP support is provided via the [[file:../../+tools/lsp/README.org][LSP layer]], using one of three available backends +LSP support is provided via the [[file:../../+tools/lsp/README.org][LSP layer]], using one of two available backends (all based on libclang). - [[https://clang.llvm.org/extra/clangd/][clangd]] - [[https://github.com/MaskRay/ccls][ccls]] @@ -279,7 +279,7 @@ To enable automatic buffer formatting on save, set the variable ** Enable google-set-c-style If you have clang enabled with =clang-format= as described earlier in this page -you may not have a lot of neeed for =google-set-c-style= if you are already +you may not have a lot of need for =google-set-c-style= if you are already using a mode based on Google mode for most of your projects. However, if you don't have (or want) =clang-format=, or if you have to do a lot @@ -449,8 +449,9 @@ A ~[ccls]~ suffix indicates that the binding is for the indicated backend only. | ~SPC m g R~ | rename symbol | | ~SPC m g s~ | print source arguments | | ~SPC m g S~ | display summary | -| ~SPC m g t~ | display include dependency tree | +| ~SPC m g t~ | symbol type | | ~SPC m g T~ | taglist | +| ~SPC m g u~ | display include dependency tree | | ~SPC m g v~ | find virtuals at point | | ~SPC m g V~ | print enum value at point | | ~SPC m g X~ | fix fixit at point | diff --git a/dot_emacs.d/layers/+lang/c-c++/config.el b/dot_emacs.d/layers/+lang/c-c++/config.el index 34b79c8..ab5953f 100644 --- a/dot_emacs.d/layers/+lang/c-c++/config.el +++ b/dot_emacs.d/layers/+lang/c-c++/config.el @@ -1,6 +1,6 @@ ;;; config.el --- C/C++ Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/c-c++/funcs.el b/dot_emacs.d/layers/+lang/c-c++/funcs.el index f832275..f0ef819 100644 --- a/dot_emacs.d/layers/+lang/c-c++/funcs.el +++ b/dot_emacs.d/layers/+lang/c-c++/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- C/C++ Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -210,8 +210,9 @@ "gR" 'rtags-rename-symbol "gs" 'rtags-print-source-arguments "gS" 'rtags-display-summary - "gt" 'rtags-dependency-tree + "gt" 'rtags-symbol-type "gT" 'rtags-taglist + "gu" 'rtags-dependency-tree "gv" 'rtags-find-virtuals-at-point "gV" 'rtags-print-enum-value-at-point "gX" 'rtags-fix-fixit-at-point diff --git a/dot_emacs.d/layers/+lang/c-c++/global_conf.py b/dot_emacs.d/layers/+lang/c-c++/global_conf.py index 052a14e..5fe6184 100644 --- a/dot_emacs.d/layers/+lang/c-c++/global_conf.py +++ b/dot_emacs.d/layers/+lang/c-c++/global_conf.py @@ -1,6 +1,6 @@ # global_conf.py --- ycmd global configuration file for Spacemacs # -# Copyright (c) 2012-2018 Sylvain Benner & Contributors +# Copyright (c) 2012-2020 Sylvain Benner & Contributors # # Author: Thomas de Beauchene # URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/c-c++/layers.el b/dot_emacs.d/layers/+lang/c-c++/layers.el index a22b56a..c0471a2 100644 --- a/dot_emacs.d/layers/+lang/c-c++/layers.el +++ b/dot_emacs.d/layers/+lang/c-c++/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- C/C++ Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/clojure/README.org b/dot_emacs.d/layers/+lang/clojure/README.org index 870f282..052ed02 100644 --- a/dot_emacs.d/layers/+lang/clojure/README.org +++ b/dot_emacs.d/layers/+lang/clojure/README.org @@ -487,6 +487,7 @@ Evaluate Clojure code in the source code buffer |---------------+-------------------------------------------------------------------| | ~SPC m e ;~ | eval sexp and show result as comment | | ~SPC m e $~ | go to end of line and eval last sexp | +| ~SPC m e (~ | eval 'list' around point (sequence, list, vector, map, set) | | ~SPC m e b~ | eval buffer | | ~SPC m e e~ | eval last sexp | | ~SPC m e f~ | eval function at point | diff --git a/dot_emacs.d/layers/+lang/clojure/config.el b/dot_emacs.d/layers/+lang/clojure/config.el index d0a0924..6e1fc3b 100644 --- a/dot_emacs.d/layers/+lang/clojure/config.el +++ b/dot_emacs.d/layers/+lang/clojure/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Clojure Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/clojure/funcs.el b/dot_emacs.d/layers/+lang/clojure/funcs.el index 59a5a96..2ad764b 100644 --- a/dot_emacs.d/layers/+lang/clojure/funcs.el +++ b/dot_emacs.d/layers/+lang/clojure/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Clojure Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/clojure/packages.el b/dot_emacs.d/layers/+lang/clojure/packages.el index 7810aa3..67c595d 100644 --- a/dot_emacs.d/layers/+lang/clojure/packages.el +++ b/dot_emacs.d/layers/+lang/clojure/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Clojure Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -38,8 +38,8 @@ popwin (sayid :toggle clojure-enable-sayid) smartparens - subword - )) + subword)) + (defun clojure/init-cider () (use-package cider @@ -81,8 +81,8 @@ ("msj" . "jack-in") ("msq" . "quit/restart repl") ("mt" . "test") - ("mT" . "toggle") - ))) + ("mT" . "toggle")))) + (spacemacs|forall-clojure-modes m (mapc (lambda (x) (spacemacs/declare-prefix-for-mode m (car x) (cdr x))) @@ -108,6 +108,7 @@ ;; evaluate in source code buffer "e;" 'cider-eval-defun-to-comment "e$" 'spacemacs/cider-eval-sexp-end-of-line + "e(" 'cider-eval-list-at-point "eb" 'cider-eval-buffer "ee" 'cider-eval-last-sexp "ef" 'cider-eval-defun-at-point @@ -216,8 +217,8 @@ "ps" 'cider-profile-var-summary "pS" 'cider-profile-summary "pt" 'cider-profile-toggle - "pv" 'cider-profile-var-profiled-p - ))) + "pv" 'cider-profile-var-profiled-p))) + ;; cider-repl-mode only (spacemacs/set-leader-keys-for-major-mode 'cider-repl-mode @@ -479,8 +480,8 @@ "dty" 'sayid-trace-all-ns-in-dir "dV" 'sayid-set-view "dw" 'sayid-get-workspace - "dx" 'sayid-reset-workspace - )) + "dx" 'sayid-reset-workspace)) + (evilified-state-evilify sayid-mode sayid-mode-map (kbd "H") 'sayid-buf-show-help @@ -499,7 +500,17 @@ (evilified-state-evilify sayid-traced-mode sayid-traced-mode-map (kbd "l") 'sayid-show-traced - (kbd "h") 'sayid-traced-buf-show-help)))) + (kbd "h") 'sayid-traced-buf-show-help)) + :config + (progn + ;; If sayid-version is null the .elc file + ;; is corrupted. Then force a reinstall and + ;; reload the feature. + (when (null sayid-version) + (package-reinstall 'sayid) + (unload-feature 'sayid) + (require 'sayid) + (setq cider-jack-in-lein-plugins (delete `("com.billpiel/sayid" nil) cider-jack-in-lein-plugins)))))) (defun clojure/post-init-parinfer () (add-hook 'clojure-mode-hook 'parinfer-mode)) diff --git a/dot_emacs.d/layers/+lang/coffeescript/config.el b/dot_emacs.d/layers/+lang/coffeescript/config.el index d79f48c..b44399c 100644 --- a/dot_emacs.d/layers/+lang/coffeescript/config.el +++ b/dot_emacs.d/layers/+lang/coffeescript/config.el @@ -1,6 +1,6 @@ ;;; config.el --- CoffeeScript Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/coffeescript/funcs.el b/dot_emacs.d/layers/+lang/coffeescript/funcs.el index b111229..a7517fb 100644 --- a/dot_emacs.d/layers/+lang/coffeescript/funcs.el +++ b/dot_emacs.d/layers/+lang/coffeescript/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- CoffeeScript Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Muneeb Shaikh ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/coffeescript/layers.el b/dot_emacs.d/layers/+lang/coffeescript/layers.el index e055656..8bacd8a 100644 --- a/dot_emacs.d/layers/+lang/coffeescript/layers.el +++ b/dot_emacs.d/layers/+lang/coffeescript/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- CoffeeScript Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/coffeescript/packages.el b/dot_emacs.d/layers/+lang/coffeescript/packages.el index 32982e2..042e623 100644 --- a/dot_emacs.d/layers/+lang/coffeescript/packages.el +++ b/dot_emacs.d/layers/+lang/coffeescript/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- CoffeeScript Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/common-lisp/config.el b/dot_emacs.d/layers/+lang/common-lisp/config.el index 807a819..bf4a6ba 100644 --- a/dot_emacs.d/layers/+lang/common-lisp/config.el +++ b/dot_emacs.d/layers/+lang/common-lisp/config.el @@ -1,6 +1,6 @@ ;;; config.el --- common-lisp Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/common-lisp/funcs.el b/dot_emacs.d/layers/+lang/common-lisp/funcs.el index 92838c5..04fa70f 100644 --- a/dot_emacs.d/layers/+lang/common-lisp/funcs.el +++ b/dot_emacs.d/layers/+lang/common-lisp/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Slime Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/common-lisp/packages.el b/dot_emacs.d/layers/+lang/common-lisp/packages.el index ac5c82f..245ff6d 100644 --- a/dot_emacs.d/layers/+lang/common-lisp/packages.el +++ b/dot_emacs.d/layers/+lang/common-lisp/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Common Lisp Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/coq/config.el b/dot_emacs.d/layers/+lang/coq/config.el index 2cee1ba..83287ae 100644 --- a/dot_emacs.d/layers/+lang/coq/config.el +++ b/dot_emacs.d/layers/+lang/coq/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Coq Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/coq/packages.el b/dot_emacs.d/layers/+lang/coq/packages.el index 6aab372..c044e82 100644 --- a/dot_emacs.d/layers/+lang/coq/packages.el +++ b/dot_emacs.d/layers/+lang/coq/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- coq layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Jeremy Bi ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/crystal/config.el b/dot_emacs.d/layers/+lang/crystal/config.el index 8147f6c..2f3d649 100644 --- a/dot_emacs.d/layers/+lang/crystal/config.el +++ b/dot_emacs.d/layers/+lang/crystal/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Crystal Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brantou ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/crystal/funcs.el b/dot_emacs.d/layers/+lang/crystal/funcs.el index e9d0d35..cfd0552 100644 --- a/dot_emacs.d/layers/+lang/crystal/funcs.el +++ b/dot_emacs.d/layers/+lang/crystal/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Crystal Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brantou ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/crystal/packages.el b/dot_emacs.d/layers/+lang/crystal/packages.el index 88d21ae..1513e29 100644 --- a/dot_emacs.d/layers/+lang/crystal/packages.el +++ b/dot_emacs.d/layers/+lang/crystal/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Crystal Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brantou ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/csharp/config.el b/dot_emacs.d/layers/+lang/csharp/config.el index bb9dd08..172d99f 100644 --- a/dot_emacs.d/layers/+lang/csharp/config.el +++ b/dot_emacs.d/layers/+lang/csharp/config.el @@ -1,6 +1,6 @@ ;;; config.el --- C# Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/csharp/funcs.el b/dot_emacs.d/layers/+lang/csharp/funcs.el index cbe71f4..c76c248 100644 --- a/dot_emacs.d/layers/+lang/csharp/funcs.el +++ b/dot_emacs.d/layers/+lang/csharp/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- C# Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Muneeb Shaikh ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/csharp/layers.el b/dot_emacs.d/layers/+lang/csharp/layers.el index a61f90b..25fce23 100644 --- a/dot_emacs.d/layers/+lang/csharp/layers.el +++ b/dot_emacs.d/layers/+lang/csharp/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- C# Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/csharp/packages.el b/dot_emacs.d/layers/+lang/csharp/packages.el index 49e54d8..621d482 100644 --- a/dot_emacs.d/layers/+lang/csharp/packages.el +++ b/dot_emacs.d/layers/+lang/csharp/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- C# Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/csv/packages.el b/dot_emacs.d/layers/+lang/csv/packages.el index 4339ed4..36428fb 100644 --- a/dot_emacs.d/layers/+lang/csv/packages.el +++ b/dot_emacs.d/layers/+lang/csv/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- csharp Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: William Casarin ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/d/config.el b/dot_emacs.d/layers/+lang/d/config.el index 9a60bfc..2aa5fbc 100644 --- a/dot_emacs.d/layers/+lang/d/config.el +++ b/dot_emacs.d/layers/+lang/d/config.el @@ -1,6 +1,6 @@ ;;; config.el --- d Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/d/packages.el b/dot_emacs.d/layers/+lang/d/packages.el index d4c1950..97b1b4b 100644 --- a/dot_emacs.d/layers/+lang/d/packages.el +++ b/dot_emacs.d/layers/+lang/d/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- d Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/dart/config.el b/dot_emacs.d/layers/+lang/dart/config.el index 1db22ea..3dbe4f7 100644 --- a/dot_emacs.d/layers/+lang/dart/config.el +++ b/dot_emacs.d/layers/+lang/dart/config.el @@ -1,6 +1,6 @@ ;;; config.el --- dart Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bruno Tavares ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/dart/funcs.el b/dot_emacs.d/layers/+lang/dart/funcs.el index 4962db2..ae20cbc 100644 --- a/dot_emacs.d/layers/+lang/dart/funcs.el +++ b/dot_emacs.d/layers/+lang/dart/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Dart Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/dart/layers.el b/dot_emacs.d/layers/+lang/dart/layers.el index 3a7995a..ba24d20 100644 --- a/dot_emacs.d/layers/+lang/dart/layers.el +++ b/dot_emacs.d/layers/+lang/dart/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Dart Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/dart/packages.el b/dot_emacs.d/layers/+lang/dart/packages.el index 45b0734..20100b9 100644 --- a/dot_emacs.d/layers/+lang/dart/packages.el +++ b/dot_emacs.d/layers/+lang/dart/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- dart layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bruno Tavares ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/dhall/packages.el b/dot_emacs.d/layers/+lang/dhall/packages.el index befc9c9..0550155 100644 --- a/dot_emacs.d/layers/+lang/dhall/packages.el +++ b/dot_emacs.d/layers/+lang/dhall/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Dhall Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Colin Woodbury ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/elixir/config.el b/dot_emacs.d/layers/+lang/elixir/config.el index 7cd0c7a..e7d19b5 100644 --- a/dot_emacs.d/layers/+lang/elixir/config.el +++ b/dot_emacs.d/layers/+lang/elixir/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Elixir Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/elixir/funcs.el b/dot_emacs.d/layers/+lang/elixir/funcs.el index e114671..24ff885 100644 --- a/dot_emacs.d/layers/+lang/elixir/funcs.el +++ b/dot_emacs.d/layers/+lang/elixir/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Elixir Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/elixir/layers.el b/dot_emacs.d/layers/+lang/elixir/layers.el index b06ce8e..6b76958 100644 --- a/dot_emacs.d/layers/+lang/elixir/layers.el +++ b/dot_emacs.d/layers/+lang/elixir/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Elixir Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/emacs-lisp/README.org b/dot_emacs.d/layers/+lang/emacs-lisp/README.org index 4b581c4..d1b4ef1 100644 --- a/dot_emacs.d/layers/+lang/emacs-lisp/README.org +++ b/dot_emacs.d/layers/+lang/emacs-lisp/README.org @@ -229,21 +229,17 @@ mode line) | ~s~ | step | | ~i~ | step in | | ~o~ | step out | -| ~n~ | next | +| ~S~ | next | | ~f~ | forward-sexp | | ~H~ | goto here | | ~I~ | instrument callee | -| ~g o~ | go | -| ~g O~ | go nonstop | -| ~c~ | continue | +| ~c~ | go | | ~C~ | fast continue | | ~t~ | trace | | ~T~ | fast trace | | ~q~ | quit | | ~Q~ | quit nonstop | -| ~Q~ | quit nonstop | -| ~a~ | abort recursive edit | -| ~S~ | stop | +| ~a~ | stop | | ~b~ | set breakpoint | | ~u~ | unset breakpoint | | ~B~ | next breakpoint | @@ -251,34 +247,30 @@ mode line) | ~r~ | previous result | | ~e~ | evaluate expression | | ~C-x C-e~ | evaluate last sexp | -| ~W W~ | where | -| ~g ?~ | help | +| ~w~ | where | +| ~?~ | help | | ~d~ | backtrace | In =debugger-mode= (=Debugger= is displayed in major mode segment of the mode line) -| Key binding | Description | -|-------------+-------------------| -| ~~ | forward | -| ~S-~ | backward | -| ~RET~ | help follow | -| ~SPC~ | next | -| ~R~ | record expression | -| ~c~ | continue | -| ~d~ | step through | -| ~x~ | eval expression | -| ~E~ | eval expression | -| ~J~ | jump | -| ~g l~ | list functions | -| ~g b~ | frame | -| ~r~ | return value | -| ~u~ | frame clear | -| ~L~ | toggle locals | -| ~p~ | toggle locals | -| ~q~ | quit | -| ~Z Q~ | quit | -| ~Z Z~ | quit | +| Key binding | Description | +|-------------+--------------------------| +| ~~ | forward | +| ~S-~ | backward | +| ~RET~ | backtrace help follow | +| ~p~ | backtrace backward frame | +| ~c~ | continue | +| ~R~ | record expression | +| ~d~ | step through | +| ~e~ | eval expression | +| ~J~ | jump | +| ~L~ | list functions | +| ~b~ | frame | +| ~r~ | return value | +| ~u~ | frame clear | +| ~C-v~ | backtrace toggle locals | +| ~q~ | quit | ** Refactoring with emr diff --git a/dot_emacs.d/layers/+lang/emacs-lisp/config.el b/dot_emacs.d/layers/+lang/emacs-lisp/config.el index 57d9a0a..96ef11a 100644 --- a/dot_emacs.d/layers/+lang/emacs-lisp/config.el +++ b/dot_emacs.d/layers/+lang/emacs-lisp/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Emacs Lisp Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/emacs-lisp/funcs.el b/dot_emacs.d/layers/+lang/emacs-lisp/funcs.el index 543012f..388a548 100644 --- a/dot_emacs.d/layers/+lang/emacs-lisp/funcs.el +++ b/dot_emacs.d/layers/+lang/emacs-lisp/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Emacs Lisp functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/emacs-lisp/packages.el b/dot_emacs.d/layers/+lang/emacs-lisp/packages.el index f00cee0..1895892 100644 --- a/dot_emacs.d/layers/+lang/emacs-lisp/packages.el +++ b/dot_emacs.d/layers/+lang/emacs-lisp/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Emacs Lisp Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -117,7 +117,7 @@ :defer (spacemacs/defer) :init (progn - (spacemacs|require 'auto-compile) + (spacemacs|require-when-dumping 'auto-compile) (setq auto-compile-display-buffer nil ;; lets spaceline manage the mode-line auto-compile-use-mode-line nil @@ -135,7 +135,7 @@ :defer (spacemacs/defer) :init (progn - (spacemacs|require 'elisp-slime-nav) + (spacemacs|require-when-dumping 'elisp-slime-nav) (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode) (dolist (mode '(emacs-lisp-mode lisp-interaction-mode)) (spacemacs/declare-prefix-for-mode mode "mg" "find-symbol") @@ -194,38 +194,40 @@ "dm" 'spacemacs/macrostep-transient-state/body)))) (defun emacs-lisp/init-nameless () - (use-package nameless - :defer (spacemacs/defer) - :init - (progn - (spacemacs|require 'nameless) - (setq - ;; always show the separator since it can have a semantic purpose - ;; like in Spacemacs where - is variable and / is a function. - ;; moreover it makes nameless work for all kind of separators. - nameless-separator nil - ;; Use > as the defautl prefix : is already used for - ;; keywords - nameless-prefix ">") - ;; some default aliases for Spacemacs source code - (setq nameless-global-aliases '(("SB" . "spacemacs-buffer") - ("S" . "spacemacs") - (".S" . "dotspacemacs") - ("CL" . "configuration-layer"))) - ;; make `nameless-current-name' safe as a local variable for string values - (put 'nameless-current-name 'safe-local-variable #'stringp) - (spacemacs|diminish nameless-mode " 🅽" " [n]") - (spacemacs|add-toggle nameless - :status nameless-mode - :on (nameless-mode) - :off (nameless-mode -1) - :documentation "Hide package namespaces in your emacs-lisp code." - :evil-leader-for-mode (emacs-lisp-mode . "Tn")) - ;; activate nameless only when in a GUI - ;; in a terminal nameless triggers all sorts of graphical glitches. - (spacemacs|do-after-display-system-init - (when emacs-lisp-hide-namespace-prefix - (spacemacs/toggle-nameless-on-register-hook-emacs-lisp-mode)))))) + (use-package nameless + :defer (spacemacs/defer) + :init + (progn + (spacemacs|require-when-dumping 'nameless) + (setq + ;; always show the separator since it can have a semantic purpose + ;; like in Spacemacs where - is variable and / is a function. + ;; moreover it makes nameless work for all kind of separators. + nameless-separator nil + ;; Use > as the defautl prefix : is already used for + ;; keywords + nameless-prefix ">") + ;; some default aliases for Spacemacs source code + (setq nameless-global-aliases '(("SB" . "spacemacs-buffer") + ("S" . "spacemacs") + (".S" . "dotspacemacs") + ("CL" . "configuration-layer"))) + ;; make `nameless-current-name' safe as a local variable for string + ;; values + (put 'nameless-current-name 'safe-local-variable #'stringp) + (spacemacs|diminish nameless-mode " 🅽" " [n]") + (spacemacs|add-toggle nameless + :status nameless-mode + :on (nameless-mode) + :off (nameless-mode -1) + :documentation "Hide package namespaces in your emacs-lisp code." + :evil-leader-for-mode (emacs-lisp-mode . "Tn")) + ;; activate nameless only when in a GUI + ;; in a terminal nameless triggers all sorts of graphical glitches. + (spacemacs|unless-dumping-and-eval-after-loaded-dump nameless + (spacemacs|do-after-display-system-init + (when emacs-lisp-hide-namespace-prefix + (spacemacs/toggle-nameless-on-register-hook-emacs-lisp-mode))))))) (defun emacs-lisp/init-overseer () (use-package overseer diff --git a/dot_emacs.d/layers/+lang/erlang/config.el b/dot_emacs.d/layers/+lang/erlang/config.el index 9928c73..b3dd339 100644 --- a/dot_emacs.d/layers/+lang/erlang/config.el +++ b/dot_emacs.d/layers/+lang/erlang/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Erlang Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/erlang/packages.el b/dot_emacs.d/layers/+lang/erlang/packages.el index 6337cb8..10c3b69 100644 --- a/dot_emacs.d/layers/+lang/erlang/packages.el +++ b/dot_emacs.d/layers/+lang/erlang/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Erlang Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ess/config.el b/dot_emacs.d/layers/+lang/ess/config.el index 28e12f2..a9131b6 100644 --- a/dot_emacs.d/layers/+lang/ess/config.el +++ b/dot_emacs.d/layers/+lang/ess/config.el @@ -1,6 +1,6 @@ ;;; config.el --- ESS Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ess/funcs.el b/dot_emacs.d/layers/+lang/ess/funcs.el index 245eff7..81826c5 100644 --- a/dot_emacs.d/layers/+lang/ess/funcs.el +++ b/dot_emacs.d/layers/+lang/ess/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- ESS Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ess/layers.el b/dot_emacs.d/layers/+lang/ess/layers.el index dfa2456..ab6eafc 100644 --- a/dot_emacs.d/layers/+lang/ess/layers.el +++ b/dot_emacs.d/layers/+lang/ess/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- ESS Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ess/packages.el b/dot_emacs.d/layers/+lang/ess/packages.el index baf1d22..dcc1e81 100644 --- a/dot_emacs.d/layers/+lang/ess/packages.el +++ b/dot_emacs.d/layers/+lang/ess/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- ESS (R) Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/factor/config.el b/dot_emacs.d/layers/+lang/factor/config.el index 3b6628d..77f3e1c 100644 --- a/dot_emacs.d/layers/+lang/factor/config.el +++ b/dot_emacs.d/layers/+lang/factor/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Factor Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: timor ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/factor/funcs.el b/dot_emacs.d/layers/+lang/factor/funcs.el index 14c278e..4bdae81 100644 --- a/dot_emacs.d/layers/+lang/factor/funcs.el +++ b/dot_emacs.d/layers/+lang/factor/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Factor Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: timor ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/factor/packages.el b/dot_emacs.d/layers/+lang/factor/packages.el index 2daaa22..7b5bcdd 100644 --- a/dot_emacs.d/layers/+lang/factor/packages.el +++ b/dot_emacs.d/layers/+lang/factor/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Factor Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: timor ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/faust/config.el b/dot_emacs.d/layers/+lang/faust/config.el index 8589c35..ebc31b6 100644 --- a/dot_emacs.d/layers/+lang/faust/config.el +++ b/dot_emacs.d/layers/+lang/faust/config.el @@ -1,6 +1,6 @@ ;;; config.el --- faust Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bart Brouns ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/faust/funcs.el b/dot_emacs.d/layers/+lang/faust/funcs.el index daa9760..e416e0d 100644 --- a/dot_emacs.d/layers/+lang/faust/funcs.el +++ b/dot_emacs.d/layers/+lang/faust/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el -- Faust Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/faust/packages.el b/dot_emacs.d/layers/+lang/faust/packages.el index 862efff..1f0bdb0 100644 --- a/dot_emacs.d/layers/+lang/faust/packages.el +++ b/dot_emacs.d/layers/+lang/faust/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- faust layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bart Brouns ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/forth/packages.el b/dot_emacs.d/layers/+lang/forth/packages.el index 9e5710c..1bd53b8 100644 --- a/dot_emacs.d/layers/+lang/forth/packages.el +++ b/dot_emacs.d/layers/+lang/forth/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- forth layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Tim Jaeger ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/fsharp/README.org b/dot_emacs.d/layers/+lang/fsharp/README.org index 67aff84..ee3dcf2 100644 --- a/dot_emacs.d/layers/+lang/fsharp/README.org +++ b/dot_emacs.d/layers/+lang/fsharp/README.org @@ -16,7 +16,7 @@ This layer adds support for F# language using [[https://github.com/fsharp/fsharp ** Features: - Syntax highlighting -- Code completion +- Code completion (through Eglot) - Flycheck integration - REPL - Compile/Run/Interpreter and info tooltip shortcuts @@ -33,6 +33,7 @@ file. | ~SPC m c c~ | Build the project | | ~SPC m g g~ | Go to definition at point | | ~SPC m h t~ | Show tooltip help at point | +| ~SPC m e j~ | Start Eglot | ** REPL diff --git a/dot_emacs.d/layers/+lang/fsharp/config.el b/dot_emacs.d/layers/+lang/fsharp/config.el index 676f3aa..7293292 100644 --- a/dot_emacs.d/layers/+lang/fsharp/config.el +++ b/dot_emacs.d/layers/+lang/fsharp/config.el @@ -1,6 +1,6 @@ ;;; config.el --- fsharp Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/fsharp/packages.el b/dot_emacs.d/layers/+lang/fsharp/packages.el index 76cd4d9..367e450 100644 --- a/dot_emacs.d/layers/+lang/fsharp/packages.el +++ b/dot_emacs.d/layers/+lang/fsharp/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- F# Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -22,6 +22,7 @@ :defer t :init (progn + (require 'eglot-fsharp) (setq fsharp-doc-idle-delay .2) (spacemacs/register-repl 'fsharp-mode 'fsharp-show-subshell "F#")) :config @@ -51,6 +52,11 @@ (switch-to-buffer-other-window inferior-fsharp-buffer-name) (evil-insert-state)) + (defun spacemacs/fsharp-eglot-jack-in () + "Start a new Eglot server instance or reconnect." + (interactive) + (call-interactively 'eglot)) + (spacemacs/declare-prefix-for-mode 'fsharp-mode "mf" "find") (spacemacs/declare-prefix-for-mode 'fsharp-mode "ms" "interpreter") (spacemacs/declare-prefix-for-mode 'fsharp-mode "mx" "executable") @@ -62,6 +68,8 @@ ;; Compile "cc" 'compile + "ej" 'spacemacs/fsharp-eglot-jack-in + "fa" 'fsharp-find-alternate-file "ht" 'fsharp-ac/show-tooltip-at-point diff --git a/dot_emacs.d/layers/+lang/go/README.org b/dot_emacs.d/layers/+lang/go/README.org index 9e7d979..9fec3da 100644 --- a/dot_emacs.d/layers/+lang/go/README.org +++ b/dot_emacs.d/layers/+lang/go/README.org @@ -10,7 +10,11 @@ - [[#install][Install]] - [[#layer][Layer]] - [[#choosing-a-backend][Choosing a backend]] - - [[#pre-requisites][Pre-requisites]] + - [[#lsp-gopls][LSP (gopls)]] + - [[#debugger][Debugger]] + - [[#go-mode-deprecated][go-mode (deprecated)]] + - [[#documentation-lookup-binary][Documentation lookup binary]] + - [[#binary-dependencies][Binary dependencies]] - [[#configuration][Configuration]] - [[#execution][Execution]] - [[#indentation][Indentation]] @@ -19,10 +23,7 @@ - [[#tests][Tests]] - [[#coverage][Coverage]] - [[#guru][Guru]] - - [[#auto-completion][Auto-completion]] - - [[#lsp-backend][LSP backend]] - - [[#debugger][Debugger]] -- [[#working-with-go][Working with Go]] +- [[#key-bindings][Key bindings]] - [[#go-commands-start-with-m][Go commands (start with =m=):]] - [[#go-guru][Go Guru]] - [[#refactoring][Refactoring]] @@ -32,17 +33,17 @@ This layer adds extensive support for the [[https://golang.org][Go]] programming ** Features: - Run [[https://golang.org/cmd/gofmt/][gofmt]] / [[https://godoc.org/golang.org/x/tools/cmd/goimports][goimports]] on file save (see [[#autoformat][Autoformat]]) -- Auto-completion using [[https://github.com/nsf/gocode/tree/master/emacs][go-autocomplete.el]], via the =auto-completion= layer (see [[#auto-completion][Auto-completion]]) +- Auto-completion - Source analysis using [[https://docs.google.com/document/d/1_Y9xCEMj5S-7rv2ooHpZNH15JgRT5iM742gJkw5LtmQ][go-guru]] (see [[#guru][Guru]]) -- Refactoring with [[http://gorefactor.org/][godoctor]] +- Refactoring with [[https://github.com/godoctor/godoctor][godoctor]] - Edit struct field tags with [[https://github.com/fatih/gomodifytags][gomodifytags]] -- Linting with flycheck's built-in checkers or [[https://github.com/golangci/golangci-lint][golangci-lint]] (see [[#linting][Linting]]) +- Syntax checking with flycheck's built-in checkers or [[https://github.com/golangci/golangci-lint][golangci-lint]] (see [[#linting][Linting]]) - Test generation via [[https://github.com/s-kostyaev/go-gen-test][go-gen-test]] (see [[#tests][Tests]]) - Coverage profile visualization (see [[#coverage][Coverage]]) - List packages faster with [[https://github.com/haya14busa/gopkgs][gopkgs]] - Fill a structure with default values using the [[https://github.com/davidrjenni/reftools/tree/master/cmd/fillstruct][fillstruct]] -- LSP backend (see [[#lsp-backend][LSP backend]]) -- Interactive debugger using [[https://github.com/emacs-lsp/dap-mode][dap-mode]] +- Gopls backend support (see [[#lsp-gopls][LSP backend]]) +- Interactive debugger with LSP using [[https://github.com/emacs-lsp/dap-mode][dap-mode]] * Install ** Layer @@ -50,34 +51,95 @@ To use this configuration layer, add it to your =~/.spacemacs=. You will need to add =go= to the existing =dotspacemacs-configuration-layers= list in this file. ** Choosing a backend -To choose a default backend set the layer variable =go-backend=: +Basically you have to choose between multiple language backends. +This choice defines mainly which kind of IDE features spacemacs +can deliver. + +Alternatively if non is set the =lsp= backend will be automatically +chosen if the layer =lsp= is used otherwise =go-mode= will be used. + +For best results, make sure that the =auto-completion= and =syntax-checking= +layers are enabled as well. + +*** LSP (gopls) +This is the official IDE configuration for the current go versions. +It includes auto-completion and syntax checking support. + +It is based on an external development server written in go itself, +which must be installed separately before this layer can be used. + +Starting and stopping the server is done by emacs so you normally +won't notice it happen. + +Detailed bindings and configuration can be found in [[https://github.com/syl20bnr/spacemacs/tree/develop/layers/%2Btools/lsp#key-bindings][lsp layer description]]. + +To choose this backend set the layer variable =go-backend=: + +#+BEGIN_SRC elisp + (go :variables go-backend 'lsp) +#+END_SRC + +You also need to install gopls as the language server implementation +and add it to your =PATH=. If your go environment is properly +prepared you can simply run below command to install: + +#+BEGIN_SRC sh + GO111MODULE=on go get -v golang.org/x/tools/gopls@latest +#+END_SRC + +**** Debugger +Using the =dap= layer you'll get access to a graphical debugger integration. +To do so add the layer =dap= to your dotfile. For a complete list of key bindings +see the [[https://github.com/syl20bnr/spacemacs/tree/develop/layers/%2Btools/dap#key-bindings][dap layer description]]. + +*** go-mode (deprecated) +This was the old elisp based go backend. Since the introduction of +=go-modules= this has stopped working and will not be patched. + +To choose it nevertheless set the layer variable =go-backend=: #+BEGIN_SRC elisp (go :variables go-backend 'go-mode) #+END_SRC -Alternatively the =lsp= backend will be automatically chosen if the layer =lsp= -is used and you did not specify any value for =go-backend=. - -Backend can be chosen on a per project basis using directory local variables -(files named =.dir-locals.el= at the root of a project), an example to use the -=lsp= backend: - -#+BEGIN_SRC elisp - ;;; Directory Local Variables - ;;; For more information see (info "(emacs) Directory Variables") - - ((go-mode (go-backend . lsp))) -#+END_SRC - -*Note:* you can easily add a directory local variable with ~SPC f v d~. - -** Pre-requisites -You will need =gocode=, =gogetdoc=, =godef=, =godoctor= and many others -to get all the goodies of this layer: +You will also need the following dependencies for auto-completion: + +#+BEGIN_SRC sh + go get -u -v github.com/mdempsky/gocode + go get -u -v github.com/zmb3/gogetdoc +#+END_SRC + +**** Documentation lookup binary +For auto-completion there are actually two choices. First there is the classic +=gocode=. This has been around for quite a long time now, however =gocode= has many +shortcomings, like not being able to show documentation for built-in objects or +being fully dependent on installed binary files to provide its suggestions. + +A more modern and complete solution is provided by =gogetdoc=, which is able to +precisely detect all documentations in your go projects independently from where +they have been added. This is also the recommended choice from =go-mode.el=. + +To choose =gocode= nothing more needs to be done. To use =gogetdoc= you need to set +the layer variable: + +#+BEGIN_SRC emacs-lisp + (go :variables godoc-at-point-function 'godoc-gogetdoc) +#+END_SRC + +If you choose to use =gocode= there are some suggestions to improve its results. +As =gocode= uses the output from installed binary files to provide its suggestions. +You have a few options to ensure you always get up to date suggestions: +- Run =go install ./...= in your package directory when you make a file change. +- Run =gocode set autobuild true= to have gocode attempt to run =go install ./...= + for you. +- You can configure your task runner to run the =go install ./...= command on every + file change. + +** Binary dependencies +This section lists dependencies which are independent of the +language backend, most are installed directly via =go get=: #+BEGIN_SRC sh - GO111MODULE=on go get -v golang.org/x/tools/gopls@latest GO111MODULE=on CGO_ENABLED=0 go get -v -trimpath -ldflags '-s -w' github.com/golangci/golangci-lint/cmd/golangci-lint go get -u -v golang.org/x/tools/cmd/godoc go get -u -v golang.org/x/tools/cmd/goimports @@ -89,19 +151,9 @@ to get all the goodies of this layer: go get -u -v github.com/godoctor/godoctor go get -u -v github.com/haya14busa/gopkgs/cmd/gopkgs go get -u -v github.com/josharian/impl - go get -u -v github.com/mdempsky/gocode go get -u -v github.com/rogpeppe/godef - go get -u -v github.com/zmb3/gogetdoc #+END_SRC -Make sure that the executables are in your search =$PATH=. Note that they are -installed on =$(go env GOPATH)/bin=, or =$GOBIN= if that environment variable is -defined. For information about setting up =$PATH=, check out the corresponding -section in the FAQ (~SPC h f $PATH RET~). - -For best results, make sure that the =auto-completion= and =syntax-checking= -layers are enabled as well. - * Configuration ** Execution By default, the go run command is =go run=. If you want to use a different @@ -207,59 +259,7 @@ will need to set the scope with ~SPC m f o~. The scope is a comma separated set of packages, and Go's recursive operator is supported. In addition, you can prefix it with =-= to exclude a package from searching. -** Auto-completion -For auto-completion there are actually two choices. First there is the classic -=gocode=. This has been around for quite a long time now, however =gocode= has many -shortcomings, like not being able to show documentation for built-in objects or -being fully dependent on installed binary files to provide its suggestions. - -A more modern and complete solution is provided by =gogetdoc=, which is able to -precisely detect all documentations in your go projects independently from where -they have been added. This is also the recommended choice from =go-mode.el=. - -To choose =gocode= nothing more needs to be done. To use =gogetdoc= you need to set -the layer variable: - -#+BEGIN_SRC emacs-lisp - (go :variables godoc-at-point-function 'godoc-gogetdoc) -#+END_SRC - -If you choose to use =gocode= there are some suggestions to improve its results. -As =gocode= uses the output from installed binary files to provide its suggestions. -You have a few options to ensure you always get up to date suggestions: -- Run =go install ./...= in your package directory when you make a file change. -- Run =gocode set autobuild true= to have gocode attempt to run =go install ./...= - for you. -- You can configure your task runner to run the =go install ./...= command on every - file change. - -** LSP backend -To enable the LSP backend, ensure that the =lsp= layer is enabled, and set the -layer variable =go-backend=: - -#+BEGIN_SRC elisp - (go :variables go-backend 'lsp) -#+END_SRC - -You can check [[https://www.github.com/emacs-lsp/lsp-mode/][lsp-mode]] for the gory details. - -The backend can be chosen on a per project basis using directory local variables -(files named =.dir-locals.el= at the root of a project), an example is to use the -=go-mode= backend: - -#+BEGIN_SRC elisp - ;;; Directory Local Variables - ;;; For more information see (info "(emacs) Directory Variables") - - ((go-mode (go-backend . go-mode))) -#+END_SRC - -*Note:* you can easily add a directory local variable with ~SPC f v d~. - -*** Debugger -Using the =dap= layer you'll get access to all the DAP key bindings, see the complete list of key bindings on the [[https://github.com/syl20bnr/spacemacs/tree/develop/layers/%2Btools/dap#key-bindings][dap layer description]]. - -* Working with Go +* Key bindings ** Go commands (start with =m=): | Key binding | Description | diff --git a/dot_emacs.d/layers/+lang/go/config.el b/dot_emacs.d/layers/+lang/go/config.el index 1502aad..9f1c8a4 100644 --- a/dot_emacs.d/layers/+lang/go/config.el +++ b/dot_emacs.d/layers/+lang/go/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Go Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/go/funcs.el b/dot_emacs.d/layers/+lang/go/funcs.el index 1974f42..37e86d8 100644 --- a/dot_emacs.d/layers/+lang/go/funcs.el +++ b/dot_emacs.d/layers/+lang/go/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Go Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -25,31 +25,27 @@ (defun spacemacs//go-setup-company () "Conditionally setup go company based on backend" (pcase (spacemacs//go-backend) - ('go-mode (spacemacs//go-setup-company-go)))) + ('go-mode (spacemacs|add-company-backends + :backends company-go + :modes go-mode + :variables company-go-show-annotation t + :append-hooks nil + :call-hooks t)) + (`lsp (spacemacs|add-company-backends + :backends company-capf + :modes go-mode)))) (defun spacemacs//go-setup-eldoc () "Conditionally setup go eldoc based on backend" (pcase (spacemacs//go-backend) ('go-mode (go-eldoc-setup)))) - (defun spacemacs//go-setup-dap () "Conditionally setup go DAP integration." ;; currently DAP is only available using LSP (pcase (spacemacs//go-backend) - (`lsp (spacemacs//go-setup-lsp-dap)))) - - -;; go-mode - -(defun spacemacs//go-setup-company-go () - (spacemacs|add-company-backends - :backends company-go - :modes go-mode - :variables company-go-show-annotation t - :append-hooks nil - :call-hooks t) - (company-mode)) + (`lsp (require 'dap-go) + (dap-go-setup)))) ;; lsp @@ -58,25 +54,14 @@ "Setup lsp backend" (if (configuration-layer/layer-used-p 'lsp) (progn - ;; without setting lsp-diagnostic-package to :none + ;; without setting lsp-diagnostics-provider to :none ;; golangci-lint errors won't be reported (when go-use-golangci-lint - (message "[go] Setting lsp-diagnostic-package :none to enable golangci-lint support.") - (setq-local lsp-diagnostic-provider :none)) + (message "[go] Setting lsp-diagnostics-provider :none to enable golangci-lint support.") + (setq-local lsp-diagnostics-provider :none)) (lsp)) (message "`lsp' layer is not installed, please add `lsp' layer to your dotfile."))) -(defun spacemacs//go-setup-dap () - "Conditionally setup go DAP integration." - ;; currently DAP is only available using LSP - (pcase (spacemacs//go-backend) - (`lsp (spacemacs//go-setup-lsp-dap)))) - -(defun spacemacs//go-setup-lsp-dap () - "Setup DAP integration." - (require 'dap-go) - (dap-go-setup)) - ;; flycheck diff --git a/dot_emacs.d/layers/+lang/go/layers.el b/dot_emacs.d/layers/+lang/go/layers.el index e520606..2ff4aa2 100644 --- a/dot_emacs.d/layers/+lang/go/layers.el +++ b/dot_emacs.d/layers/+lang/go/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Go Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/go/packages.el b/dot_emacs.d/layers/+lang/go/packages.el index 3b74c2f..9ba3dfb 100644 --- a/dot_emacs.d/layers/+lang/go/packages.el +++ b/dot_emacs.d/layers/+lang/go/packages.el @@ -18,8 +18,7 @@ eldoc flycheck (flycheck-golangci-lint :toggle (and go-use-golangci-lint - (configuration-layer/package-used-p - 'flycheck))) + (configuration-layer/package-used-p 'flycheck))) ggtags helm-gtags go-eldoc diff --git a/dot_emacs.d/layers/+lang/gpu/packages.el b/dot_emacs.d/layers/+lang/gpu/packages.el index 2f23adc..b115b87 100644 --- a/dot_emacs.d/layers/+lang/gpu/packages.el +++ b/dot_emacs.d/layers/+lang/gpu/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- GPU layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Evan Klitzke ;; URL: https://github.com/eklitzke diff --git a/dot_emacs.d/layers/+lang/graphviz/packages.el b/dot_emacs.d/layers/+lang/graphviz/packages.el index 9d7d505..90fc7d6 100644 --- a/dot_emacs.d/layers/+lang/graphviz/packages.el +++ b/dot_emacs.d/layers/+lang/graphviz/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- graphviz layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: luxbock ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/haskell/README.org b/dot_emacs.d/layers/+lang/haskell/README.org index c55129f..58c8654 100644 --- a/dot_emacs.d/layers/+lang/haskell/README.org +++ b/dot_emacs.d/layers/+lang/haskell/README.org @@ -7,13 +7,17 @@ * Table of Contents :TOC_5_gh:noexport: - [[#description][Description]] - [[#features][Features:]] +- [[#quick-start-and-how-to-use-this-readme][Quick start (and how to use this README)]] - [[#install][Install]] - [[#layer][Layer]] - [[#dependencies][Dependencies]] - [[#setup-path][Setup PATH]] +- [[#configuration][Configuration]] - [[#choosing-a-backend][Choosing a backend]] - [[#dante][=dante=]] - [[#lsp][=lsp=]] + - [[#hie][=hie=]] + - [[#hls][=hls=]] - [[#optional-extras][Optional extras]] - [[#structured-haskell-mode][structured-haskell-mode]] - [[#hindent][hindent]] @@ -28,10 +32,8 @@ - [[#syntax-checking][Syntax checking]] - [[#flycheck][Flycheck]] - [[#hlint][HLint]] - - [[#interactive-haskell-mode][Interactive haskell-mode]] - - [[#flymake][Flymake]] - - [[#troubleshooting][Troubleshooting]] - [[#faq][FAQ]] + - [[#dante-reports-missinghidden-imports-for-test-files][Dante reports missing/hidden imports for test files]] - [[#the-repl-doesnt-work][The REPL doesn't work]] - [[#the-repl-is-stuck][The REPL is stuck]] - [[#indentation-doesnt-reset-when-pressing-return-after-an-empty-line][Indentation doesn't reset when pressing return after an empty line]] @@ -48,10 +50,20 @@ This layer adds support for the [[https://www.haskell.org/][Haskell]] language. ** Features: -- syntax highlighting for [[https://github.com/haskell/haskell-mode][haskell source]], [[https://github.com/haskell/haskell-mode][cabal files]], [[https://github.com/bgamari/cmm-mode][C-- source]], -- auto-completion with one of the selected backends (=dante= or =lsp=). +- syntax highlighting for [[https://github.com/haskell/haskell-mode][haskell source]], [[https://github.com/haskell/haskell-mode][cabal files]], [[https://github.com/bgamari/cmm-mode][C-- source]] +- auto-completion and syntax-checking with one of the selected backends (=dante= or =lsp=). -*This layer is under construction, it needs your contributions and bug reports.* +* Quick start (and how to use this README) +- Follow instructions in *Install* section to correctly install the layer. +- Ensure that you have =auto-completion= and =syntax-checking= layers enabled. +- Set backend to =dante= (check *Configuration* section for details). =dante= is default already, but if =lsp= layer is enabled, you will have to set it explicitly. +- You are ready to go! Open any Haskell project and enjoy syntax-checking, auto-completion and more. + +After that, check the rest of the README to: +- Learn about more powerful (but more complicated to set up) backend: =lsp= with =hie= / =hls=: Check *Configuration* -> *lsp*. +- Learn about all the functionalities and key bindings: Check *Key bindings* and *Configuration* -> *Optional extras*. +- Learn about the details of how syntax-checking works and how it can be tweaked: Check *Syntax checking*. +- Find solutions to common problems in FAQ: Check *FAQ*. * Install ** Layer @@ -85,13 +97,16 @@ packages. If you are using =cabal= it should be =~/.cabal/bin= or =~/Library/Haskell/bin= (for 'Haskell for Mac' users). If you are using =stack= then it should be =~/.local/bin=. -For information about setting up =$PATH=, check out the corresponding section in +For more information about setting up =$PATH=, check out the corresponding section in the FAQ (~SPC h SPC $PATH RET~). +* Configuration ** Choosing a backend -First, ensure that you have =auto-completion= layer enabled. +Language backend is the core component of a language layer - it has the responsibility of compiling/parsing the actual code and reporting errors, warnings, suggesting fixes, auto-completions and more. -To choose a haskell backend, set the haskell layer variable =haskell-completion-backend=: +To get the most out of the language backend, you will want to ensure that you have =auto-completion= and =syntax-checking= layers enabled. + +Then, to choose a haskell backend, set the haskell layer variable =haskell-completion-backend=: #+BEGIN_SRC emacs-lisp (haskell :variables haskell-completion-backend 'dante) @@ -99,7 +114,7 @@ To choose a haskell backend, set the haskell layer variable =haskell-completion- Supported values for =haskell-completion-backend= are =dante= and =lsp=. -If you haven't specified any value for =haskell-completion-backend=, +If you don't specify any value for =haskell-completion-backend=, =dante= will be used as default backend, unless the layer =lsp= is enabled, in which case =lsp= is used as default backend. @@ -116,28 +131,48 @@ Backend can be chosen on a per project basis using directory local variables *Note:* you can easily add a directory local variable with ~SPC f v d~. +There are two backends available: =dante= and =lsp=. + +=dante= is lightweight, requires no setup and works out of the box in most cases, which is why it is also a default backend. + +=lsp= (=hie= or =hls=) is a more ambitious, heavy-weight, cutting-edge backend that is however still somewhat rough on the edges and requires some additional setup. + *** =dante= -[[https://github.com/jyp/dante][Dante]] is a fork of Intero mode which aims exclusively at providing a convenient frontend to GHCi. +[[https://github.com/jyp/dante][Dante]] is a lightweight backend which delegates most of its work directly to GHCi. It brings features like syntax checking, auto completion, hlint suggestions, automatic error fixing, info at point, definition and use sites. =dante= works for =cabal=, =nix=, =sytx=, and =stack= users and requires no additional setup. -=dante= requires Emacs 25. - *** =lsp= -=lsp= requires an appropriate installation of =hie=, the official Haskell language server, to work properly. +[[https://microsoft.github.io/language-server-protocol][Language Server Protocol]] is a standard for implementing language backends. + +In Haskell layer, you can use a backend that implements Language Server Protocol for Haskell by specifying =lsp= as backend +and then installing concrete backend implementation, of which there are two available at the moment: =hie= and =hls=. + +Enabling the =lsp= backend requires the =lsp= layer to be enabled, and provides access to +all the additional =lsp-mode= key bindings. + +**** =hie= +[[https://github.com/haskell/haskell-ide-engine][Haskell Ide Engine]] (=hie=) aims to be the universal interface to a growing number of Haskell tools, +providing a fully-featured Language Server Protocol server for editors and IDEs that require Haskell-specific functionality. + +This is where most of the Haskell community effort is (was - check =hls=) being focused regarding building Haskell IDE / language backend. + =hie= is best installed by building it locally as it requires that the same GHC version has been used to compile your code as has been used for =hie=. To install it please refer to the official installation instructions [[https://github.com/haskell/haskell-ide-engine#installation][here]]. -Enabling the =lsp= backend requires the =lsp= layer to be enabled, and provides access to -all the additional =lsp-mode= key bindings. As such it is more of a full backend than just -a completion backend. +NOTE: =hie= is being superseded by =hls=, which is still in early development though. -Alternatively, you can use [[https://github.com/haskell/haskell-language-server][Haskell Language Server]] instead of =hie= (check their docs for installation details). -Haskell Language Server is meant to completely replace =hie= but it is still in early stages of development. +**** =hls= +[[https://github.com/haskell/haskell-language-server][Haskell Language Server]] (=hls=) is integration point for ghcide and =hie=. One IDE to rule them all. + +=hls= is meant to supersede =hie= and is therefore the cutting-edge and most ambitious implementation of Haskell language backend. +However, it is still in early stages of development. + +Check their docs for installation details and how to use it with emacs/spacemacs. ** Optional extras The Haskell layer supports some extra features, which can be enabled through the @@ -280,13 +315,13 @@ Refactor commands are prefixed by ~SPC m r~: Only some of the HLint suggestions can be applied. * Syntax checking -At the moment there are three components, which can indicate +There are multiple components that can indicate errors and warnings in the code. Those components are: - dante (via flycheck) - hlint (via flycheck) -- haskell-mode interactive +- lsp (via lsp-ui) -Since all of these components can be active at the same time, it can be tricky to +Since some of these components can be active at the same time, it can be tricky to know which component is displaying which message, especially when they disagree, or if one isn't working. Only flycheck errors (from ghci and hlint) are displayed in the error list and can be navigated between, using the standard Spacemacs key @@ -307,24 +342,15 @@ if it doesn't work, then you can change it with ~SPC e s~. the file) but bad coding style and code smell. The HLint checker is called *after* the flycheck GHC checker. -HLint can be configured via .hlint.yaml. - -** Interactive haskell-mode -Finally, interactive haskell-mode (~SPC m s b~) also displays errors. These -errors can be navigated to, from the interactive buffer (by clicking on the -error) or using =haskell-goto-next-error= (~M-n~) and =haskell-goto-prev-error= -(~M-p~). - -** Flymake -An alternative to syntax checking is to build your projects with -=flymake-compile=. It doesn't highlight errors in the buffer, but it's more -reliable. The error navigation is similar to interactive haskell-mode. - -** Troubleshooting -Flycheck can fail silently for miscellaneous reasons. See the [[#faq][FAQ]] -for troubleshooting. +HLint can be configured per project via .hlint.yaml (check Hlint docs for more details). * FAQ +** Dante reports missing/hidden imports for test files +The cause might be that Dante is not loading appropriate packages for the test suite target, instead it is loading packages for the library. + +Solution is to create =.dir-local.el= in the directory where the test suite (usually =test/= or =tests/=) is and to put the line =((haskell-mode . ((dante-target . "--test"))))= into it. +This tells Dante to use test suite target when working with test files. + ** The REPL doesn't work Usually =haskell-mode= is great at figuring out which interactive process to bring up. But if you are experiencing problems with it, then you can help diff --git a/dot_emacs.d/layers/+lang/haskell/config.el b/dot_emacs.d/layers/+lang/haskell/config.el index 0b51193..15eb394 100644 --- a/dot_emacs.d/layers/+lang/haskell/config.el +++ b/dot_emacs.d/layers/+lang/haskell/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Haskell Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bjarke Vad Andersen ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/haskell/funcs.el b/dot_emacs.d/layers/+lang/haskell/funcs.el index 57a5090..727d2b9 100644 --- a/dot_emacs.d/layers/+lang/haskell/funcs.el +++ b/dot_emacs.d/layers/+lang/haskell/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Haskell Layer funcs File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/haskell/layers.el b/dot_emacs.d/layers/+lang/haskell/layers.el index 70e8b7e..2e77bed 100644 --- a/dot_emacs.d/layers/+lang/haskell/layers.el +++ b/dot_emacs.d/layers/+lang/haskell/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Haskell Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/haskell/packages.el b/dot_emacs.d/layers/+lang/haskell/packages.el index 4eb6ad0..c6a694e 100644 --- a/dot_emacs.d/layers/+lang/haskell/packages.el +++ b/dot_emacs.d/layers/+lang/haskell/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Haskell Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -44,6 +44,8 @@ (defun haskell/post-init-company () (add-hook 'haskell-mode-local-vars-hook #'spacemacs-haskell//setup-company) + (add-hook 'haskell-literate-mode-local-vars-hook #'spacemacs-haskell//setup-company) + ;; renamed as of 04/2020, delete in due course (add-hook 'literate-haskell-mode-local-vars-hook #'spacemacs-haskell//setup-company)) (defun haskell/init-company-cabal () @@ -94,6 +96,8 @@ (defun haskell/post-init-ggtags () (add-hook 'haskell-mode-local-vars-hook #'spacemacs/ggtags-mode-enable) + (add-hook 'haskell-literate-mode-local-vars-hook #'spacemacs/ggtags-mode-enable) + ;; renamed as of 04/2020, delete in due course (add-hook 'literate-haskell-mode-local-vars-hook #'spacemacs/ggtags-mode-enable)) (defun haskell/init-haskell-mode () @@ -102,6 +106,8 @@ :init (progn (add-hook 'haskell-mode-local-vars-hook #'spacemacs-haskell//setup-backend) + (add-hook 'haskell-literate-mode-local-vars-hook #'spacemacs-haskell//setup-backend) + ;; renamed as of 04/2020, delete in due course (add-hook 'literate-haskell-mode-local-vars-hook #'spacemacs-haskell//setup-backend) (defun spacemacs//force-haskell-mode-loading () @@ -299,7 +305,7 @@ (spacemacs/helm-gtags-define-keys-for-mode 'haskell-mode)) -;; doesn't support literate-haskell-mode :( +;; doesn't support haskell-literate-mode :( (defun haskell/init-hindent () (use-package hindent :defer t diff --git a/dot_emacs.d/layers/+lang/html/README.org b/dot_emacs.d/layers/+lang/html/README.org index 83c3ccd..d159e44 100644 --- a/dot_emacs.d/layers/+lang/html/README.org +++ b/dot_emacs.d/layers/+lang/html/README.org @@ -124,6 +124,7 @@ For more information visit the [[https://github.com/skeeto/impatient-mode/blob/m | ~SPC m r w~ | wrap current element | | ~SPC m z~ | fold/unfold current element | | ~%~ | evil-matchit key binding to jump to closing tag | +| ~C-return~ | emmet-expand snippet | A transient-state is also defined, start it with ~SPC m .~ or ~, .~ diff --git a/dot_emacs.d/layers/+lang/html/config.el b/dot_emacs.d/layers/+lang/html/config.el index 560dcbb..8d6baa2 100644 --- a/dot_emacs.d/layers/+lang/html/config.el +++ b/dot_emacs.d/layers/+lang/html/config.el @@ -1,6 +1,6 @@ ;;; config.el --- html layer configuration file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/html/funcs.el b/dot_emacs.d/layers/+lang/html/funcs.el index 44f73f6..609b3bd 100644 --- a/dot_emacs.d/layers/+lang/html/funcs.el +++ b/dot_emacs.d/layers/+lang/html/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- HTML Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/html/layers.el b/dot_emacs.d/layers/+lang/html/layers.el index a66275b..30f4580 100644 --- a/dot_emacs.d/layers/+lang/html/layers.el +++ b/dot_emacs.d/layers/+lang/html/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- HTML Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/html/packages.el b/dot_emacs.d/layers/+lang/html/packages.el index 710525d..706f629 100644 --- a/dot_emacs.d/layers/+lang/html/packages.el +++ b/dot_emacs.d/layers/+lang/html/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- HTML Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -100,10 +100,7 @@ web-mode-hook)) :config (progn - (evil-define-key 'insert emmet-mode-keymap (kbd "TAB") 'spacemacs/emmet-expand) - (evil-define-key 'insert emmet-mode-keymap (kbd "") 'spacemacs/emmet-expand) - (evil-define-key 'hybrid emmet-mode-keymap (kbd "TAB") 'spacemacs/emmet-expand) - (evil-define-key 'hybrid emmet-mode-keymap (kbd "") 'spacemacs/emmet-expand) + (define-key emmet-mode-keymap (kbd "") 'spacemacs/emmet-expand) (spacemacs|hide-lighter emmet-mode)))) (defun html/post-init-evil-matchit () diff --git a/dot_emacs.d/layers/+lang/hy/funcs.el b/dot_emacs.d/layers/+lang/hy/funcs.el index 0c11c0a..51ca73c 100644 --- a/dot_emacs.d/layers/+lang/hy/funcs.el +++ b/dot_emacs.d/layers/+lang/hy/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Hy Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Muneeb Shaikh ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/hy/layers.el b/dot_emacs.d/layers/+lang/hy/layers.el index 093064f..879b15b 100644 --- a/dot_emacs.d/layers/+lang/hy/layers.el +++ b/dot_emacs.d/layers/+lang/hy/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Hy Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/hy/packages.el b/dot_emacs.d/layers/+lang/hy/packages.el index ab0c427..1cc1e32 100644 --- a/dot_emacs.d/layers/+lang/hy/packages.el +++ b/dot_emacs.d/layers/+lang/hy/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Hy Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/idris/README.org b/dot_emacs.d/layers/+lang/idris/README.org index fce68d9..14002c7 100644 --- a/dot_emacs.d/layers/+lang/idris/README.org +++ b/dot_emacs.d/layers/+lang/idris/README.org @@ -41,7 +41,7 @@ Idris can be installed using =Haskell's cabal=: #+END_SRC Binaries are also available for some platforms at -[[https://www.idris-lang.org/download/]] +[[https://www.idris-lang.org/pages/download.html]] * Key bindings ** Shorthands diff --git a/dot_emacs.d/layers/+lang/idris/packages.el b/dot_emacs.d/layers/+lang/idris/packages.el index 662db79..934aa6a 100644 --- a/dot_emacs.d/layers/+lang/idris/packages.el +++ b/dot_emacs.d/layers/+lang/idris/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Idris Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Timothy Jones ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/java/README.org b/dot_emacs.d/layers/+lang/java/README.org index c0fd556..0bf02b5 100644 --- a/dot_emacs.d/layers/+lang/java/README.org +++ b/dot_emacs.d/layers/+lang/java/README.org @@ -78,7 +78,7 @@ It integrates with =company= and =flycheck=. In addition it also provides full graphical debugging support via =DAP mode=. LSP is the default backend used by this layer, see [[#choosing-a-backend][Choosing a backend]] in -order to lean how to select a different backend. +order to learn how to select a different backend. *** Installation The lsp server will be installed automatically whenever a Java file diff --git a/dot_emacs.d/layers/+lang/java/config.el b/dot_emacs.d/layers/+lang/java/config.el index adae847..df83b11 100644 --- a/dot_emacs.d/layers/+lang/java/config.el +++ b/dot_emacs.d/layers/+lang/java/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Java configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Lukasz Klich ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/java/funcs.el b/dot_emacs.d/layers/+lang/java/funcs.el index b680f22..31d5d65 100644 --- a/dot_emacs.d/layers/+lang/java/funcs.el +++ b/dot_emacs.d/layers/+lang/java/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Java functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Lukasz Klich ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/java/layers.el b/dot_emacs.d/layers/+lang/java/layers.el index a927179..cd2c9a2 100644 --- a/dot_emacs.d/layers/+lang/java/layers.el +++ b/dot_emacs.d/layers/+lang/java/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Java layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/javascript/config.el b/dot_emacs.d/layers/+lang/javascript/config.el index f9deb7c..0f78b54 100644 --- a/dot_emacs.d/layers/+lang/javascript/config.el +++ b/dot_emacs.d/layers/+lang/javascript/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Javascript Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/javascript/funcs.el b/dot_emacs.d/layers/+lang/javascript/funcs.el index 459d24d..88738fa 100644 --- a/dot_emacs.d/layers/+lang/javascript/funcs.el +++ b/dot_emacs.d/layers/+lang/javascript/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Javascript Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Muneeb Shaikh ;; URL: https://github.com/syl20bnr/spacemacs @@ -51,7 +51,7 @@ (if (configuration-layer/layer-used-p 'lsp) (progn (when (not javascript-lsp-linter) - (setq-local lsp-diagnostic-package :none)) + (setq-local lsp-diagnostics-provider :none)) (lsp)) (message (concat "`lsp' layer is not installed, " "please add `lsp' layer to your dotfile.")))) diff --git a/dot_emacs.d/layers/+lang/javascript/layers.el b/dot_emacs.d/layers/+lang/javascript/layers.el index 4fd1be9..3e55282 100644 --- a/dot_emacs.d/layers/+lang/javascript/layers.el +++ b/dot_emacs.d/layers/+lang/javascript/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Javascript Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/jr/packages.el b/dot_emacs.d/layers/+lang/jr/packages.el index 1f5a0fd..98a65f3 100644 --- a/dot_emacs.d/layers/+lang/jr/packages.el +++ b/dot_emacs.d/layers/+lang/jr/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- JR Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/jsonnet/packages.el b/dot_emacs.d/layers/+lang/jsonnet/packages.el index a5074ba..abe0975 100644 --- a/dot_emacs.d/layers/+lang/jsonnet/packages.el +++ b/dot_emacs.d/layers/+lang/jsonnet/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- jsonnet layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Liz ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/julia/config.el b/dot_emacs.d/layers/+lang/julia/config.el index 0decab2..c79dc3b 100644 --- a/dot_emacs.d/layers/+lang/julia/config.el +++ b/dot_emacs.d/layers/+lang/julia/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Julia Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Adam Beckmeyer ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/julia/funcs.el b/dot_emacs.d/layers/+lang/julia/funcs.el index 4bf1f52..2e71323 100644 --- a/dot_emacs.d/layers/+lang/julia/funcs.el +++ b/dot_emacs.d/layers/+lang/julia/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Julia Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Adam Beckmeyer ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/julia/layers.el b/dot_emacs.d/layers/+lang/julia/layers.el index 2a89ac4..f93735d 100644 --- a/dot_emacs.d/layers/+lang/julia/layers.el +++ b/dot_emacs.d/layers/+lang/julia/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Julia Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Adam Beckmeyer ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/julia/packages.el b/dot_emacs.d/layers/+lang/julia/packages.el index 9ae9da5..53f7f4e 100644 --- a/dot_emacs.d/layers/+lang/julia/packages.el +++ b/dot_emacs.d/layers/+lang/julia/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Julia layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Adam Beckmeyer ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/kivy/packages.el b/dot_emacs.d/layers/+lang/kivy/packages.el index 9c1e874..68a1bea 100644 --- a/dot_emacs.d/layers/+lang/kivy/packages.el +++ b/dot_emacs.d/layers/+lang/kivy/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- kivy layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ryota Kayanuma ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/latex/config.el b/dot_emacs.d/layers/+lang/latex/config.el index 0303d41..8922c56 100644 --- a/dot_emacs.d/layers/+lang/latex/config.el +++ b/dot_emacs.d/layers/+lang/latex/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Latex Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/latex/funcs.el b/dot_emacs.d/layers/+lang/latex/funcs.el index cfee2dc..a8f538d 100644 --- a/dot_emacs.d/layers/+lang/latex/funcs.el +++ b/dot_emacs.d/layers/+lang/latex/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Auctex Layer Functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/latex/packages.el b/dot_emacs.d/layers/+lang/latex/packages.el index b4a071d..9136250 100644 --- a/dot_emacs.d/layers/+lang/latex/packages.el +++ b/dot_emacs.d/layers/+lang/latex/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Latex Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/lua/config.el b/dot_emacs.d/layers/+lang/lua/config.el index 6cea0b2..b670960 100644 --- a/dot_emacs.d/layers/+lang/lua/config.el +++ b/dot_emacs.d/layers/+lang/lua/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Lua Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/lua/funcs.el b/dot_emacs.d/layers/+lang/lua/funcs.el index b9eea01..0de55bf 100644 --- a/dot_emacs.d/layers/+lang/lua/funcs.el +++ b/dot_emacs.d/layers/+lang/lua/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Lua Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Lin Sun ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/lua/layers.el b/dot_emacs.d/layers/+lang/lua/layers.el index bf09078..a8186b0 100644 --- a/dot_emacs.d/layers/+lang/lua/layers.el +++ b/dot_emacs.d/layers/+lang/lua/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Lua Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Lin Sun ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/lua/packages.el b/dot_emacs.d/layers/+lang/lua/packages.el index eccd072..ea8c110 100644 --- a/dot_emacs.d/layers/+lang/lua/packages.el +++ b/dot_emacs.d/layers/+lang/lua/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Lua Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/major-modes/packages.el b/dot_emacs.d/layers/+lang/major-modes/packages.el index 4be7106..c2f1c9e 100644 --- a/dot_emacs.d/layers/+lang/major-modes/packages.el +++ b/dot_emacs.d/layers/+lang/major-modes/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Major modes Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/markdown/config.el b/dot_emacs.d/layers/+lang/markdown/config.el index 6f92120..798fda7 100644 --- a/dot_emacs.d/layers/+lang/markdown/config.el +++ b/dot_emacs.d/layers/+lang/markdown/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Markdown Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/markdown/funcs.el b/dot_emacs.d/layers/+lang/markdown/funcs.el index 9cbd3dc..3907acc 100644 --- a/dot_emacs.d/layers/+lang/markdown/funcs.el +++ b/dot_emacs.d/layers/+lang/markdown/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Markdown Layer Functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/markdown/packages.el b/dot_emacs.d/layers/+lang/markdown/packages.el index a7979f0..497deaa 100644 --- a/dot_emacs.d/layers/+lang/markdown/packages.el +++ b/dot_emacs.d/layers/+lang/markdown/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Markdown Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -52,9 +52,9 @@ (defun markdown/init-markdown-mode () (use-package markdown-mode :mode - (("\\.m[k]d" . markdown-mode) - ("\\.mdk" . markdown-mode) - ("\\.mdx" . markdown-mode)) + (("\\.mkd\\'" . markdown-mode) + ("\\.mdk\\'" . markdown-mode) + ("\\.mdx\\'" . markdown-mode)) :defer t :config (progn diff --git a/dot_emacs.d/layers/+lang/mercury/packages.el b/dot_emacs.d/layers/+lang/mercury/packages.el index 0755603..a53ddfc 100644 --- a/dot_emacs.d/layers/+lang/mercury/packages.el +++ b/dot_emacs.d/layers/+lang/mercury/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- mercury layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ludvig Böklin ;; URL: https://github.com/syl20bnr/spacemacs @@ -14,7 +14,6 @@ :fetcher github :repo "ahungry/metal-mercury-mode" :commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8")) - (mercury-mode :excluded t) flycheck (flycheck-mercury :requires flycheck) smartparens)) diff --git a/dot_emacs.d/layers/+lang/ocaml/README.org b/dot_emacs.d/layers/+lang/ocaml/README.org index c6a4f36..e435d56 100644 --- a/dot_emacs.d/layers/+lang/ocaml/README.org +++ b/dot_emacs.d/layers/+lang/ocaml/README.org @@ -11,6 +11,7 @@ - [[#layer][Layer]] - [[#using-merlin-for-error-reporting][Using merlin for error reporting]] - [[#opam-packages][OPAM packages]] + - [[#enabling-formatting-on-save][Enabling formatting on save]] - [[#key-bindings][Key bindings]] - [[#repl-utop][REPL (utop)]] - [[#dune][Dune]] @@ -25,6 +26,7 @@ This is a very basic layer for editing ocaml files. - auto-completion with company mode via [[https://github.com/ocaml/merlin][merlin]] - syntax-checking via [[https://github.com/flycheck/flycheck-ocaml][flycheck-ocaml]] (or alternatively [[https://github.com/ocaml/merlin][merlin]]) - =dune= file syntax highlighting and template insertion via [[https://github.com/ocaml/dune/][dune-mode]] +- Automatic formatting via [[https://github.com/ocaml-ppx/ocamlformat][ocamlformat]] * Install ** Layer @@ -47,11 +49,12 @@ This layer requires some [[http://opam.ocaml.org][opam]] packages: - =merlin= for auto-completion - =utop= - =ocp-indent= +- =ocamlformat= for auto-formatting To install them, use the following command: #+BEGIN_SRC sh - opam install merlin utop ocp-indent + opam install merlin utop ocp-indent ocamlformat #+END_SRC Make sure opam is initialized and configured. @@ -61,6 +64,14 @@ Make sure opam is initialized and configured. opam config setup -a #+END_SRC +** Enabling formatting on save +To enable automatic formatting on save with [[https://github.com/ocaml-ppx/ocamlformat][ocamlformat]], set the layer +variable =ocaml-format-on-save=, e.g., + +#+BEGIN_SRC emacs-lisp + (ocaml :variables ocaml-format-on-save t) +#+END_SRC + * Key bindings | Key binding | Description | diff --git a/dot_emacs.d/layers/+lang/ocaml/config.el b/dot_emacs.d/layers/+lang/ocaml/config.el index 8839b8c..0f1a2c3 100644 --- a/dot_emacs.d/layers/+lang/ocaml/config.el +++ b/dot_emacs.d/layers/+lang/ocaml/config.el @@ -1,6 +1,6 @@ ;;; config.el --- ocaml Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -12,3 +12,6 @@ ;; variables (spacemacs|define-jump-handlers tuareg-mode) + +(defvar ocaml-format-before-save nil + "If non-nil, ocamlformat before saving.") diff --git a/dot_emacs.d/layers/+lang/ocaml/funcs.el b/dot_emacs.d/layers/+lang/ocaml/funcs.el index e7da6ea..ba7305e 100644 --- a/dot_emacs.d/layers/+lang/ocaml/funcs.el +++ b/dot_emacs.d/layers/+lang/ocaml/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- ocaml Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ocaml/packages.el b/dot_emacs.d/layers/+lang/ocaml/packages.el index b4fe97f..d1d252d 100644 --- a/dot_emacs.d/layers/+lang/ocaml/packages.el +++ b/dot_emacs.d/layers/+lang/ocaml/packages.el @@ -21,6 +21,7 @@ imenu merlin merlin-eldoc + ocamlformat ocp-indent smartparens tuareg @@ -129,6 +130,13 @@ :defer t :hook (merlin-mode . merlin-eldoc-setup))) +(defun ocaml/init-ocamlformat () + (use-package ocamlformat + :defer t + :init + (when ocaml-format-before-save + (add-hook 'before-save-hook 'ocamlformat-before-save)))) + (defun ocaml/init-ocp-indent () (use-package ocp-indent :defer t diff --git a/dot_emacs.d/layers/+lang/octave/config.el b/dot_emacs.d/layers/+lang/octave/config.el index 996c3be..c979c27 100644 --- a/dot_emacs.d/layers/+lang/octave/config.el +++ b/dot_emacs.d/layers/+lang/octave/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Octave Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/octave/packages.el b/dot_emacs.d/layers/+lang/octave/packages.el index c24e2fc..1deef9e 100644 --- a/dot_emacs.d/layers/+lang/octave/packages.el +++ b/dot_emacs.d/layers/+lang/octave/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Octave Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/pact/packages.el b/dot_emacs.d/layers/+lang/pact/packages.el index ac25f91..91ffe10 100644 --- a/dot_emacs.d/layers/+lang/pact/packages.el +++ b/dot_emacs.d/layers/+lang/pact/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Pact Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Colin Woodbury ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/perl5/config.el b/dot_emacs.d/layers/+lang/perl5/config.el index c599eaa..115dc6e 100644 --- a/dot_emacs.d/layers/+lang/perl5/config.el +++ b/dot_emacs.d/layers/+lang/perl5/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Perl5 Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Troy Hinckley ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/perl5/funcs.el b/dot_emacs.d/layers/+lang/perl5/funcs.el index 73c0dcb..490b734 100644 --- a/dot_emacs.d/layers/+lang/perl5/funcs.el +++ b/dot_emacs.d/layers/+lang/perl5/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Perl5 Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Eivind Fonn ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/perl5/packages.el b/dot_emacs.d/layers/+lang/perl5/packages.el index 32b07d8..29b903e 100644 --- a/dot_emacs.d/layers/+lang/perl5/packages.el +++ b/dot_emacs.d/layers/+lang/perl5/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Perl5 Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Troy Hinckley ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/perl6/config.el b/dot_emacs.d/layers/+lang/perl6/config.el index 0e15ee2..b09b017 100644 --- a/dot_emacs.d/layers/+lang/perl6/config.el +++ b/dot_emacs.d/layers/+lang/perl6/config.el @@ -1,6 +1,6 @@ ;;; config.el --- perl6 layer configuration file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bahtiar `kalkin-`''Gadimov ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/perl6/packages.el b/dot_emacs.d/layers/+lang/perl6/packages.el index 9c05062..98b49f5 100644 --- a/dot_emacs.d/layers/+lang/perl6/packages.el +++ b/dot_emacs.d/layers/+lang/perl6/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- perl6 layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bahtiar `kalkin-`''Gadimov ;; URL: https://github.com/syl20bnr/spacemacs @@ -15,7 +15,7 @@ evil flycheck (flycheck-perl6 :requires flycheck) - perl6-mode + raku-mode )) (defun perl6/post-init-company () @@ -33,7 +33,7 @@ (with-eval-after-load 'flycheck (require 'flycheck-perl6))) -(defun perl6/init-perl6-mode() - (use-package perl6-mode +(defun perl6/init-raku-mode() + (use-package raku-mode :defer t :mode (("/perl6/site/sources/" . perl6-mode)))) diff --git a/dot_emacs.d/layers/+lang/php/config.el b/dot_emacs.d/layers/+lang/php/config.el index 6c3947e..bbc1fe4 100644 --- a/dot_emacs.d/layers/+lang/php/config.el +++ b/dot_emacs.d/layers/+lang/php/config.el @@ -1,6 +1,6 @@ ;;; config.el --- PHP Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Kosta Harlan ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/php/funcs.el b/dot_emacs.d/layers/+lang/php/funcs.el index 4672364..eeaaf04 100644 --- a/dot_emacs.d/layers/+lang/php/funcs.el +++ b/dot_emacs.d/layers/+lang/php/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- PHP Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/php/layers.el b/dot_emacs.d/layers/+lang/php/layers.el index 259a3ff..50f9500 100644 --- a/dot_emacs.d/layers/+lang/php/layers.el +++ b/dot_emacs.d/layers/+lang/php/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- PHP Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/php/packages.el b/dot_emacs.d/layers/+lang/php/packages.el index 618edd8..42598ed 100644 --- a/dot_emacs.d/layers/+lang/php/packages.el +++ b/dot_emacs.d/layers/+lang/php/packages.el @@ -20,7 +20,7 @@ counsel-gtags helm-gtags php-auto-yasnippets - (php-extras :location (recipe :fetcher github :repo "arnested/php-extras")) + (php-extras :location (recipe :fetcher github :repo "arnested/php-extras") :toggle (not (eq php-backend 'lsp))) php-mode phpcbf phpunit diff --git a/dot_emacs.d/layers/+lang/plantuml/packages.el b/dot_emacs.d/layers/+lang/plantuml/packages.el index 1c7f8bb..cb96158 100644 --- a/dot_emacs.d/layers/+lang/plantuml/packages.el +++ b/dot_emacs.d/layers/+lang/plantuml/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- plantuml layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Robert O'Connor ;; Contributor: Carlo Sciolla diff --git a/dot_emacs.d/layers/+lang/prolog/config.el b/dot_emacs.d/layers/+lang/prolog/config.el index d62392c..1077d13 100644 --- a/dot_emacs.d/layers/+lang/prolog/config.el +++ b/dot_emacs.d/layers/+lang/prolog/config.el @@ -1,6 +1,6 @@ ;;; config.el --- prolog layer config File for Spacemacs ;; -;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Newres Al Haider ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/prolog/packages.el b/dot_emacs.d/layers/+lang/prolog/packages.el index 12f5317..387cfa0 100644 --- a/dot_emacs.d/layers/+lang/prolog/packages.el +++ b/dot_emacs.d/layers/+lang/prolog/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- prolog layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Newres Al Haider ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/protobuf/funcs.el b/dot_emacs.d/layers/+lang/protobuf/funcs.el index 6d27099..456cc30 100644 --- a/dot_emacs.d/layers/+lang/protobuf/funcs.el +++ b/dot_emacs.d/layers/+lang/protobuf/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Protobuf Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Amol Mandhane ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/protobuf/packages.el b/dot_emacs.d/layers/+lang/protobuf/packages.el index 142e93d..731c816 100644 --- a/dot_emacs.d/layers/+lang/protobuf/packages.el +++ b/dot_emacs.d/layers/+lang/protobuf/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Protocol Buffers Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Amol Mandhane ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/purescript/README.org b/dot_emacs.d/layers/+lang/purescript/README.org index 5f9f8e6..625966b 100644 --- a/dot_emacs.d/layers/+lang/purescript/README.org +++ b/dot_emacs.d/layers/+lang/purescript/README.org @@ -12,6 +12,7 @@ - [[#add-import-on-completion][Add import on completion]] - [[#node-modules][Node Modules]] - [[#error-popup][Error popup]] + - [[#lsp][LSP]] - [[#key-bindings][Key bindings]] - [[#purescript][Purescript]] - [[#imports][Imports]] @@ -58,6 +59,33 @@ If you set =purescript-enable-rebuild-on-save= to non-nil, you will get a popup buffer showing you your current warnings/errors one at a time. This is primarily meant as an alternative to using flycheck. Default value is nil. +** LSP +For proper IDE support this backend should be used. It is +based on an external server which will be started automatically +by emacs, once an purescript file is opened. The key bindings are +the same for all lsp modes so if you are already familiar with +one you should be able to work the same in all modes. + +To set explicitly do the following in your dotfile: + +#+BEGIN_SRC emacs-lisp + (purescript :variables + purescript-backend 'lsp) +#+END_SRC + +For this to work you will also need to install +the lsp server and separate dependencies with below +command: + +#+BEGIN_SRC sh + npm i -g purescript-language-server +#+END_SRC + +NOTE: Key bindings for LSP are defined in the +LSP layer. Also it is advisable to have a look +at the autocomplete layer for an optimal +intellisense config for LSP. + * Key bindings ** Purescript *** Imports diff --git a/dot_emacs.d/layers/+lang/purescript/config.el b/dot_emacs.d/layers/+lang/purescript/config.el index 29afe46..43f7256 100644 --- a/dot_emacs.d/layers/+lang/purescript/config.el +++ b/dot_emacs.d/layers/+lang/purescript/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Purescript Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ryan L. Bell ;; URL: https://github.com/syl20bnr/spacemacs @@ -18,3 +18,8 @@ (defvar purescript-enable-rebuild-on-save nil "If non-nil rebuild on save is enabled") + +(defvar purescript-backend nil + "The backend to use for IDE features. +Possible values are `lsp' and `psc-ide'. +If `nil' then `psc-ide' is the default backend unless `lsp' layer is used.") diff --git a/dot_emacs.d/layers/+lang/purescript/funcs.el b/dot_emacs.d/layers/+lang/purescript/funcs.el new file mode 100644 index 0000000..76e5fea --- /dev/null +++ b/dot_emacs.d/layers/+lang/purescript/funcs.el @@ -0,0 +1,35 @@ +;;; funcs.el --- PureScript Layer functions File for Spacemacs +;; +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors +;; +;; Author: nobv <6e6f6276@gmail.com> +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defun spacemacs//purescript-backend () + "Returns selected backend." + (if purescript-backend + purescript-backend + (cond + ((configuration-layer/layer-used-p 'lsp) 'lsp) + (t 'psc-ide)))) + +(defun spacemacs//purescript-setup-backend() + "Conditionally setup purescript backend." + (pcase (spacemacs//purescript-backend) + ('lsp (lsp)))) + +(defun spacemacs//purescript-setup-company () + "Conditionally setup company based on backend." + (pcase (spacemacs//purescript-backend) + ;; Activate lsp company explicitly to activate + ;; standard backends as well + ('lsp (spacemacs|add-company-backends + :backends company-capf + :modes purescript-mode)) + ('psc-ide (spacemacs|add-company-backends + :backends company-psc-ide-backend + :modes purescript-mode)))) diff --git a/dot_emacs.d/layers/+lang/purescript/layers.el b/dot_emacs.d/layers/+lang/purescript/layers.el index db7448b..2a40c1b 100644 --- a/dot_emacs.d/layers/+lang/purescript/layers.el +++ b/dot_emacs.d/layers/+lang/purescript/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Purescript Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ryan L. Bell ;; URL: https://github.com/syl20bnr/spacemacs @@ -10,3 +10,7 @@ ;;; License: GPLv3 (configuration-layer/declare-layer-dependencies '(node)) + +(when (and (boundp 'purescript-backend) + (eq purescript-backend 'lsp)) + (configuration-layer/declare-layer-dependencies '(lsp))) diff --git a/dot_emacs.d/layers/+lang/purescript/packages.el b/dot_emacs.d/layers/+lang/purescript/packages.el index e06bc32..41957ac 100644 --- a/dot_emacs.d/layers/+lang/purescript/packages.el +++ b/dot_emacs.d/layers/+lang/purescript/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Purescript Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ryan L. Bell ;; URL: https://github.com/syl20bnr/spacemacs @@ -24,10 +24,7 @@ (add-hook 'purescript-mode-hook 'add-node-modules-path)) (defun purescript/post-init-company () - (when (configuration-layer/package-used-p 'psc-ide) - (spacemacs|add-company-backends - :backends company-psc-ide-backend - :modes purescript-mode))) + (spacemacs//purescript-setup-company)) (defun purescript/post-init-flycheck () (spacemacs/enable-flycheck 'purescript-mode)) @@ -40,6 +37,7 @@ (add-to-list 'spacemacs-indent-sensitive-modes 'purescript-mode) (add-hook 'purescript-mode-hook 'turn-on-purescript-indentation) (add-hook 'purescript-mode-hook 'purescript-decl-scan-mode) + (add-hook 'purescript-mode-hook #'spacemacs//purescript-setup-backend) (spacemacs/declare-prefix-for-mode 'purescript-mode "mg" "goto") (spacemacs/declare-prefix-for-mode 'purescript-mode "mi" "imports") (spacemacs/set-leader-keys-for-major-mode 'purescript-mode @@ -48,6 +46,7 @@ "ia" 'purescript-align-imports "in" 'purescript-navigate-imports)))) + (defun purescript/init-psci () (use-package psci :defer t diff --git a/dot_emacs.d/layers/+lang/python/README.org b/dot_emacs.d/layers/+lang/python/README.org index b802d15..a63304f 100644 --- a/dot_emacs.d/layers/+lang/python/README.org +++ b/dot_emacs.d/layers/+lang/python/README.org @@ -15,6 +15,7 @@ - [[#language-server-protocol][Language Server Protocol]] - [[#python-language-server][python-language-server]] - [[#microsoft-python-language-server][Microsoft python language server]] + - [[#microsoft-pyright-language-server][Microsoft pyright language server]] - [[#additional-tools][Additional tools]] - [[#syntax-checking][Syntax checking]] - [[#test-runner][Test runner]] @@ -31,6 +32,7 @@ - [[#pyvenv-pyenv-and-pipenv][Pyvenv, pyenv and pipenv]] - [[#management-of-python-versions-and-virtual-environments][Management of Python versions and virtual environments]] - [[#manage-virtual-environments-with-pyvenv][Manage virtual environments with pyvenv]] + - [[#automatic-activation-of-local-virtual-environment][Automatic activation of local virtual environment]] - [[#manage-multiple-python-versions-with-pyenv][Manage multiple Python versions with pyenv]] - [[#automatic-activation-of-local-pyenv-version][Automatic activation of local pyenv version]] - [[#manage-environments-and-packages-with-pipenv][Manage environments and packages with pipenv]] @@ -50,7 +52,7 @@ This layer adds support for the Python language. ** Features: - Support for the following backends: - [[https://github.com/proofit404/anaconda-mode][anaconda]] (default), - - [[https://github.com/emacs-lsp/lsp-python][Language Server Protocol]] (experimental - 2 implementations), + - [[https://github.com/emacs-lsp/lsp-python-ms][Language Server Protocol]] (experimental - 2 implementations), - python-language-server - Microsoft python language server - Auto-completion @@ -132,18 +134,25 @@ setting your =PYTHONPATH= as explained at ** Language Server Protocol The =lsp= backend can use either of the following language server implementations: -| symbol | description | -|---------+------------------------------------------| -| 'pyls | python-language-server package (default) | -| 'mspyls | Microsoft python language server | +| symbol | description | +|----------+------------------------------------------| +| 'pyls | python-language-server package (default) | +| 'mspyls | Microsoft python language server | +| 'pyright | Microsoft pyright language server | -=pyls= is used by default - to use the Microsoft server, set the =python-lsp-server= -layer variable as follows: +=pyls= is used by default - to use the Microsoft python language server, set the +=python-lsp-server= layer variable as follows: #+BEGIN_SRC elisp (python :variables python-backend 'lsp python-lsp-server 'mspyls) #+END_SRC +To setup the pyright language server instead, use: + +#+BEGIN_SRC elisp + (python :variables python-backend 'lsp python-lsp-server 'pyright) +#+END_SRC + *** python-language-server You just have to install python language server package: @@ -193,6 +202,19 @@ To use the latest built version in a cloned git repo, use the ~python-lsp-git-ro N.B. If you're using Arch linux or a derivative distribution, you can install the =microsoft-python-language-server= package from the AUR. +*** Microsoft pyright language server +[[https://github.com/microsoft/pyright][Pyright]] is a new language server by Microsoft rewritten from scratch. Microsoft +python language server is planned to be deprecated in favor of pyright. Pyright +offers improved performance and better features compared to the old +implementation. It can be installed via yarn or npm as follows: + +#+BEGIN_SRC sh + # via yarn + yarn global add pyright + # or via npm + npm install -g pyright +#+END_SRC + * Additional tools ** Syntax checking Syntax checking uses =flake8= package: @@ -343,6 +365,27 @@ by the [[https://github.com/jorgenschaefer/pyvenv][pyvenv]] package. It provides | ~SPC m V d~ | deactivate active virtual environment | | ~SPC m V w~ | work on virtual environment in =WORKON_HOME= | +*** Automatic activation of local virtual environment +By default Spacemacs uses the [[https://github.com/jorgenschaefer/pyvenv][pyvenv]] package to manage virtual environments. +Additionally it uses =pyvenv-tracking-mode= to activate a buffer's local virtual +environment on change of focus. Pyvenv determines which virtual environment to +use from the value of the =pyvenv-workon= or the =pyvenv-activate= +buffer-local-variable. Spacemacs scans the project directory for a pattern +=.venv=. If the found =.venv= is a directory then it sets that directory as the +local virtual environment path. If the =.venv= pattern is a file then it checks if +its first line matches an existing path and if so, it sets it as the local +virtual environment path. Finally it checks if it finds an existing directory +with the name of the first line in the ~pyvenv-workon-home~ directory. By default +Spacemacs scans for a virtual environment and sets the local =pyvenv-workon= or +the =pyvenv-activate= variables on visiting a file, but switches virtual +environment on every change of focus using the local variables. The buffer +tracking behavior can be disabled by setting the value of the customizable +variable =pyvenv-tracking-mode= to =nil=. The scanning behavior can be set via the +variable =python-auto-set-local-pyvenv-virtualenv= to: +- =on-visit= (default) set the virtualenv when you visit a python buffer, +- =on-project-switch= set the virtualenv when you switch projects, +- =nil= to disable. + ** Manage multiple Python versions with pyenv If you need multiple Python versions (e.g. Python 2 and Python 3) then take a look at [[https://github.com/yyuu/pyenv][pyenv]]. It enables the installation and management of multiple @@ -369,15 +412,6 @@ the pyenv version. The behavior can be set with the variable - =on-project-switch= set the version when you switch projects, - =nil= to disable. -The same is also possible on pyvenv with a file called =.venv= that specifies -either an absolute or relative path to a virtualenv directory. A relative path -is checked relative to the location of =.venv=, then relative to -=pyvenv-workon-home=. =.venv= can also be a virtualenv directory. The behavior -can be set with the variable =python-auto-set-local-pyvenv-virtualenv= to: -- =on-visit= (default) set the virtualenv when you visit a python buffer, -- =on-project-switch= set the virtualenv when you switch projects, -- =nil= to disable. - ** Manage environments and packages with pipenv [[https://pipenv.kennethreitz.org/en/latest/][Pipenv]] is the new standard tool to manage your virtual environments. It can act as a replacement for both =pyenv= and =venv= on a per-repository basis. An overview @@ -405,17 +439,20 @@ search path by activating a virtual environment. Send code to inferior process commands: -| Key binding | Description | -|-------------+-------------------------------------------------| -| ~SPC m s b~ | send buffer and keep code buffer focused | -| ~SPC m s B~ | send buffer and switch to REPL in insert mode | -| ~SPC m s f~ | send function and keep code buffer focused | -| ~SPC m s F~ | send function and switch to REPL in insert mode | -| ~SPC m s i~ | start inferior REPL process | -| ~SPC m s r~ | send region and keep code buffer focused | -| ~SPC m s R~ | send region and switch to REPL in insert mode | -| ~CTRL+j~ | next item in REPL history | -| ~CTRL+k~ | previous item in REPL history | +| Key binding | Description | +|-------------+--------------------------------------------------| +| ~SPC m s b~ | send buffer and keep code buffer focused | +| ~SPC m s B~ | send buffer and switch to REPL in insert mode | +| ~SPC m s e~ | send statement and keep code buffer focused | +| ~SPC m s E~ | send statement and switch to REPL in insert mode | +| ~SPC m s f~ | send function and keep code buffer focused | +| ~SPC m s F~ | send function and switch to REPL in insert mode | +| ~SPC m s i~ | start inferior REPL process | +| ~SPC m s l~ | send line and keep code buffer focused | +| ~SPC m s r~ | send region and keep code buffer focused | +| ~SPC m s R~ | send region and switch to REPL in insert mode | +| ~CTRL+j~ | next item in REPL history | +| ~CTRL+k~ | previous item in REPL history | ** Running Python Script in shell To run a Python script like you would in the shell press ~SPC m c c~ @@ -500,6 +537,7 @@ Live coding is provided by the [[https://github.com/donkirkby/live-py-plugin][li | ~SPC m h d~ | look for documentation using =helm-pydoc= | | ~SPC m h h~ | quick documentation using anaconda | | ~SPC m h H~ | open documentation in =firefox= using [[https://github.com/tsgates/pylookup][pylookup]] | +| ~SPC m S d~ | insert doc-string skeleton using [[https://github.com/naiquevin/sphinx-doc.el][sphinx-doc]] | | ~SPC m v a~ | activate a virtual environment in any directory | | ~SPC m v d~ | deactivate active virtual environment | | ~SPC m v s~ | set a pyenv environment with [[https://github.com/pyenv/pyenv][pyenv]] | diff --git a/dot_emacs.d/layers/+lang/python/config.el b/dot_emacs.d/layers/+lang/python/config.el index f979fc3..6500018 100644 --- a/dot_emacs.d/layers/+lang/python/config.el +++ b/dot_emacs.d/layers/+lang/python/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Python Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -20,7 +20,7 @@ Possible values are `anaconda'and `lsp'. If `nil' then `anaconda' is the default backend unless `lsp' layer is used.") (defvar python-lsp-server 'pyls - "Language server to use for lsp backend. Possible values are `pyls' + "Language server to use for lsp backend. Possible values are `pyls', `pyright' and `mspyls'") (defvar python-lsp-git-root nil diff --git a/dot_emacs.d/layers/+lang/python/funcs.el b/dot_emacs.d/layers/+lang/python/funcs.el index 65fa528..5ee46ae 100644 --- a/dot_emacs.d/layers/+lang/python/funcs.el +++ b/dot_emacs.d/layers/+lang/python/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Python Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -83,8 +83,8 @@ "Setup lsp backend." (if (configuration-layer/layer-used-p 'lsp) (progn - (when (eq python-lsp-server 'mspyls) - (require 'lsp-python-ms)) + (cond ((eq python-lsp-server 'mspyls) (require 'lsp-python-ms)) + ((eq python-lsp-server 'pyright) (require 'lsp-pyright))) (lsp)) (message "`lsp' layer is not installed, please add `lsp' layer to your dotfile."))) @@ -231,21 +231,22 @@ location of \".venv\" file, then relative to pyvenv-workon-home()." (let ((root-path (locate-dominating-file default-directory ".venv"))) (when root-path (let ((file-path (expand-file-name ".venv" root-path))) - (if (file-directory-p file-path) - (pyvenv-activate file-path) - (let* ((virtualenv-path-in-file - (with-temp-buffer - (insert-file-contents-literally file-path) - (buffer-substring-no-properties (line-beginning-position) - (line-end-position)))) - (virtualenv-abs-path - (if (file-name-absolute-p virtualenv-path-in-file) - virtualenv-path-in-file - (format "%s/%s" root-path virtualenv-path-in-file)))) - (if (file-directory-p virtualenv-abs-path) - (pyvenv-activate virtualenv-abs-path) - (pyvenv-workon virtualenv-path-in-file)))))))) - + (cond ((file-directory-p file-path) + (pyvenv-activate file-path) (setq-local pyvenv-activate file-path)) + (t (let* ((virtualenv-path-in-file + (with-temp-buffer + (insert-file-contents-literally file-path) + (buffer-substring-no-properties (line-beginning-position) + (line-end-position)))) + (virtualenv-abs-path + (if (file-name-absolute-p virtualenv-path-in-file) + virtualenv-path-in-file + (format "%s/%s" root-path virtualenv-path-in-file)))) + (cond ((file-directory-p virtualenv-abs-path) + (pyvenv-activate virtualenv-abs-path) + (setq-local pyvenv-activate virtualenv-abs-path)) + (t (pyvenv-workon virtualenv-path-in-file) + (setq-local pyvenv-workon virtualenv-path-in-file)))))))))) ;; Tests @@ -440,6 +441,33 @@ Bind formatter to '==' for LSP and '='for all other backends." (let ((python-mode-hook nil)) (python-shell-send-region start end))) +(defun spacemacs/python-shell-send-line () + "Send the current line to shell" + (interactive) + (let ((python-mode-hook nil) + (start (point-at-bol)) + (end (point-at-eol))) + (python-shell-send-region start end))) + +(defun spacemacs/python-shell-send-statement () + "Send the current statement to shell, same as `python-shell-send-statement' in Emacs27." + (interactive) + (if (fboundp 'python-shell-send-statement) + (call-interactively #'python-shell-send-statement) + (if (region-active-p) + (call-interactively #'python-shell-send-region) + (let ((python-mode-hook nil)) + (python-shell-send-region + (save-excursion (python-nav-beginning-of-statement)) + (save-excursion (python-nav-end-of-statement))))))) + +(defun spacemacs/python-shell-send-statement-switch () + "Send statement to shell and switch to it in insert mode." + (interactive) + (call-interactively #'spacemacs/python-shell-send-statement) + (python-shell-switch-to-shell) + (evil-insert-state)) + (defun spacemacs/python-start-or-switch-repl () "Start and/or switch to the REPL." (interactive) diff --git a/dot_emacs.d/layers/+lang/python/layers.el b/dot_emacs.d/layers/+lang/python/layers.el index 328b012..e4fdfef 100644 --- a/dot_emacs.d/layers/+lang/python/layers.el +++ b/dot_emacs.d/layers/+lang/python/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Python Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/python/packages.el b/dot_emacs.d/layers/+lang/python/packages.el index 61e05d2..0b62060 100644 --- a/dot_emacs.d/layers/+lang/python/packages.el +++ b/dot_emacs.d/layers/+lang/python/packages.el @@ -37,6 +37,7 @@ (python :location built-in) pyvenv semantic + sphinx-doc smartparens stickyfunc-enhance xcscope @@ -45,7 +46,10 @@ anaconda-mode (company-anaconda :requires company) ;; packages for Microsoft LSP backend - (lsp-python-ms :requires lsp-mode))) + (lsp-python-ms :requires lsp-mode) + + ;; packages for Microsoft's pyright language server + (lsp-pyright :requires lsp-mode))) (defun python/init-anaconda-mode () (use-package anaconda-mode @@ -234,6 +238,18 @@ (spacemacs/set-leader-keys-for-major-mode 'python-mode "rI" 'py-isort-buffer)))) +(defun python/init-sphinx-doc () + (use-package sphinx-doc + :defer t + :init + (progn + (add-hook 'python-mode-hook 'sphinx-doc-mode) + (spacemacs/declare-prefix-for-mode 'python-mode "mS" "sphinx-doc") + (spacemacs/set-leader-keys-for-major-mode 'python-mode + "Se" 'sphinx-doc-mode + "Sd" 'sphinx-doc)) + :config (spacemacs|hide-lighter sphinx-doc-mode))) + (defun python/pre-init-pyenv-mode () (add-to-list 'spacemacs--python-pyenv-modes 'python-mode)) (defun python/init-pyenv-mode () @@ -264,6 +280,7 @@ :defer t :init (progn + (add-hook 'python-mode-hook #'pyvenv-tracking-mode) (pcase python-auto-set-local-pyvenv-virtualenv (`on-visit (dolist (m spacemacs--python-pyvenv-modes) @@ -347,11 +364,14 @@ "ri" 'spacemacs/python-remove-unused-imports "sB" 'spacemacs/python-shell-send-buffer-switch "sb" 'spacemacs/python-shell-send-buffer + "sE" 'spacemacs/python-shell-send-statement-switch + "se" 'spacemacs/python-shell-send-statement "sF" 'spacemacs/python-shell-send-defun-switch "sf" 'spacemacs/python-shell-send-defun "si" 'spacemacs/python-start-or-switch-repl "sR" 'spacemacs/python-shell-send-region-switch - "sr" 'spacemacs/python-shell-send-region) + "sr" 'spacemacs/python-shell-send-region + "sl" 'spacemacs/python-shell-send-line) ;; Set `python-indent-guess-indent-offset' to `nil' to prevent guessing `python-indent-offset ;; (we call python-indent-guess-indent-offset manually so python-mode does not need to do it) @@ -452,3 +472,9 @@ fix this issue." "Microsoft.Python.LanguageServer" (and (eq system-type 'windows-nt) ".exe")))))) + +(defun python/init-lsp-pyright () + (use-package lsp-pyright + :if (eq python-lsp-server 'pyright) + :ensure nil + :defer t)) diff --git a/dot_emacs.d/layers/+lang/racket/config.el b/dot_emacs.d/layers/+lang/racket/config.el index 53a2bb1..be5d5f2 100644 --- a/dot_emacs.d/layers/+lang/racket/config.el +++ b/dot_emacs.d/layers/+lang/racket/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Racket Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/racket/packages.el b/dot_emacs.d/layers/+lang/racket/packages.el index 104e6ab..dc72804 100644 --- a/dot_emacs.d/layers/+lang/racket/packages.el +++ b/dot_emacs.d/layers/+lang/racket/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Racket Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/reasonml/config.el b/dot_emacs.d/layers/+lang/reasonml/config.el index c7730b4..0429510 100644 --- a/dot_emacs.d/layers/+lang/reasonml/config.el +++ b/dot_emacs.d/layers/+lang/reasonml/config.el @@ -1,6 +1,6 @@ ;;; config.el --- reasonml layer configuration file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Dave Aitken ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/reasonml/funcs.el b/dot_emacs.d/layers/+lang/reasonml/funcs.el index a9de2c1..ff166f1 100644 --- a/dot_emacs.d/layers/+lang/reasonml/funcs.el +++ b/dot_emacs.d/layers/+lang/reasonml/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- reasonml layer functions file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Dave Aitken ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/reasonml/layers.el b/dot_emacs.d/layers/+lang/reasonml/layers.el index 825d136..0ed460a 100644 --- a/dot_emacs.d/layers/+lang/reasonml/layers.el +++ b/dot_emacs.d/layers/+lang/reasonml/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- reasonml layer layers file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Dave Aitken ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/reasonml/packages.el b/dot_emacs.d/layers/+lang/reasonml/packages.el index f3cfab4..d8af7b7 100644 --- a/dot_emacs.d/layers/+lang/reasonml/packages.el +++ b/dot_emacs.d/layers/+lang/reasonml/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- reasonml layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fredrik Dyrkell ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/restructuredtext/packages.el b/dot_emacs.d/layers/+lang/restructuredtext/packages.el index b821886..b90ca24 100644 --- a/dot_emacs.d/layers/+lang/restructuredtext/packages.el +++ b/dot_emacs.d/layers/+lang/restructuredtext/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- rest layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ruby/config.el b/dot_emacs.d/layers/+lang/ruby/config.el index 34aa051..9fd1d92 100644 --- a/dot_emacs.d/layers/+lang/ruby/config.el +++ b/dot_emacs.d/layers/+lang/ruby/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Ruby Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ruby/funcs.el b/dot_emacs.d/layers/+lang/ruby/funcs.el index ba305cd..dcccef4 100644 --- a/dot_emacs.d/layers/+lang/ruby/funcs.el +++ b/dot_emacs.d/layers/+lang/ruby/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Ruby Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/ruby/layers.el b/dot_emacs.d/layers/+lang/ruby/layers.el index faede00..ebe63f5 100644 --- a/dot_emacs.d/layers/+lang/ruby/layers.el +++ b/dot_emacs.d/layers/+lang/ruby/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Ruby Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/rust/config.el b/dot_emacs.d/layers/+lang/rust/config.el index 094cf35..c49e596 100644 --- a/dot_emacs.d/layers/+lang/rust/config.el +++ b/dot_emacs.d/layers/+lang/rust/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Rust Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Chris Hoeppner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/rust/funcs.el b/dot_emacs.d/layers/+lang/rust/funcs.el index 2d30d77..8e34fd7 100644 --- a/dot_emacs.d/layers/+lang/rust/funcs.el +++ b/dot_emacs.d/layers/+lang/rust/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- rust Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: NJBS ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/rust/layers.el b/dot_emacs.d/layers/+lang/rust/layers.el index 2d50c6d..ec55169 100644 --- a/dot_emacs.d/layers/+lang/rust/layers.el +++ b/dot_emacs.d/layers/+lang/rust/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Rust Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/scala/config.el b/dot_emacs.d/layers/+lang/scala/config.el index 607f024..df0081f 100644 --- a/dot_emacs.d/layers/+lang/scala/config.el +++ b/dot_emacs.d/layers/+lang/scala/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Scala Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/scala/funcs.el b/dot_emacs.d/layers/+lang/scala/funcs.el index 3890267..92f8354 100644 --- a/dot_emacs.d/layers/+lang/scala/funcs.el +++ b/dot_emacs.d/layers/+lang/scala/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Scala Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/scala/layers.el b/dot_emacs.d/layers/+lang/scala/layers.el index 925031a..516b1e2 100644 --- a/dot_emacs.d/layers/+lang/scala/layers.el +++ b/dot_emacs.d/layers/+lang/scala/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Scala layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/scheme/config.el b/dot_emacs.d/layers/+lang/scheme/config.el index 9d6cd9f..e216f78 100644 --- a/dot_emacs.d/layers/+lang/scheme/config.el +++ b/dot_emacs.d/layers/+lang/scheme/config.el @@ -1,6 +1,6 @@ ;;; config.el --- scheme Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/scheme/packages.el b/dot_emacs.d/layers/+lang/scheme/packages.el index 1eb0780..3196dd1 100644 --- a/dot_emacs.d/layers/+lang/scheme/packages.el +++ b/dot_emacs.d/layers/+lang/scheme/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Scheme Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/semantic-web/README.org b/dot_emacs.d/layers/+lang/semantic-web/README.org index e7068c8..68a03b9 100644 --- a/dot_emacs.d/layers/+lang/semantic-web/README.org +++ b/dot_emacs.d/layers/+lang/semantic-web/README.org @@ -11,7 +11,7 @@ - [[#key-bindings][Key bindings]] * Description -This layer adds support for RDF files in N3 and [[https://www.w3.org/TR/turtle/][Turtle syntax]] using [[https://bitbucket.org/nxg/ttl-mode][ttl-mode]] +This layer adds support for RDF files in N3 and [[https://www.w3.org/TR/turtle/][Turtle syntax]] using [[https://github.com/nxg/ttl-mode][ttl-mode]] and for [[https://www.w3.org/TR/sparql11-query/][SPARQL]] queries using [[https://github.com/ljos/sparql-mode][sparql-mode]]. SPARQL-mode supports the execution of queries. When first called, you will be diff --git a/dot_emacs.d/layers/+lang/semantic-web/packages.el b/dot_emacs.d/layers/+lang/semantic-web/packages.el index a6d317d..c5b5ec6 100644 --- a/dot_emacs.d/layers/+lang/semantic-web/packages.el +++ b/dot_emacs.d/layers/+lang/semantic-web/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Semantic Web layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andreas Textor ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/shell-scripts/config.el b/dot_emacs.d/layers/+lang/shell-scripts/config.el index 811a729..54eaa68 100644 --- a/dot_emacs.d/layers/+lang/shell-scripts/config.el +++ b/dot_emacs.d/layers/+lang/shell-scripts/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Shell Scripts Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/shell-scripts/funcs.el b/dot_emacs.d/layers/+lang/shell-scripts/funcs.el index 4aba2ad..4536ff7 100644 --- a/dot_emacs.d/layers/+lang/shell-scripts/funcs.el +++ b/dot_emacs.d/layers/+lang/shell-scripts/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Shell Scripts Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/shell-scripts/layers.el b/dot_emacs.d/layers/+lang/shell-scripts/layers.el index 946fa62..a43b777 100644 --- a/dot_emacs.d/layers/+lang/shell-scripts/layers.el +++ b/dot_emacs.d/layers/+lang/shell-scripts/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Shell Scripts Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/shell-scripts/packages.el b/dot_emacs.d/layers/+lang/shell-scripts/packages.el index f4edce5..675d03e 100644 --- a/dot_emacs.d/layers/+lang/shell-scripts/packages.el +++ b/dot_emacs.d/layers/+lang/shell-scripts/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Shell Scripts Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/sml/packages.el b/dot_emacs.d/layers/+lang/sml/packages.el index c35517e..6e472e8 100644 --- a/dot_emacs.d/layers/+lang/sml/packages.el +++ b/dot_emacs.d/layers/+lang/sml/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- sml Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Keith Simmons ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/solidity/layers.el b/dot_emacs.d/layers/+lang/solidity/layers.el index db8260e..8175e8b 100644 --- a/dot_emacs.d/layers/+lang/solidity/layers.el +++ b/dot_emacs.d/layers/+lang/solidity/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Solidity Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/solidity/packages.el b/dot_emacs.d/layers/+lang/solidity/packages.el index 48666e3..be87332 100644 --- a/dot_emacs.d/layers/+lang/solidity/packages.el +++ b/dot_emacs.d/layers/+lang/solidity/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- solidity layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brooklyn Zelenka ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/sql/config.el b/dot_emacs.d/layers/+lang/sql/config.el index e114e73..33b6aec 100644 --- a/dot_emacs.d/layers/+lang/sql/config.el +++ b/dot_emacs.d/layers/+lang/sql/config.el @@ -1,6 +1,6 @@ ;;; config.el --- sql Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Kepi ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/sql/packages.el b/dot_emacs.d/layers/+lang/sql/packages.el index b20db26..aa97922 100644 --- a/dot_emacs.d/layers/+lang/sql/packages.el +++ b/dot_emacs.d/layers/+lang/sql/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- sql Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/swift/packages.el b/dot_emacs.d/layers/+lang/swift/packages.el index 52c21d9..50ebcad 100644 --- a/dot_emacs.d/layers/+lang/swift/packages.el +++ b/dot_emacs.d/layers/+lang/swift/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- swift Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Uri Sharf ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/typescript/README.org b/dot_emacs.d/layers/+lang/typescript/README.org index cb2c442..d869753 100644 --- a/dot_emacs.d/layers/+lang/typescript/README.org +++ b/dot_emacs.d/layers/+lang/typescript/README.org @@ -168,22 +168,22 @@ then set the variable =typescript-lsp-linter= to =nil=. * Key bindings ** Typescript Major Mode -| Key binding | Description | -|-------------+--------------------------------------------------------------| -| ~SPC m =~ | reformat the buffer | -| ~SPC m E d~ | add =tslint:disable-next-line= at point | -| ~SPC m E e~ | fix thing at point | -| ~SPC m g b~ | jump back | -| ~SPC m g g~ | jump to entity's definition | -| ~SPC m g t~ | jump to entity's type definition | -| ~SPC m g r~ | references | -| ~SPC m h h~ | documentation at point | -| ~SPC m p~ | send selected region or current buffer to the web playground | -| ~SPC m r i~ | organize imports | -| ~SPC m r r~ | rename symbol | -| ~SPC m r f~ | rename file | -| ~SPC m S r~ | restart server | -| ~SPC m S j~ | create a barebone =jsconfig.json= at project root | +| Key binding | Description | +|-----------------------------------------------+--------------------------------------------------------------| +| ~SPC m =~ or ~SPC m = =~ if using lsp backend | reformat the buffer | +| ~SPC m E d~ | add =tslint:disable-next-line= at point | +| ~SPC m E e~ | fix thing at point | +| ~SPC m g b~ | jump back | +| ~SPC m g g~ | jump to entity's definition | +| ~SPC m g t~ | jump to entity's type definition | +| ~SPC m g r~ | references | +| ~SPC m h h~ | documentation at point | +| ~SPC m p~ | send selected region or current buffer to the web playground | +| ~SPC m r i~ | organize imports | +| ~SPC m r r~ | rename symbol | +| ~SPC m r f~ | rename file | +| ~SPC m S r~ | restart server | +| ~SPC m S j~ | create a barebone =jsconfig.json= at project root | ** Reference Major Mode diff --git a/dot_emacs.d/layers/+lang/typescript/config.el b/dot_emacs.d/layers/+lang/typescript/config.el index 83e6d6d..92cf9c0 100644 --- a/dot_emacs.d/layers/+lang/typescript/config.el +++ b/dot_emacs.d/layers/+lang/typescript/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Typescript Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/typescript/funcs.el b/dot_emacs.d/layers/+lang/typescript/funcs.el index fc26d12..42b97fa 100644 --- a/dot_emacs.d/layers/+lang/typescript/funcs.el +++ b/dot_emacs.d/layers/+lang/typescript/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- TypeScript Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -45,7 +45,7 @@ (if (configuration-layer/layer-used-p 'lsp) (progn (when (not typescript-lsp-linter) - (setq-local lsp-diagnostic-package :none)) + (setq-local lsp-diagnostics-provider :none)) (lsp)) (message (concat "`lsp' layer is not installed, " "please add `lsp' layer to your dotfile.")))) diff --git a/dot_emacs.d/layers/+lang/typescript/layers.el b/dot_emacs.d/layers/+lang/typescript/layers.el index 57bc792..0885991 100644 --- a/dot_emacs.d/layers/+lang/typescript/layers.el +++ b/dot_emacs.d/layers/+lang/typescript/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- typescript Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Chris Bowdon ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/typescript/packages.el b/dot_emacs.d/layers/+lang/typescript/packages.el index 78dc18e..20c9374 100644 --- a/dot_emacs.d/layers/+lang/typescript/packages.el +++ b/dot_emacs.d/layers/+lang/typescript/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- typescript Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Chris Bowdon ;; URL: https://github.com/syl20bnr/spacemacs @@ -103,8 +103,12 @@ (when typescript-fmt-on-save (add-hook 'typescript-tsx-mode-hook 'spacemacs/typescript-fmt-before-save-hook)) (spacemacs/set-leader-keys-for-major-mode 'typescript-tsx-mode - "=" 'spacemacs/typescript-format - "p" 'spacemacs/typescript-open-region-in-playground)) + "p" 'spacemacs/typescript-open-region-in-playground) + (pcase (spacemacs//typescript-backend) + ('lsp (spacemacs/set-leader-keys-for-major-mode 'typescript-mode + "==" 'spacemacs/typescript-format)) + (_ (spacemacs/set-leader-keys-for-major-mode 'typescript-mode + "=" 'spacemacs/typescript-format)))) (defun typescript/post-init-yasnippet () (spacemacs/add-to-hooks #'spacemacs/typescript-yasnippet-setup '(typescript-mode-hook @@ -123,8 +127,12 @@ (when typescript-fmt-on-save (add-hook 'typescript-mode-hook 'spacemacs/typescript-fmt-before-save-hook)) (spacemacs/set-leader-keys-for-major-mode 'typescript-mode - "=" 'spacemacs/typescript-format - "p" 'spacemacs/typescript-open-region-in-playground))))) + "p" 'spacemacs/typescript-open-region-in-playground) + (pcase (spacemacs//typescript-backend) + ('lsp (spacemacs/set-leader-keys-for-major-mode 'typescript-mode + "==" 'spacemacs/typescript-format)) + (_ (spacemacs/set-leader-keys-for-major-mode 'typescript-mode + "=" 'spacemacs/typescript-format))))))) (defun typescript/pre-init-import-js () (if (eq javascript-import-tool 'import-js) diff --git a/dot_emacs.d/layers/+lang/windows-scripts/config.el b/dot_emacs.d/layers/+lang/windows-scripts/config.el index e534dc9..3d37b83 100644 --- a/dot_emacs.d/layers/+lang/windows-scripts/config.el +++ b/dot_emacs.d/layers/+lang/windows-scripts/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Windows Scripts Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/yaml/config.el b/dot_emacs.d/layers/+lang/yaml/config.el index cd5878b..9efd064 100644 --- a/dot_emacs.d/layers/+lang/yaml/config.el +++ b/dot_emacs.d/layers/+lang/yaml/config.el @@ -1,6 +1,6 @@ ;;; config.el --- YAML Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/yaml/layers.el b/dot_emacs.d/layers/+lang/yaml/layers.el index c5c8e5a..dc2bcf1 100644 --- a/dot_emacs.d/layers/+lang/yaml/layers.el +++ b/dot_emacs.d/layers/+lang/yaml/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- YAML Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Maximilian Wolff ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/yaml/packages.el b/dot_emacs.d/layers/+lang/yaml/packages.el index 289a486..ed50f4e 100644 --- a/dot_emacs.d/layers/+lang/yaml/packages.el +++ b/dot_emacs.d/layers/+lang/yaml/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- YAML Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/yang/config.el b/dot_emacs.d/layers/+lang/yang/config.el index 24d2a5d..c735d45 100644 --- a/dot_emacs.d/layers/+lang/yang/config.el +++ b/dot_emacs.d/layers/+lang/yang/config.el @@ -1,6 +1,6 @@ ;;; config.el --- yang layer config file for Spacemacs. ;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian Hopps ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+lang/yang/packages.el b/dot_emacs.d/layers/+lang/yang/packages.el index 960bf22..9742d11 100644 --- a/dot_emacs.d/layers/+lang/yang/packages.el +++ b/dot_emacs.d/layers/+lang/yang/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- YANG Layer packages file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian Hopps ;; Originally started with checker definition from flycheck-yang project. diff --git a/dot_emacs.d/layers/+lang/zig/packages.el b/dot_emacs.d/layers/+lang/zig/packages.el index a64fe2c..0317026 100644 --- a/dot_emacs.d/layers/+lang/zig/packages.el +++ b/dot_emacs.d/layers/+lang/zig/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- zig layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/copy-as-format/packages.el b/dot_emacs.d/layers/+misc/copy-as-format/packages.el index a899f0a..539a52e 100644 --- a/dot_emacs.d/layers/+misc/copy-as-format/packages.el +++ b/dot_emacs.d/layers/+misc/copy-as-format/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- copy-as-format layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ruslan Kamashev ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/dtrt-indent/README.org b/dot_emacs.d/layers/+misc/dtrt-indent/README.org new file mode 100644 index 0000000..4bf3099 --- /dev/null +++ b/dot_emacs.d/layers/+misc/dtrt-indent/README.org @@ -0,0 +1,25 @@ +#+TITLE: dtrt-indent layer + +#+TAGS: layer|misc + +Spacemacs layer wrapping the Emacs package [[https://github.com/jscheid/dtrt-indent][dtrt-indent]]. +This package enables automatic detection and switching of indentation style to match the current file. +See the [[https://github.com/jscheid/dtrt-indent][dtrt-indent]] repo for more details. + +* Table of Contents :TOC_5_gh:noexport: +- [[#description][Description]] + - [[#features][Features:]] +- [[#install][Install]] + +* Description +This is a simple layer wrapping the dtrt-indent Emacs package for automatic detection and switching of indentation style. + +It is automatically enabled using the method [[https://github.com/syl20bnr/spacemacs/issues/3203#issuecomment-264175032][suggested here]]. + +** Features: +- Indentation style detection and automatic configuration to match file in open buffer. + +* Install +To use this configuration layer, add it to your =~/.spacemacs=. You will need to +add =dtrt-indent= to the existing =dotspacemacs-configuration-layers= list in this +file. diff --git a/dot_emacs.d/layers/+misc/dtrt-indent/packages.el b/dot_emacs.d/layers/+misc/dtrt-indent/packages.el new file mode 100644 index 0000000..34230a8 --- /dev/null +++ b/dot_emacs.d/layers/+misc/dtrt-indent/packages.el @@ -0,0 +1,25 @@ +;;; packages.el --- dtrt-indent layer packages file for Spacemacs. +;; +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors +;; +;; Author: Kevin Doherty +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defconst dtrt-indent-packages '(dtrt-indent)) + +(defun dtrt-indent/init-dtrt-indent () + (use-package dtrt-indent + :hook (prog-mode . + (lambda () + (modify-syntax-entry ?_ "w") + (dtrt-indent-mode) + (dtrt-indent-adapt))) + :config + (progn + (spacemacs|hide-lighter dtrt-indent-mode)))) + +;;; packages.el ends here diff --git a/dot_emacs.d/layers/+misc/ietf/config.el b/dot_emacs.d/layers/+misc/ietf/config.el index 430dc51..810fcc0 100644 --- a/dot_emacs.d/layers/+misc/ietf/config.el +++ b/dot_emacs.d/layers/+misc/ietf/config.el @@ -1,6 +1,6 @@ ;;; config.el --- ietf layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian Hopps ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/ietf/packages.el b/dot_emacs.d/layers/+misc/ietf/packages.el index 89360b9..7d2be10 100644 --- a/dot_emacs.d/layers/+misc/ietf/packages.el +++ b/dot_emacs.d/layers/+misc/ietf/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- ietf layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian Hopps ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/multiple-cursors/config.el b/dot_emacs.d/layers/+misc/multiple-cursors/config.el index 0279e98..182e86e 100644 --- a/dot_emacs.d/layers/+misc/multiple-cursors/config.el +++ b/dot_emacs.d/layers/+misc/multiple-cursors/config.el @@ -2,7 +2,7 @@ ;; ;;; config.el --- Spacemacs Multiple Cursors Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Codruț Constantin Gușoi ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/multiple-cursors/funcs.el b/dot_emacs.d/layers/+misc/multiple-cursors/funcs.el index fd3382a..c8a33de 100644 --- a/dot_emacs.d/layers/+misc/multiple-cursors/funcs.el +++ b/dot_emacs.d/layers/+misc/multiple-cursors/funcs.el @@ -2,7 +2,7 @@ ;; ;;; funcs.el --- Spacemacs Multiple Cursors Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Codruț Constantin Gușoi ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/multiple-cursors/packages.el b/dot_emacs.d/layers/+misc/multiple-cursors/packages.el index 2dff6ba..e2c9048 100644 --- a/dot_emacs.d/layers/+misc/multiple-cursors/packages.el +++ b/dot_emacs.d/layers/+misc/multiple-cursors/packages.el @@ -2,7 +2,7 @@ ;; ;;; packages.el --- Spacemacs Multiple Cursors Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Codruț Constantin Gușoi ;; URL: https://github.com/syl20bnr/spacemacs @@ -24,6 +24,7 @@ (add-hook 'text-mode-hook 'turn-on-evil-mc-mode)) :config (progn + (add-hook 'magit-mode-hook 'turn-off-evil-mc-mode) (setq-default evil-mc-one-cursor-show-mode-line-text nil) (when (or (spacemacs/system-is-mac) (spacemacs/system-is-mswindows)) (setq evil-mc-enable-bar-cursor nil)) diff --git a/dot_emacs.d/layers/+misc/nlinum/funcs.el b/dot_emacs.d/layers/+misc/nlinum/funcs.el index cc7bf22..c469604 100644 --- a/dot_emacs.d/layers/+misc/nlinum/funcs.el +++ b/dot_emacs.d/layers/+misc/nlinum/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- nlinum Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thomas de Beauchêne ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/nlinum/packages.el b/dot_emacs.d/layers/+misc/nlinum/packages.el index 19152ca..7c281e8 100644 --- a/dot_emacs.d/layers/+misc/nlinum/packages.el +++ b/dot_emacs.d/layers/+misc/nlinum/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- nlinum Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+misc/parinfer/packages.el b/dot_emacs.d/layers/+misc/parinfer/packages.el index 9239984..742a185 100644 --- a/dot_emacs.d/layers/+misc/parinfer/packages.el +++ b/dot_emacs.d/layers/+misc/parinfer/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- parinfer layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: DogLooksGood ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+music/pianobar/config.el b/dot_emacs.d/layers/+music/pianobar/config.el index 7dd16d7..330d99d 100644 --- a/dot_emacs.d/layers/+music/pianobar/config.el +++ b/dot_emacs.d/layers/+music/pianobar/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Pianobar Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Leo Littlebook ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+music/pianobar/packages.el b/dot_emacs.d/layers/+music/pianobar/packages.el index 70dc9dc..e7525d2 100644 --- a/dot_emacs.d/layers/+music/pianobar/packages.el +++ b/dot_emacs.d/layers/+music/pianobar/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- pianobar Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Leo Littlebook ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+music/spotify/packages.el b/dot_emacs.d/layers/+music/spotify/packages.el index 87d1e4f..3e95257 100644 --- a/dot_emacs.d/layers/+music/spotify/packages.el +++ b/dot_emacs.d/layers/+music/spotify/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- spotify Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+os/osx/README.org b/dot_emacs.d/layers/+os/osx/README.org index 01c2873..71747c8 100644 --- a/dot_emacs.d/layers/+os/osx/README.org +++ b/dot_emacs.d/layers/+os/osx/README.org @@ -40,7 +40,7 @@ add =osx= to the existing =dotspacemacs-configuration-layers= list in this file. The different modifier keys can be set as follows: #+BEGIN_SRC emacs-lisp - (setq-defaults dotspacemacs-configuration-layers '( + (setq-default dotspacemacs-configuration-layers '( (osx :variables osx-command-as 'hyper osx-option-as 'meta osx-control-as 'control @@ -48,7 +48,7 @@ The different modifier keys can be set as follows: osx-right-command-as 'left osx-right-option-as 'left osx-right-control-as 'left - osx-swap-option-and-command nil)) + osx-swap-option-and-command nil))) #+END_SRC These are also the default values. Setting the right modifier to =left= diff --git a/dot_emacs.d/layers/+os/osx/config.el b/dot_emacs.d/layers/+os/osx/config.el index 64f05a6..94aaf54 100644 --- a/dot_emacs.d/layers/+os/osx/config.el +++ b/dot_emacs.d/layers/+os/osx/config.el @@ -1,6 +1,6 @@ ;;; config.el --- OSX Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+os/osx/funcs.el b/dot_emacs.d/layers/+os/osx/funcs.el index 4e177e1..e679d5b 100644 --- a/dot_emacs.d/layers/+os/osx/funcs.el +++ b/dot_emacs.d/layers/+os/osx/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- OSX Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Boris Buliga ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+os/osx/keybindings.el b/dot_emacs.d/layers/+os/osx/keybindings.el index 368ea24..b0f0cc8 100644 --- a/dot_emacs.d/layers/+os/osx/keybindings.el +++ b/dot_emacs.d/layers/+os/osx/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- OSX Layer keybindings File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+os/osx/packages.el b/dot_emacs.d/layers/+os/osx/packages.el index 79f0fa2..fc35e46 100644 --- a/dot_emacs.d/layers/+os/osx/packages.el +++ b/dot_emacs.d/layers/+os/osx/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- OSX Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+pair-programming/floobits/packages.el b/dot_emacs.d/layers/+pair-programming/floobits/packages.el index 652c478..2bea918 100644 --- a/dot_emacs.d/layers/+pair-programming/floobits/packages.el +++ b/dot_emacs.d/layers/+pair-programming/floobits/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- floobits Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Rodolfo Hansen ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+readers/dash/config.el b/dot_emacs.d/layers/+readers/dash/config.el index 8688283..f22c833 100644 --- a/dot_emacs.d/layers/+readers/dash/config.el +++ b/dot_emacs.d/layers/+readers/dash/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Dash Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+readers/dash/funcs.el b/dot_emacs.d/layers/+readers/dash/funcs.el index c53ce60..583725b 100644 --- a/dot_emacs.d/layers/+readers/dash/funcs.el +++ b/dot_emacs.d/layers/+readers/dash/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Dash Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; URL: https://github.com/syl20bnr/spacemacs ;; diff --git a/dot_emacs.d/layers/+readers/deft/config.el b/dot_emacs.d/layers/+readers/deft/config.el index 41e4a6b..0c61c48 100644 --- a/dot_emacs.d/layers/+readers/deft/config.el +++ b/dot_emacs.d/layers/+readers/deft/config.el @@ -1,6 +1,6 @@ ;;; config.el --- deft Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; Bruno Morais diff --git a/dot_emacs.d/layers/+readers/deft/packages.el b/dot_emacs.d/layers/+readers/deft/packages.el index aa72ce9..0d50104 100644 --- a/dot_emacs.d/layers/+readers/deft/packages.el +++ b/dot_emacs.d/layers/+readers/deft/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- deft Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; Bruno Morais diff --git a/dot_emacs.d/layers/+readers/elfeed/config.el b/dot_emacs.d/layers/+readers/elfeed/config.el index a32f1d0..85103d9 100644 --- a/dot_emacs.d/layers/+readers/elfeed/config.el +++ b/dot_emacs.d/layers/+readers/elfeed/config.el @@ -1,6 +1,6 @@ ;;; config.el --- elfeed Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+readers/elfeed/packages.el b/dot_emacs.d/layers/+readers/elfeed/packages.el index 02013d1..6982071 100644 --- a/dot_emacs.d/layers/+readers/elfeed/packages.el +++ b/dot_emacs.d/layers/+readers/elfeed/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- elfeed Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+readers/epub/packages.el b/dot_emacs.d/layers/+readers/epub/packages.el index f6ab4cf..2a73284 100644 --- a/dot_emacs.d/layers/+readers/epub/packages.el +++ b/dot_emacs.d/layers/+readers/epub/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- epub layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Jeremy Dormitzer ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+readers/pdf/packages.el b/dot_emacs.d/layers/+readers/pdf/packages.el index 405af47..df94a4b 100644 --- a/dot_emacs.d/layers/+readers/pdf/packages.el +++ b/dot_emacs.d/layers/+readers/pdf/packages.el @@ -1,7 +1,7 @@ ;;; packages.el --- PDF Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner -;; Copyright (c) 2014-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner +;; Copyright (c) 2020-2020 Sylvain Benner & Contributors ;; ;; Author: André Peric Tavares ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+readers/speed-reading/packages.el b/dot_emacs.d/layers/+readers/speed-reading/packages.el index e9a4807..b3820b1 100644 --- a/dot_emacs.d/layers/+readers/speed-reading/packages.el +++ b/dot_emacs.d/layers/+readers/speed-reading/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- speed-reading Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/git/config.el b/dot_emacs.d/layers/+source-control/git/config.el index 3e5a3e6..ec461bc 100644 --- a/dot_emacs.d/layers/+source-control/git/config.el +++ b/dot_emacs.d/layers/+source-control/git/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Git Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -17,5 +17,9 @@ (defvar git-magit-status-fullscreen nil "If non nil magit-status buffer is displayed in fullscreen.") +(defvar git-enable-magit-delta-plugin nil + "If non nil `magit-delta-mode' plugin is enabled.") + (defvar spacemacs--git-blame-ts-full-hint-toggle nil "Display git blame transient state documentation.") + diff --git a/dot_emacs.d/layers/+source-control/git/funcs.el b/dot_emacs.d/layers/+source-control/git/funcs.el index e28396f..e499a96 100644 --- a/dot_emacs.d/layers/+source-control/git/funcs.el +++ b/dot_emacs.d/layers/+source-control/git/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Colors Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/git/packages.el b/dot_emacs.d/layers/+source-control/git/packages.el index 0e6bb30..9dcebbb 100644 --- a/dot_emacs.d/layers/+source-control/git/packages.el +++ b/dot_emacs.d/layers/+source-control/git/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Git Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -25,6 +25,7 @@ (helm-git-grep :requires helm) (helm-gitignore :requires helm) magit + (magit-delta :toggle git-enable-magit-delta-plugin) magit-gitflow magit-section magit-svn @@ -151,7 +152,7 @@ (progn (push "magit: .*" spacemacs-useless-buffers-regexp) (push "magit-.*: .*" spacemacs-useless-buffers-regexp) - (spacemacs|require 'magit) + (spacemacs|require-when-dumping 'magit) (setq magit-completing-read-function (if (configuration-layer/layer-used-p 'ivy) 'ivy-completing-read @@ -233,6 +234,12 @@ ;; whitespace (define-key magit-status-mode-map (kbd "C-S-w") 'spacemacs/magit-toggle-whitespace) + ;; https://magit.vc/manual/magit/MacOS-Performance.html + ;; But modified according Tommi Komulainen's advice: "...going through + ;; shell raises an eyebrow, and in the odd edge case of not having git + ;; setting the executable to empty string(?) feels slightly wrong." + (when-let ((git (executable-find "git"))) + (setq magit-git-executable git)) ;; full screen magit-status (when git-magit-status-fullscreen (setq magit-display-buffer-function @@ -251,10 +258,17 @@ (evil-define-key 'normal magit-section-mode-map (kbd "M-8") 'winum-select-window-8) (evil-define-key 'normal magit-section-mode-map (kbd "M-9") 'winum-select-window-9)))) +(defun git/init-magit-delta () + (use-package magit-delta + :defer t + :init (add-hook 'magit-mode-hook 'magit-delta-mode))) + (defun git/init-magit-gitflow () (use-package magit-gitflow :defer t - :init (add-hook 'magit-mode-hook 'turn-on-magit-gitflow) + :init (progn + (add-hook 'magit-mode-hook 'turn-on-magit-gitflow) + (setq magit-gitflow-popup-key "%")) :config (progn (spacemacs|diminish magit-gitflow-mode "Flow") diff --git a/dot_emacs.d/layers/+source-control/github/funcs.el b/dot_emacs.d/layers/+source-control/github/funcs.el index 2802714..7615357 100644 --- a/dot_emacs.d/layers/+source-control/github/funcs.el +++ b/dot_emacs.d/layers/+source-control/github/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- GitHub layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/github/layers.el b/dot_emacs.d/layers/+source-control/github/layers.el index f9df149..063d14b 100644 --- a/dot_emacs.d/layers/+source-control/github/layers.el +++ b/dot_emacs.d/layers/+source-control/github/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- GitHub layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/github/packages.el b/dot_emacs.d/layers/+source-control/github/packages.el index 1b5cfd1..3a74c02 100644 --- a/dot_emacs.d/layers/+source-control/github/packages.el +++ b/dot_emacs.d/layers/+source-control/github/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Github Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/perforce/packages.el b/dot_emacs.d/layers/+source-control/perforce/packages.el index c84323a..8b1aaa4 100644 --- a/dot_emacs.d/layers/+source-control/perforce/packages.el +++ b/dot_emacs.d/layers/+source-control/perforce/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Perforce Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/version-control/config.el b/dot_emacs.d/layers/+source-control/version-control/config.el index 2931452..f410114 100644 --- a/dot_emacs.d/layers/+source-control/version-control/config.el +++ b/dot_emacs.d/layers/+source-control/version-control/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Version Control configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/version-control/funcs.el b/dot_emacs.d/layers/+source-control/version-control/funcs.el index 86b7aac..6ebc698 100644 --- a/dot_emacs.d/layers/+source-control/version-control/funcs.el +++ b/dot_emacs.d/layers/+source-control/version-control/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Version control functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -152,3 +152,6 @@ the number of conflicts detected by `smerge-mode'." (interactive) (setq spacemacs--smerge-ts-full-hint-toggle (not spacemacs--smerge-ts-full-hint-toggle))) + +(defun spacemacs//git-gutter+-refresh-in-all-buffers () + (git-gutter+-in-all-buffers (when git-gutter+-mode (git-gutter+-refresh)))) diff --git a/dot_emacs.d/layers/+source-control/version-control/keybindings.el b/dot_emacs.d/layers/+source-control/version-control/keybindings.el index 1d83e5d..bd23361 100644 --- a/dot_emacs.d/layers/+source-control/version-control/keybindings.el +++ b/dot_emacs.d/layers/+source-control/version-control/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Version control keybindings ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+source-control/version-control/packages.el b/dot_emacs.d/layers/+source-control/version-control/packages.el index 84a7308..2b3ed9e 100644 --- a/dot_emacs.d/layers/+source-control/version-control/packages.el +++ b/dot_emacs.d/layers/+source-control/version-control/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Source Control Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -205,7 +205,8 @@ (progn ;; If you enable global minor mode (when version-control-global-margin - (add-hook 'magit-pre-refresh-hook 'git-gutter+-refresh) + (add-hook 'magit-pre-refresh-hook + #'spacemacs//git-gutter+-refresh-in-all-buffers) (run-with-idle-timer 1 nil 'global-git-gutter+-mode)) (setq git-gutter+-modified-sign " " diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-completion/config.el b/dot_emacs.d/layers/+spacemacs/spacemacs-completion/config.el index cdc17db..1a5fed2 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-completion/config.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-completion/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spacemacs Completion Layer configuration File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-completion/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-completion/funcs.el index 9332d4f..cc08a8b 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-completion/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-completion/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Completion Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -203,7 +203,8 @@ See https://github.com/syl20bnr/spacemacs/issues/3700" (and (eq 'hybrid style) hybrid-style-enable-hjkl-bindings)) (dolist (map (list ivy-minibuffer-map - ivy-switch-buffer-map)) + ivy-switch-buffer-map + ivy-reverse-i-search-map)) (define-key map (kbd "C-j") 'ivy-next-line) (define-key map (kbd "C-k") 'ivy-previous-line)) (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL")) diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-completion/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-completion/packages.el index b93b8e3..78e7322 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-completion/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-completion/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Completion Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/README.org b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/README.org index fae6007..235a0b5 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/README.org +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/README.org @@ -16,6 +16,7 @@ defaults. - archive-mode - bookmark - conf-mode + - cus-edit - dired - dired-x - display-line-numbers (only in Emacs 26.x and newer) diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/config.el b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/config.el index 3246092..a90e79a 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/config.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spacemacs Defaults Layer configuration File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/funcs.el index a150ae9..ca45d66 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Defaults Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -95,6 +95,17 @@ automatically applied to." :group 'spacemacs :type '(list symbol)) +(defun spacemacs/custom-newline (pos) + "Make `RET' in a Custom-mode search box trigger that field's action, rather +than enter an actual newline, which is useless and unexpected in a search box. +If not in such a search box, fall back on `Custom-newline'." + (interactive "d") + (let ((w (widget-at))) + (if (and w + (eq 'editable-field (widget-type w)) + (string-prefix-p "Search" (widget-get w :help-echo))) + (funcall (widget-get w :action) w) + (Custom-newline pos)))) ;; ido-mode remaps some commands to ido counterparts. We want default Emacs key ;; bindings (those under C-x) to use ido, but we want to use the original @@ -250,30 +261,35 @@ Dedicated (locked) windows are left untouched." "Moves a buffer to a window, using the spacemacs numbering. follow-focus-p controls whether focus moves to new window (with buffer), or stays on current" (interactive) - (let ((b (current-buffer)) - (w1 (selected-window)) - (w2 (winum-get-window-by-number windownum))) - (unless (eq w1 w2) - (set-window-buffer w2 b) - (switch-to-prev-buffer) - (unrecord-window-buffer w1 b))) - (when follow-focus-p (select-window (winum-get-window-by-number windownum)))) + (if (> windownum (length (window-list))) + (message "No window numbered %s" windownum) + (let ((b (current-buffer)) + (w1 (selected-window)) + (w2 (winum-get-window-by-number windownum))) + (unless (eq w1 w2) + (set-window-buffer w2 b) + (switch-to-prev-buffer) + (unrecord-window-buffer w1 b)) + (when follow-focus-p + (select-window (winum-get-window-by-number windownum)))))) (defun spacemacs/swap-buffers-to-window (windownum follow-focus-p) "Swaps visible buffers between active window and selected window. follow-focus-p controls whether focus moves to new window (with buffer), or stays on current" (interactive) - (let* ((b1 (current-buffer)) - (w1 (selected-window)) - (w2 (winum-get-window-by-number windownum)) - (b2 (window-buffer w2))) - (unless (eq w1 w2) - (set-window-buffer w1 b2) - (set-window-buffer w2 b1) - (unrecord-window-buffer w1 b1) - (unrecord-window-buffer w2 b2))) - (when follow-focus-p (winum-select-window-by-number windownum))) + (if (> windownum (length (window-list))) + (message "No window numbered %s" windownum) + (let* ((b1 (current-buffer)) + (w1 (selected-window)) + (w2 (winum-get-window-by-number windownum)) + (b2 (window-buffer w2))) + (unless (eq w1 w2) + (set-window-buffer w1 b2) + (set-window-buffer w2 b1) + (unrecord-window-buffer w1 b1) + (unrecord-window-buffer w2 b2))) + (when follow-focus-p (winum-select-window-by-number windownum)))) (dotimes (i 9) (let ((n (+ i 1))) @@ -1504,7 +1520,8 @@ if prefix argument ARG is given, switch to it in an other, possibly new window." (when (and (not exists) (not (eq major-mode dotspacemacs-scratch-mode)) (fboundp dotspacemacs-scratch-mode)) - (funcall dotspacemacs-scratch-mode)))) + (funcall dotspacemacs-scratch-mode) + (run-hooks 'spacemacs-scratch-mode-hook)))) (defvar spacemacs--killed-buffer-list nil "List of recently killed buffers.") diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/keybindings.el b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/keybindings.el index 869c970..2a71e92 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/keybindings.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Spacemacs Defaults Layer key-bindings File ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -30,7 +30,6 @@ ("aw" "web-services") ("c" "compile/comments") ("C" "capture/colors") - ("d" "documentation") ("e" "errors") ("g" "git/versions-control") ("h" "help") @@ -403,7 +402,8 @@ "hdp" 'describe-package "hdP" 'configuration-layer/describe-package "hds" 'spacemacs/describe-system-info - "hdt" 'describe-theme + "hdt" 'describe-text-properties + "hdT" 'describe-theme "hdv" 'describe-variable "hI" 'spacemacs/report-issue "hn" 'view-emacs-news diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/packages.el index 633382b..d9d024a 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-defaults/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Defaults Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -15,6 +15,9 @@ (archive-mode :location built-in) (bookmark :location built-in) (conf-mode :location built-in) + (cus-edit :location built-in + :toggle (or (eq 'vim dotspacemacs-editing-style) + (eq 'hybrid dotspacemacs-editing-style))) (dired :location built-in) (dired-x :location built-in) (display-line-numbers :location built-in @@ -70,6 +73,44 @@ ;; explicitly derive conf-mode from text-mode major-mode (add-hook 'conf-mode-hook 'spacemacs/run-text-mode-hooks)) +(defun spacemacs-defaults/init-cus-edit () + ;; Arguably a Vim user's first expectation for such a buffer would be a kind + ;; of normal mode; besides, `evilified' conflicts with text insertion for + ;; search. + (evil-set-initial-state 'Custom-mode 'normal) + ;; Notes on how this effects the default `custom-mode-map': + ;; - `TAB' works as `widget-forward' without modification + ;; - `' works as `widget-backward' without modification + ;; - `n' as `widget-forward' is redundant with `TAB' and collides with the + ;; - `evil-ex-search-next' mapping which is useful here. Omitting + ;; intensionally. + ;; - `p' doesn't make any sense without `n' and is redundant with `'. + ;; Omitting intensionally. + ;; - `q' as `Custom-buffer-done' conflicts with the Evil record macro + ;; binding, which is, however, of questionable value in a Custom buffer; + ;; and there is precedent in many other Spacemacs contexts to bind it to + ;; quit actions rather than default evil one; choosing to restore. + ;; - `SPC' as `scroll-up-command' conflicts with the all-important Spacemacs + ;; menu. Omitting intensionally. Evil `C-u' works instead. + ;; - `S-SPC' as `scroll-down-command' makes no sense without `SPC' as + ;; `scroll-up-command'. Evil `C-d' works instead. + ;; - `C-x' as a prefix command still works. + ;; - `C-c' as a prefix command still works. + ;; - `u' as `Custom-goto-parent' conflicts with Evil undo. However it is + ;; questionable whether this will work properly in a Custom buffer; + ;; choosing to restore this binding. + (evil-define-key 'normal custom-mode-map (kbd "q") 'Custom-buffer-done) + (evil-define-key 'normal custom-mode-map (kbd "u") 'Custom-goto-parent) + ;; `RET' does not work well in the search field. Fix: + (evil-define-key '(insert normal) custom-mode-map (kbd "RET") 'spacemacs/custom-newline) + ;; There is a separate map for links, oddly enough. Separate it from the + ;; `custom-mode-map' bindings, which is its parent by default. + (set-keymap-parent custom-mode-link-map nil) + ;; Evil doesn't seem to be properly in control of what is going on in these + ;; widget-induced keymaps, so just use base bindings to sort this out + (define-key custom-mode-link-map (kbd "q") 'Custom-buffer-done) + (define-key custom-mode-link-map (kbd "u") 'Custom-goto-parent)) + (defun spacemacs-defaults/init-dired () (spacemacs/set-leader-keys "ad" 'spacemacs/dired @@ -135,7 +176,7 @@ (defun spacemacs-defaults/init-eldoc () (use-package eldoc :defer (spacemacs/defer) - :init (spacemacs|require 'eldoc) + :init (spacemacs|require-when-dumping 'eldoc) :config (progn ;; enable eldoc in `eval-expression' @@ -210,7 +251,21 @@ (t (setq display-line-numbers-type t))) + (spacemacs/declare-prefix "tn" "line-numbers") + + ;; backwards compatibility of symbols: + ;; keep the spacemacs/toggle-line-numbers & friends around (spacemacs|add-toggle line-numbers + :status (and (featurep 'display-line-numbers) + display-line-numbers-mode + (eq display-line-numbers t)) + :on (prog1 (display-line-numbers-mode) + (setq display-line-numbers t)) + :off (display-line-numbers-mode -1) + :on-message "Absolute line numbers enabled." + :off-message "Line numbers disabled." + :documentation "Show the line numbers.") + (spacemacs|add-toggle absolute-line-numbers :status (and (featurep 'display-line-numbers) display-line-numbers-mode (eq display-line-numbers t)) @@ -220,7 +275,7 @@ :on-message "Absolute line numbers enabled." :off-message "Line numbers disabled." :documentation "Show the line numbers." - :evil-leader "tn") + :evil-leader "tna") (spacemacs|add-toggle relative-line-numbers :status (and (featurep 'display-line-numbers) display-line-numbers-mode @@ -231,7 +286,8 @@ :documentation "Show relative line numbers." :on-message "Relative line numbers enabled." :off-message "Line numbers disabled." - :evil-leader "tr") + :evil-leader "tnr") + (spacemacs|add-toggle visual-line-numbers :status (and (featurep 'display-line-numbers) display-line-numbers-mode @@ -242,7 +298,7 @@ :documentation "Show relative visual line numbers." :on-message "Visual line numbers enabled." :off-message "Line numbers disabled." - :evil-leader "tV") + :evil-leader "tnv") (when (spacemacs//linum-backward-compabitility) (add-hook 'prog-mode-hook 'display-line-numbers-mode) @@ -307,7 +363,7 @@ :commands (recentf-save-list) :init (progn - (spacemacs|require 'recentf) + (spacemacs|require-when-dumping 'recentf) (when (spacemacs/defer) (add-hook 'find-file-hook (lambda () (unless recentf-mode (recentf-mode) diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/funcs.el index f766910..c55d0ab 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Editing Visual Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/packages.el index b0830da..35ba1ee 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-editing-visual/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Editing Visual Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-editing/README.org b/dot_emacs.d/layers/+spacemacs/spacemacs-editing/README.org index ca5fe4c..26d75f3 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-editing/README.org +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-editing/README.org @@ -20,7 +20,7 @@ This layer adds packages to improve editing with Spacemacs. - Support for selecting, copying and opening links using =avy= via =link-hint=. - Adding of sample text via =lorem-ipsum=. - Transient state for moving text via =move-text=. -- Support for folding of code via =origami=. +- Support for folding of code via =origami= and =evil-vimish-fold=. - Support for password generation via =password-generator=. - Support for improving parenthesis handling via =smartparens=. - Automatic whitespace cleanup on save via =spacemacs-whitespace-cleanup=. diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-editing/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-editing/funcs.el index a246e1b..5fd8887 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-editing/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-editing/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs editing Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-editing/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-editing/packages.el index 2d01f1e..2cd50ca 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-editing/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-editing/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Editing Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -31,6 +31,8 @@ string-inflection undo-tree uuidgen + (vimish-fold :toggle (eq 'vimish dotspacemacs-folding-method)) + (evil-vimish-fold :toggle (eq 'vimish dotspacemacs-folding-method)) ws-butler)) ;; Initialization of packages @@ -275,6 +277,18 @@ ;; Note: The key binding for the fold transient state is defined in ;; evil config +(defun spacemacs-editing/init-vimish-fold () + (use-package vimish-fold + :ensure + :after evil)) + +(defun spacemacs-editing/init-evil-vimish-fold () + (use-package evil-vimish-fold + :ensure + :after vimish-fold + :init + (setq evil-vimish-fold-target-modes '(prog-mode conf-mode text-mode)) + :config (global-evil-vimish-fold-mode))) (defun spacemacs-editing/init-password-generator () (use-package password-generator @@ -416,13 +430,16 @@ (defun spacemacs-editing/init-undo-tree () (use-package undo-tree :defer t - :init (setq undo-tree-visualizer-timestamps t - undo-tree-visualizer-diff t - ;; 10X bump of the undo limits to avoid issues with premature - ;; Emacs GC which truncages the undo history very aggresively - undo-limit 800000 - undo-strong-limit 12000000 - undo-outer-limit 120000000) + :init + (progn + (setq undo-tree-visualizer-timestamps t + undo-tree-visualizer-diff t + ;; 10X bump of the undo limits to avoid issues with premature + ;; Emacs GC which truncages the undo history very aggresively + undo-limit 800000 + undo-strong-limit 12000000 + undo-outer-limit 120000000) + (global-undo-tree-mode)) :config (progn ;; restore diff window after quit. TODO fix upstream diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-evil/config.el b/dot_emacs.d/layers/+spacemacs/spacemacs-evil/config.el index f1e4247..5efc1c1 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-evil/config.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-evil/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spacemacs-evil Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-evil/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-evil/funcs.el index 74ac540..6727048 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-evil/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-evil/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Evil Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-evil/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-evil/packages.el index fc62b0e..dc287f8 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-evil/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-evil/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Evil Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-language/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-language/packages.el index 80e3eec..2daf3a4 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-language/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-language/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Language Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/config.el b/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/config.el index e60e4da..d90f803 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/config.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spacemacs Layouts Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/funcs.el index e58460b..04ec705 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Layouts Layer functions File -*- lexical-binding: t; -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/packages.el index 00ac6be..72a0a5f 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-layouts/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Layouts Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-misc/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-misc/packages.el index 98a0e3c..2096ed6 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-misc/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-misc/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Misc. Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/config.el b/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/config.el index 7b0287b..983cb0a 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/config.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Spacemacs Mode-line Visual Layer configuration File ;; -;; Copyright (c) 2016 Sylvain Benner & Contributors +;; Copyright (c) 2020 Sylvain Benner & Contributors ;; ;; Author: Riccardo Murri ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/funcs.el index ca755df..a83da53 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Mode-line Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -18,8 +18,14 @@ (defun spacemacs/mode-line-separator () "Return the separator type for the mode-line. Return nil if no separator is defined." - (when (listp dotspacemacs-mode-line-theme) - (plist-get (cdr dotspacemacs-mode-line-theme) :separator))) + (let ((separator (when (listp dotspacemacs-mode-line-theme) + (plist-get (cdr dotspacemacs-mode-line-theme) :separator)))) + ;; `utf-8' separator is not supported by all-the-icons font + ;; we force `utf-8' to be `arrow' + (if (and (eq 'utf-8 separator) + (eq 'all-the-icons (spacemacs/get-mode-line-theme-name))) + 'arrow + separator))) (defun spacemacs/mode-line-separator-scale () "Return the separator scale for the mode-line. @@ -32,6 +38,24 @@ Return nil if no scale is defined." ;; spaceline +(defun spacemacs/spaceline-config-startup-hook () + "Install a transient hook to delay spaceline config after Emacs starts." + (spacemacs|add-transient-hook window-configuration-change-hook + (lambda () (spacemacs/spaceline-config-startup)) lazy-load-spaceline)) + +(defun spacemacs/spaceline-config-startup () + "Compile the spaceline config." + (setq spaceline-byte-compile t) + ;; this must also be set in this hook because + ;; (spacemacs/compute-mode-line-height) returns incorrect + ;; results if it is called before the display system is + ;; initialized. see issue for details: + ;; https://github.com/syl20bnr/spacemacs/issues/10181 + (setq powerline-height + (spacemacs/compute-mode-line-height)) + (spaceline-compile)) + + (defun spacemacs/customize-powerline-faces () "Alter powerline face to make them work with more themes." (when (boundp 'powerline-inactive2) diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/packages.el index 9cc2a59..2b630b0 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-modeline/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Mode-line Visual Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -32,9 +32,13 @@ (spaceline-all-the-icons--setup-anzu))) (defun spacemacs-modeline/init-doom-modeline () - (use-package doom-modeline - :defer t - :init (doom-modeline-mode))) + ;; doom modeline depends on `display-graphic-p' so we delay its initialization + ;; as when dumping we don't know yet wether we are using a graphical emacs or + ;; not. + (spacemacs|unless-dumping-and-eval-after-loaded-dump doom-modeline + (use-package doom-modeline + :defer t + :init (doom-modeline-mode)))) (defun spacemacs-modeline/init-fancy-battery () (use-package fancy-battery @@ -59,20 +63,11 @@ '(spacemacs all-the-icons custom)) :init (progn - (add-hook 'emacs-startup-hook - (lambda () - (spacemacs|add-transient-hook window-configuration-change-hook - (lambda () - (setq spaceline-byte-compile t) - ;; this must also be set in this hook because - ;; (spacemacs/compute-mode-line-height) returns incorrect - ;; results if it is called before the display system is - ;; initialized. see issue for details: - ;; https://github.com/syl20bnr/spacemacs/issues/10181 - (setq powerline-height - (spacemacs/compute-mode-line-height)) - (spaceline-compile)) - lazy-load-spaceline))) + (spacemacs|require-when-dumping 'spaceline) + (spacemacs|when-dumping-strict + (spacemacs/spaceline-config-startup)) + (spacemacs|unless-dumping + (add-hook 'emacs-startup-hook 'spacemacs/spaceline-config-startup-hook)) (add-hook 'spacemacs-post-theme-change-hook 'spacemacs/customize-powerline-faces) (add-hook 'spacemacs-post-theme-change-hook 'powerline-reset) diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/funcs.el index 10928cd..a65406e 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Navigation Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/packages.el index 6be4423..38c999a 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-navigation/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Navigation Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -431,7 +431,7 @@ (progn (setq winum-auto-assign-0-to-minibuffer nil winum-auto-setup-mode-line nil - winum-ignored-buffers '(" *which-key*")) + winum-ignored-buffers '(" *LV*" " *which-key*")) (spacemacs/set-leader-keys "`" 'winum-select-window-by-number "²" 'winum-select-window-by-number diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-org/README.org b/dot_emacs.d/layers/+spacemacs/spacemacs-org/README.org index e9e3260..8609432 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-org/README.org +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-org/README.org @@ -12,5 +12,5 @@ This layer tweaks =org-mode= to integrate nicely into Spacemacs. ** Features: - Configuration for =flyspell= to check =org-buffers= for typos. - Support for automatically generated Table-Of-Contents via =toc-org=. -- Support for custom bullet markers via =org-bullets=. +- Support for custom bullet markers via =org-superstar=. - Support for a special view mode for org documents via =space-doc=. diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el b/dot_emacs.d/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el index 48fd354..c500ca7 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-org/local/space-doc/space-doc.el @@ -1,6 +1,6 @@ ;;; space-doc.el --- Spacemacs org minor mode. -*- lexical-binding: t -*- ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-org/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-org/packages.el index 58b0b67..49ac098 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-org/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-org/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- spacemacs-org layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Boris Buliga ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-project/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-project/funcs.el index a1a1cfe..fa5f2a7 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-project/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-project/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Project Management Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Codruț Constantin Gușoi ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-project/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-project/packages.el index 686141d..30b5b71 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-project/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-project/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Project Management Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/funcs.el index 5e0456b..27b8faa 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs Purpose Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bar Magal ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/packages.el index 30a9379..9d5bc67 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-purpose/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs Purpose Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Bar Magal ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-visual/funcs.el b/dot_emacs.d/layers/+spacemacs/spacemacs-visual/funcs.el index 53d489c..d374250 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-visual/funcs.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-visual/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Spacemacs UI Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+spacemacs/spacemacs-visual/packages.el b/dot_emacs.d/layers/+spacemacs/spacemacs-visual/packages.el index dcfe6f4..49d30ab 100644 --- a/dot_emacs.d/layers/+spacemacs/spacemacs-visual/packages.el +++ b/dot_emacs.d/layers/+spacemacs/spacemacs-visual/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Spacemacs UI Visual Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tags/cscope/config.el b/dot_emacs.d/layers/+tags/cscope/config.el index 813c8b1..8348803 100644 --- a/dot_emacs.d/layers/+tags/cscope/config.el +++ b/dot_emacs.d/layers/+tags/cscope/config.el @@ -1,6 +1,6 @@ ;;; config.el --- cscope configuration File ;; -;; Copyright (c) 2019 Sylvain Benner & Contributors +;; Copyright (c) 2020 Sylvain Benner & Contributors ;; ;; This file is not part of GNU Emacs. ;; diff --git a/dot_emacs.d/layers/+tags/cscope/packages.el b/dot_emacs.d/layers/+tags/cscope/packages.el index 8e6233b..a1a81c5 100644 --- a/dot_emacs.d/layers/+tags/cscope/packages.el +++ b/dot_emacs.d/layers/+tags/cscope/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- cscope Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tags/gtags/config.el b/dot_emacs.d/layers/+tags/gtags/config.el index b0c7454..db160af 100644 --- a/dot_emacs.d/layers/+tags/gtags/config.el +++ b/dot_emacs.d/layers/+tags/gtags/config.el @@ -1,6 +1,6 @@ ;;; config.el --- gtags configuration File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tags/gtags/funcs.el b/dot_emacs.d/layers/+tags/gtags/funcs.el index 1b52481..3ff5ee7 100644 --- a/dot_emacs.d/layers/+tags/gtags/funcs.el +++ b/dot_emacs.d/layers/+tags/gtags/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- gtags functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tags/gtags/packages.el b/dot_emacs.d/layers/+tags/gtags/packages.el index a4baa93..f84e4ed 100644 --- a/dot_emacs.d/layers/+tags/gtags/packages.el +++ b/dot_emacs.d/layers/+tags/gtags/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- gtags Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; and: Christian E. Hopps diff --git a/dot_emacs.d/layers/+themes/colors/config.el b/dot_emacs.d/layers/+themes/colors/config.el index fe0f4f7..4f898e3 100644 --- a/dot_emacs.d/layers/+themes/colors/config.el +++ b/dot_emacs.d/layers/+themes/colors/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Colors Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+themes/colors/funcs.el b/dot_emacs.d/layers/+themes/colors/funcs.el index 5da6b29..fad3e5a 100644 --- a/dot_emacs.d/layers/+themes/colors/funcs.el +++ b/dot_emacs.d/layers/+themes/colors/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Colors Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+themes/colors/local/nyan-mode/README.org b/dot_emacs.d/layers/+themes/colors/local/nyan-mode/README.org index 7dcd6d8..c79ad09 100644 --- a/dot_emacs.d/layers/+themes/colors/local/nyan-mode/README.org +++ b/dot_emacs.d/layers/+themes/colors/local/nyan-mode/README.org @@ -66,7 +66,7 @@ Customizing nyan-animate-nyancat is broken; don't do it. ** Credits Code and idea inspired by sml-modeline.el, written by Lennart Borgman. -See: [[http://bazaar.launchpad.net/~nxhtml/nxhtml/main/annotate/head%3A/util/sml-modeline.el]] +See: [[https://www.emacswiki.org/emacs/sml-modeline.el]] For animated Nyan Cat, I used frames [[http://media.photobucket.com/image/nyan%20cat%20sprites/DryBowser455/th_NyanCatSprite.png?t=1304659408][by DryBowser455]]. diff --git a/dot_emacs.d/layers/+themes/colors/packages.el b/dot_emacs.d/layers/+themes/colors/packages.el index f6b626b..15ad711 100644 --- a/dot_emacs.d/layers/+themes/colors/packages.el +++ b/dot_emacs.d/layers/+themes/colors/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Colors Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+themes/themes-megapack/packages.el b/dot_emacs.d/layers/+themes/themes-megapack/packages.el index 41bafc4..dea836f 100644 --- a/dot_emacs.d/layers/+themes/themes-megapack/packages.el +++ b/dot_emacs.d/layers/+themes/themes-megapack/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Themes Mega-Pack Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+themes/theming/config.el b/dot_emacs.d/layers/+themes/theming/config.el index 4b947f7..eb5aba5 100644 --- a/dot_emacs.d/layers/+themes/theming/config.el +++ b/dot_emacs.d/layers/+themes/theming/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Theming Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+themes/theming/funcs.el b/dot_emacs.d/layers/+themes/theming/funcs.el index d30fc23..a3ef67d 100644 --- a/dot_emacs.d/layers/+themes/theming/funcs.el +++ b/dot_emacs.d/layers/+themes/theming/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Theming Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+themes/theming/packages.el b/dot_emacs.d/layers/+themes/theming/packages.el index dcfd63a..0630261 100644 --- a/dot_emacs.d/layers/+themes/theming/packages.el +++ b/dot_emacs.d/layers/+themes/theming/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Theming Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ansible/config.el b/dot_emacs.d/layers/+tools/ansible/config.el index 9b22846..91fd663 100644 --- a/dot_emacs.d/layers/+tools/ansible/config.el +++ b/dot_emacs.d/layers/+tools/ansible/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Ansible Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ansible/funcs.el b/dot_emacs.d/layers/+tools/ansible/funcs.el index 46e6bae..7756d1f 100644 --- a/dot_emacs.d/layers/+tools/ansible/funcs.el +++ b/dot_emacs.d/layers/+tools/ansible/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Ansible Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ansible/layers.el b/dot_emacs.d/layers/+tools/ansible/layers.el index a0e6085..9ec32be 100644 --- a/dot_emacs.d/layers/+tools/ansible/layers.el +++ b/dot_emacs.d/layers/+tools/ansible/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Ansible Layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ansible/packages.el b/dot_emacs.d/layers/+tools/ansible/packages.el index 487d3c1..23da3d5 100644 --- a/dot_emacs.d/layers/+tools/ansible/packages.el +++ b/dot_emacs.d/layers/+tools/ansible/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Ansible Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/bm/packages.el b/dot_emacs.d/layers/+tools/bm/packages.el index 8733265..0eb25c6 100644 --- a/dot_emacs.d/layers/+tools/bm/packages.el +++ b/dot_emacs.d/layers/+tools/bm/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- bm Layer packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Eugene "JAremko" Yaremenko ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/cfengine/packages.el b/dot_emacs.d/layers/+tools/cfengine/packages.el index 2cbe6c6..2097e0c 100644 --- a/dot_emacs.d/layers/+tools/cfengine/packages.el +++ b/dot_emacs.d/layers/+tools/cfengine/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- cfengine layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Nick Anderson ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/chrome/config.el b/dot_emacs.d/layers/+tools/chrome/config.el index 2cf062c..b3da41f 100644 --- a/dot_emacs.d/layers/+tools/chrome/config.el +++ b/dot_emacs.d/layers/+tools/chrome/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Chrome Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/chrome/funcs.el b/dot_emacs.d/layers/+tools/chrome/funcs.el index e03dee4..d5fb391 100644 --- a/dot_emacs.d/layers/+tools/chrome/funcs.el +++ b/dot_emacs.d/layers/+tools/chrome/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Chrome Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/chrome/keybindings.el b/dot_emacs.d/layers/+tools/chrome/keybindings.el index 402e6ba..765726a 100644 --- a/dot_emacs.d/layers/+tools/chrome/keybindings.el +++ b/dot_emacs.d/layers/+tools/chrome/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Chrome Layer keybindings File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/chrome/packages.el b/dot_emacs.d/layers/+tools/chrome/packages.el index 4bead8a..b7c47ca 100644 --- a/dot_emacs.d/layers/+tools/chrome/packages.el +++ b/dot_emacs.d/layers/+tools/chrome/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Chrome Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ben Hayden ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/command-log/packages.el b/dot_emacs.d/layers/+tools/command-log/packages.el index 3b68e6e..047b99d 100644 --- a/dot_emacs.d/layers/+tools/command-log/packages.el +++ b/dot_emacs.d/layers/+tools/command-log/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- command-log Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/conda/layers.el b/dot_emacs.d/layers/+tools/conda/layers.el index 1d64639..df4bb57 100644 --- a/dot_emacs.d/layers/+tools/conda/layers.el +++ b/dot_emacs.d/layers/+tools/conda/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Conda Layer layers File for Spacemacs ;; -;; Copyright (C) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Maximilian Wolff ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/conda/packages.el b/dot_emacs.d/layers/+tools/conda/packages.el index 67751a6..956cefb 100644 --- a/dot_emacs.d/layers/+tools/conda/packages.el +++ b/dot_emacs.d/layers/+tools/conda/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Conda Layer packages File for Spacemacs ;; -;; Copyright (C) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Zach Pearson ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/dap/config.el b/dot_emacs.d/layers/+tools/dap/config.el index cf04299..4124a68 100644 --- a/dot_emacs.d/layers/+tools/dap/config.el +++ b/dot_emacs.d/layers/+tools/dap/config.el @@ -1,6 +1,6 @@ ;;; config.el --- DAP mode functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ivan Yonchovski (yyoncho@gmail.com) ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/dap/layers.el b/dot_emacs.d/layers/+tools/dap/layers.el index 1414465..84784f2 100644 --- a/dot_emacs.d/layers/+tools/dap/layers.el +++ b/dot_emacs.d/layers/+tools/dap/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- DAP mode layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/dap/packages.el b/dot_emacs.d/layers/+tools/dap/packages.el index a93cf56..6848a50 100644 --- a/dot_emacs.d/layers/+tools/dap/packages.el +++ b/dot_emacs.d/layers/+tools/dap/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- DAP mode functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ivan Yonchovski (yyoncho@gmail.com) ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/debug/config.el b/dot_emacs.d/layers/+tools/debug/config.el index 352371e..e82a655 100644 --- a/dot_emacs.d/layers/+tools/debug/config.el +++ b/dot_emacs.d/layers/+tools/debug/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Debug Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Troy Hinckley ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/debug/funcs.el b/dot_emacs.d/layers/+tools/debug/funcs.el index 0e65254..144b11d 100644 --- a/dot_emacs.d/layers/+tools/debug/funcs.el +++ b/dot_emacs.d/layers/+tools/debug/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Debug layer function file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Troy Hinckley ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/debug/packages.el b/dot_emacs.d/layers/+tools/debug/packages.el index f92b02a..29d41a1 100644 --- a/dot_emacs.d/layers/+tools/debug/packages.el +++ b/dot_emacs.d/layers/+tools/debug/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Debug Layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Troy Hinckley ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/docker/config.el b/dot_emacs.d/layers/+tools/docker/config.el index ddd085d..675dbcb 100644 --- a/dot_emacs.d/layers/+tools/docker/config.el +++ b/dot_emacs.d/layers/+tools/docker/config.el @@ -1,6 +1,6 @@ ;;; config.el --- docker Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/docker/funcs.el b/dot_emacs.d/layers/+tools/docker/funcs.el index 4ed36c2..e87a379 100644 --- a/dot_emacs.d/layers/+tools/docker/funcs.el +++ b/dot_emacs.d/layers/+tools/docker/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- docker Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/docker/layers.el b/dot_emacs.d/layers/+tools/docker/layers.el index 5d5ec3b..d2ecba6 100644 --- a/dot_emacs.d/layers/+tools/docker/layers.el +++ b/dot_emacs.d/layers/+tools/docker/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- docker Layer declarations File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/docker/packages.el b/dot_emacs.d/layers/+tools/docker/packages.el index 1269b91..e4ff189 100644 --- a/dot_emacs.d/layers/+tools/docker/packages.el +++ b/dot_emacs.d/layers/+tools/docker/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- docker Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; Copyright (c) 2015 Alan Zimmerman & Contributors ;; ;; Author: Alan Zimmerman diff --git a/dot_emacs.d/layers/+tools/fasd/packages.el b/dot_emacs.d/layers/+tools/fasd/packages.el index 3fdf322..3e6aa04 100644 --- a/dot_emacs.d/layers/+tools/fasd/packages.el +++ b/dot_emacs.d/layers/+tools/fasd/packages.el @@ -18,7 +18,7 @@ (defun fasd-find-directory-only () (interactive) - (fasd-find-file 1)) + (fasd-find-file 2)) (global-fasd-mode 1) (spacemacs/declare-prefix "fa" "fasd-find") diff --git a/dot_emacs.d/layers/+tools/finance/packages.el b/dot_emacs.d/layers/+tools/finance/packages.el index 988aa6d..9cc4489 100644 --- a/dot_emacs.d/layers/+tools/finance/packages.el +++ b/dot_emacs.d/layers/+tools/finance/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Finance Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/geolocation/config.el b/dot_emacs.d/layers/+tools/geolocation/config.el index 6ad06b5..1542d9d 100644 --- a/dot_emacs.d/layers/+tools/geolocation/config.el +++ b/dot_emacs.d/layers/+tools/geolocation/config.el @@ -1,6 +1,6 @@ ;;; config.el --- geolocation configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/geolocation/extensions.el b/dot_emacs.d/layers/+tools/geolocation/extensions.el index b05881c..370d39c 100644 --- a/dot_emacs.d/layers/+tools/geolocation/extensions.el +++ b/dot_emacs.d/layers/+tools/geolocation/extensions.el @@ -1,6 +1,6 @@ ;;; extensions.el --- geolocation configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Uri Sharf ;; URL: https://github.com/usharf/spacemacs diff --git a/dot_emacs.d/layers/+tools/geolocation/extensions/theme-changer/theme-changer.el b/dot_emacs.d/layers/+tools/geolocation/extensions/theme-changer/theme-changer.el index de50d77..884f202 100644 --- a/dot_emacs.d/layers/+tools/geolocation/extensions/theme-changer/theme-changer.el +++ b/dot_emacs.d/layers/+tools/geolocation/extensions/theme-changer/theme-changer.el @@ -1,6 +1,6 @@ ;;; theme-changer.el --- geolocation configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Uri Sharf ;; URL: https://github.com/usharf/spacemacs diff --git a/dot_emacs.d/layers/+tools/geolocation/funcs.el b/dot_emacs.d/layers/+tools/geolocation/funcs.el index a84fa8f..a2f1925 100644 --- a/dot_emacs.d/layers/+tools/geolocation/funcs.el +++ b/dot_emacs.d/layers/+tools/geolocation/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- geolocation functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Eivind Fonn ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/geolocation/packages.el b/dot_emacs.d/layers/+tools/geolocation/packages.el index 4c26df3..d2749b5 100644 --- a/dot_emacs.d/layers/+tools/geolocation/packages.el +++ b/dot_emacs.d/layers/+tools/geolocation/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- geolocation configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Uri Sharf ;; URL: https://github.com/usharf/spacemacs diff --git a/dot_emacs.d/layers/+tools/imenu-list/packages.el b/dot_emacs.d/layers/+tools/imenu-list/packages.el index 0d8a0e4..7a0bd09 100644 --- a/dot_emacs.d/layers/+tools/imenu-list/packages.el +++ b/dot_emacs.d/layers/+tools/imenu-list/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- imenu-list Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/import-js/config.el b/dot_emacs.d/layers/+tools/import-js/config.el index 85e7dc3..1982dec 100644 --- a/dot_emacs.d/layers/+tools/import-js/config.el +++ b/dot_emacs.d/layers/+tools/import-js/config.el @@ -1,6 +1,6 @@ ;;; config.el --- import-js Layer configuration file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/import-js/funcs.el b/dot_emacs.d/layers/+tools/import-js/funcs.el index f340a49..18aa3f3 100644 --- a/dot_emacs.d/layers/+tools/import-js/funcs.el +++ b/dot_emacs.d/layers/+tools/import-js/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- import-js Layer packages file for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/import-js/packages.el b/dot_emacs.d/layers/+tools/import-js/packages.el index d1015ab..53996ad 100644 --- a/dot_emacs.d/layers/+tools/import-js/packages.el +++ b/dot_emacs.d/layers/+tools/import-js/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- import-js Layer packages file for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Thanh Vuong ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ipython-notebook/packages.el b/dot_emacs.d/layers/+tools/ipython-notebook/packages.el index aaadbd1..71cf9c1 100644 --- a/dot_emacs.d/layers/+tools/ipython-notebook/packages.el +++ b/dot_emacs.d/layers/+tools/ipython-notebook/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- ipython Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -15,26 +15,24 @@ (use-package ein :init (spacemacs/set-leader-keys "atil" 'ein:login - "atir" 'ein:run - "atis" 'ein:stop) + "atir" 'ein:run + "atis" 'ein:stop) (spacemacs/declare-prefix "ati" "ipython notebook") :config (with-eval-after-load 'ein-notebook (add-hook 'ein:notebook-mode-hook - (lambda () - (add-to-list 'minor-mode-overriding-map-alist - `(ein:notebook-mode . ,ein:notebook-mode-map)))) + (lambda () + (add-to-list 'minor-mode-overriding-map-alist + `(ein:notebook-mode . ,ein:notebook-mode-map)))) (mapc (lambda (mode) - (evil-define-minor-mode-key - mode 'ein:notebook-mode - (kbd "") 'ein:worksheet-execute-cell-km - (kbd "") 'ein:worksheet-execute-cell-and-goto-next-km)) + (evil-define-minor-mode-key mode 'ein:notebook-mode + (kbd "") 'ein:worksheet-execute-cell-km + (kbd "") 'ein:worksheet-execute-cell-and-goto-next-km)) '(insert hybrid normal)) - (evil-define-minor-mode-key - 'normal 'ein:notebook-mode - "gj" 'ein:worksheet-goto-next-input-km - "gk" 'ein:worksheet-goto-prev-input-km) + (evil-define-minor-mode-key 'normal 'ein:notebook-mode + "gj" 'ein:worksheet-goto-next-input-km + "gk" 'ein:worksheet-goto-prev-input-km) (let ((bindings '(("j" ein:worksheet-goto-next-input-km) ("k" ein:worksheet-goto-prev-input-km) ("J" ein:worksheet-move-cell-down-km) @@ -48,134 +46,133 @@ ("o" ein:worksheet-insert-cell-below-km) ("O" ein:worksheet-insert-cell-above-km) ("t" ein:worksheet-toggle-cell-type-km) - ("RET" ein:worksheet-execute-cell-km) + ("RET" ein:worksheet-execute-cell-and-goto-next-km) ("l" ein:worksheet-clear-output-km) ("L" ein:worksheet-clear-all-output-km) ("C-s" ein:notebook-save-notebook-command-km) ("C-r" ein:notebook-rename-command-km) ("x" ein:notebook-close-km) ("z" ein:notebook-kernel-interrupt-command-km)))) - (apply #'spacemacs/set-leader-keys-for-minor-mode - 'ein:notebook-mode - (cl-mapcan - (lambda (bind) - (if (fboundp (cl-second bind)) - bind - (prog1 nil - (display-warning - 'warn (format "ipython-notebook/init-ein: undefined %s" - (cl-second bind)))))) - (copy-tree bindings))) - (eval (append '(spacemacs|define-transient-state - ipython-notebook - :title "EIN Transient State" - :evil-leader-for-mode (ein:notebook-mode . ".") - :bindings - ("q" nil :exit t)) - bindings - `(:doc ,(ipython-notebook/transient-doc bindings)))))))) + (apply #'spacemacs/set-leader-keys-for-minor-mode 'ein:notebook-mode + (cl-mapcan + (lambda (bind) + (if (fboundp (cl-second bind)) + bind + (prog1 nil + (display-warning + 'warn (format "ipython-notebook/init-ein: undefined %s" + (cl-second bind)))))) + (copy-tree bindings))) + (eval (append '(spacemacs|define-transient-state + ipython-notebook + :title "EIN Transient State" + :evil-leader-for-mode (ein:notebook-mode . ".") + :bindings + ("q" nil :exit t)) + bindings + `(:doc ,(ipython-notebook/transient-doc bindings)))))))) (defun ipython-notebook/max-by-prefix (alist) (seq-reduce (lambda (lst1 lst2) (if (> (cl-second lst1) - (cl-second lst2)) - lst1 lst2)) - (cdr alist) (car alist))) + (cl-second lst2)) + lst1 lst2)) + (cdr alist) (car alist))) (defun ipython-notebook/count-by-prefix (alist) (mapcar (lambda (lst) - (cons (car lst) (list (length (cdr lst))))) - alist)) + (cons (car lst) (list (length (cdr lst))))) + alist)) (defun ipython-notebook/commands-by-prefix-alist (commands) "Return ((P1 P1-CMD1 P1-CMD2) (P2 P2-CMD1 P2-CMD2) ... )" (let* ((commands (if (symbolp (car commands)) - (mapcar #'symbol-name commands) - commands)) - (upto (ipython-notebook/prefix commands)) - result) + (mapcar #'symbol-name commands) + commands)) + (upto (ipython-notebook/prefix commands)) + result) (cl-flet ((get-prefix - (command) - (intern (mapconcat #'identity - (subseq (split-string command (regexp-quote "-")) - 0 (1+ upto)) - "-")))) + (command) + (intern (mapconcat #'identity + (subseq (split-string command (regexp-quote "-")) + 0 (1+ upto)) + "-")))) (mapc (lambda (command) - (let ((lst (alist-get (get-prefix command) result))) - (setf (alist-get (get-prefix command) result) - (cons (intern command) lst)))) - commands) + (let ((lst (alist-get (get-prefix command) result))) + (setf (alist-get (get-prefix command) result) + (cons (intern command) lst)))) + commands) result))) (cl-defun ipython-notebook/prefix (commands &key (separator "-") (suffix-p nil)) "Return index of first different prefix among COMMANDS if each were split on SEPARATOR. For example, return 2 if COMMANDS are '(ein:notebook-foo ein:notebook-foo-bar)." (let* ((commands (if (symbolp (car commands)) - (mapcar #'symbol-name commands) - commands)) - (split-up (mapcar (lambda (command) - (funcall (if suffix-p #'reverse #'identity) - (split-string command (regexp-quote separator)))) - commands))) + (mapcar #'symbol-name commands) + commands)) + (split-up (mapcar (lambda (command) + (funcall (if suffix-p #'reverse #'identity) + (split-string command (regexp-quote separator)))) + commands))) (cl-loop for result from 0 - for bogey = (nth result (car split-up)) - if (or (null bogey) - (null (cdr split-up)) - (cl-some (lambda (lst) (not (string= bogey (nth result lst)))) - (cdr split-up))) - return (funcall (if suffix-p #'- #'identity) result) - end))) + for bogey = (nth result (car split-up)) + if (or (null bogey) + (null (cdr split-up)) + (cl-some (lambda (lst) (not (string= bogey (nth result lst)))) + (cdr split-up))) + return (funcall (if suffix-p #'- #'identity) result) + end))) (defun ipython-notebook/transient-doc (bindings) (let* ((commands-by (ipython-notebook/commands-by-prefix-alist (mapcar #'cl-second bindings))) - (counts-by (ipython-notebook/count-by-prefix commands-by)) - (max-by (ipython-notebook/max-by-prefix counts-by)) - (main (cl-first max-by)) - (n-main (cl-second max-by)) - (n-other (apply #'+ (mapcar (lambda (lst) (if (eq (cl-first lst) main) - 0 (cl-second lst))) - counts-by))) - (max-col 3) - (spread (min max-col (ceiling (/ n-main (* 1.3 n-other))))) - (main-commands (cdr (assq main commands-by))) - (other-commands (cl-mapcan #'cdr (remove-if (lambda (lst) - (eq (car lst) main)) - commands-by))) - (other-from (ipython-notebook/prefix other-commands)) - (other-to (ipython-notebook/prefix other-commands :suffix-p t)) - (main-from (ipython-notebook/prefix main-commands)) - (main-to (ipython-notebook/prefix main-commands :suffix-p t))) + (counts-by (ipython-notebook/count-by-prefix commands-by)) + (max-by (ipython-notebook/max-by-prefix counts-by)) + (main (cl-first max-by)) + (n-main (cl-second max-by)) + (n-other (apply #'+ (mapcar (lambda (lst) (if (eq (cl-first lst) main) + 0 (cl-second lst))) + counts-by))) + (max-col 3) + (spread (min max-col (ceiling (/ n-main (* 1.3 n-other))))) + (main-commands (cdr (assq main commands-by))) + (other-commands (cl-mapcan #'cdr (remove-if (lambda (lst) + (eq (car lst) main)) + commands-by))) + (other-from (ipython-notebook/prefix other-commands)) + (other-to (ipython-notebook/prefix other-commands :suffix-p t)) + (main-from (ipython-notebook/prefix main-commands)) + (main-to (ipython-notebook/prefix main-commands :suffix-p t))) (cl-flet ((get-key (command) (car (rassoc (list command) bindings))) - (massage (command from to) - (let ((toks (split-string (symbol-name command) (regexp-quote "-")))) - (mapconcat #'identity - (subseq toks from (+ (length toks) to)) - "-")))) + (massage (command from to) + (let ((toks (split-string (symbol-name command) (regexp-quote "-")))) + (mapconcat #'identity + (subseq toks from (+ (length toks) to)) + "-")))) (cl-macrolet ((rescol - (result commands from to) - `(let* ((key-width 10) - (col-width 20) - (format-str (format "%%-%ds%%-%ds" key-width col-width))) - (if-let ((command (pop ,commands))) - (let ((massaged (massage command ,from ,to))) - (setq ,result - (concat ,result - (format format-str - (format "[_%s_]^^" (get-key command)) - (subseq massaged 0 - (min (length massaged) col-width)))))) - (setq ,result (concat ,result (format format-str "" ""))))))) - (cl-loop - with result = "\n" - with betw = (make-string 1 ? ) - with col = 1 - if (= col spread) - do (rescol result other-commands other-from other-to) - and do (setq result (concat result "\n")) - and do (setq col 1) - else - do (rescol result main-commands main-from main-to) - and do (setq result (concat result betw)) - and do (cl-incf col) - end - until (and (null other-commands) (null main-commands)) - finally return result))))) + (result commands from to) + `(let* ((key-width 10) + (col-width 20) + (format-str (format "%%-%ds%%-%ds" key-width col-width))) + (if-let ((command (pop ,commands))) + (let ((massaged (massage command ,from ,to))) + (setq ,result + (concat ,result + (format format-str + (format "[_%s_]^^" (get-key command)) + (subseq massaged 0 + (min (length massaged) col-width)))))) + (setq ,result (concat ,result (format format-str "" ""))))))) + (cl-loop + with result = "\n" + with betw = (make-string 1 ? ) + with col = 1 + if (= col spread) + do (rescol result other-commands other-from other-to) + and do (setq result (concat result "\n")) + and do (setq col 1) + else + do (rescol result main-commands main-from main-to) + and do (setq result (concat result betw)) + and do (cl-incf col) + end + until (and (null other-commands) (null main-commands)) + finally return result))))) diff --git a/dot_emacs.d/layers/+tools/kubernetes/packages.el b/dot_emacs.d/layers/+tools/kubernetes/packages.el index 657bf4d..c991b65 100644 --- a/dot_emacs.d/layers/+tools/kubernetes/packages.el +++ b/dot_emacs.d/layers/+tools/kubernetes/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- kubernetes layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Matt Bray ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/languagetool/README.org b/dot_emacs.d/layers/+tools/languagetool/README.org new file mode 100644 index 0000000..74187dd --- /dev/null +++ b/dot_emacs.d/layers/+tools/languagetool/README.org @@ -0,0 +1,78 @@ +#+TITLE: LanguageTool layer + +#+TAGS: layer|uncategorized + +[[file:img/languagetool.png]] + +* Table of Contents :TOC_5_gh:noexport: +- [[#description][Description]] + - [[#features][Features:]] +- [[#install][Install]] + - [[#layer][Layer]] + - [[#languagetool][LanguageTool]] +- [[#key-bindings][Key bindings]] + +* Description +This layer adds grammar checking using [[https://www.languagetool.org/][LanguageTool]]. LanguageTool will use the +language set using ~SPC S d~ if the =spell-checking= layer is enabled. + +** Features: +- Spelling and grammar checking + +* Install +** Layer +To use this configuration layer, add it to your =~/.spacemacs=. You will need to +add =languagetool= to the existing =dotspacemacs-configuration-layers= list in +this file. You can set the default language by setting +~langtool-default-language~. This value will be used when no custom language has +been set using ~SPC S d~: + +#+BEGIN_SRC elisp + (setq-default dotspacemacs-configuration-layers + '((languagetool :variables + langtool-default-language "en-GB"))) +#+END_SRC + +It's also possible to immediately show the error when jumping to errors with ~[ +a~ and ~] a~ by setting ~languagetool-show-error-on-jump~: + +#+BEGIN_SRC elisp + (setq-default dotspacemacs-configuration-layers + '((languagetool :variables + languagetool-show-error-on-jump t))) +#+END_SRC + +** LanguageTool +LanguageTool and JRE 8+ are required to use this layer. You can install +LanguageTool using your system's package manager or by extracting the standalone +archive found on [[https://www.languagetool.org/][LanguageTool's website]]. You can tell the layer where +LanguageTool is installed by setting the =langtool-language-tool-jar= variable +to the location of =languagetool-commandline.jar=, by setting +=langtool-java-classpath=, or setting a host and port for a running server: + +#+BEGIN_SRC elisp + ;; Standalone installation + (setq-default dotspacemacs-configuration-layers + '((languagetool :variables + langtool-language-tool-jar "/home/username/languagetool/languagetool-commandline.jar"))) + + ;; Classpath (e.g. after installing with `pacman -S languagetool') + (setq-default dotspacemacs-configuration-layers + '((languagetool :variables + langtool-java-classpath "/usr/share/languagetool:/usr/share/java/languagetool/*"))) + + ;; Server running in background + (setq-default dotspacemacs-configuration-layers + '((languagetool :variables + langtool-http-server-host "localhost" + langtool-http-server-port 8081))) +#+END_SRC + +* Key bindings + +| Key binding | Description | +|-------------+--------------------------------------------| +| ~SPC S l~ | Toggle LanguageTool for the current buffer | +| ~SPC S L~ | Perform corrections in the current buffer | +| ~[ a~ | Jump to the previous LanguageTool error | +| ~] a~ | Jump to the next LanguageTool error | diff --git a/dot_emacs.d/layers/+tools/languagetool/config.el b/dot_emacs.d/layers/+tools/languagetool/config.el new file mode 100644 index 0000000..8c730b3 --- /dev/null +++ b/dot_emacs.d/layers/+tools/languagetool/config.el @@ -0,0 +1,14 @@ +;;; config.el --- languagetool layer packages file for Spacemacs. +;; +;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; +;; Author: Robbert van der Helm +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defvar languagetool-show-error-on-jump nil + "If non-nil, automatically show a popup with the error when + jumping to LanguageTool errors with '[ a' and '] a'.") diff --git a/dot_emacs.d/layers/+tools/languagetool/funcs.el b/dot_emacs.d/layers/+tools/languagetool/funcs.el new file mode 100644 index 0000000..25b2d22 --- /dev/null +++ b/dot_emacs.d/layers/+tools/languagetool/funcs.el @@ -0,0 +1,69 @@ +;;; funcs.el --- languagetool layer packages file for Spacemacs. +;; +;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; +;; Author: Robbert van der Helm +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defun spacemacs/languagetool-next-error (count) + (interactive "p") + (dotimes (_ count) (langtool-goto-next-error)) + (when languagetool-show-error-on-jump (langtool-show-message-at-point))) + +(defun spacemacs/languagetool-previous-error (count) + (interactive "p") + (dotimes (_ count) (langtool-goto-previous-error)) + (when languagetool-show-error-on-jump (langtool-show-message-at-point))) + +(defun spacemacs/languagetool-toggle () + "Performs grammar and spell checking on the current buffer + using LanguageTool for grammar and flyspell for spell checking. + Flyspell errors will be cleared if the 'spell-checking' layer + is active as they add a lot of clutter." + (interactive) + (if (package-installed-p 'langtool) + (let* ((has-ran (bound-and-true-p langtool-mode-line-message)) + (still-running + (and has-ran (equal ":run" (cadr langtool-mode-line-message))))) + ;; Don't do anything while LanguageTool is still running + (unless still-running + ;; Clear LanguageTool's errors if there is an active error overlay + (if has-ran + (langtool-check-done) + (progn + (langtool-check-buffer (spacemacs//languagetool-get-language)) + (when (package-installed-p 'flyspell) + (flyspell-delete-all-overlays)))))) + (error "LanguageTool has not been set up yet"))) + +(defun spacemacs//languagetool-detect () + "Detects whether the LanguageTool binary exists." + (cond ((boundp 'langtool-java-classpath) t) + ((and (boundp 'langtool-http-server-host) + (boundp 'langtool-http-server-port)) t) + ((boundp 'langtool-language-tool-jar) + (if (file-readable-p langtool-language-tool-jar) + t + (spacemacs-buffer/warning "LanguageTool binary not found"))) + (t (spacemacs-buffer/warning "LanguageTool binary not set")))) + +(defun spacemacs//languagetool-get-language () + "Tries to parse the current spell checking language for a + usable locale string. This won't do anything if the + 'spell-checking' layer is not active." + (let ((language (and (package-installed-p 'flyspell) + (or ispell-local-dictionary ispell-dictionary)))) + (when language + ;; We'll assume the language is either a locale or a named language (i.e. + ;; "en_GB" or "english") + (let* ((locale (or (cadr + (assoc language ispell-dicts-name2locale-equivs-alist)) + language)) + ;; ispell uses underscores in its locales, but LanguageTool expects a + ;; dash (e.g. "en_US" => "en-US") + (langtool-code (replace-regexp-in-string "_" "-" locale))) + langtool-code)))) diff --git a/dot_emacs.d/layers/+tools/languagetool/img/languagetool.png b/dot_emacs.d/layers/+tools/languagetool/img/languagetool.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6bebb575143630ac1147dad006f19ed33ae287 GIT binary patch literal 5788 zcmc&&RZv`AkRAdFWNxL*PNZ|u1fB*mhUq)I&8NL2S(@&g7=zBlD z?=SR%W%fb-0|0=G!o7t*MnBUUNh`|(0IrMxfVV#YaE)epZvp@g5CCA?000n30sx+W zO>2S)p#@J2<)kD45C2?Qtp#yt&eN~bnsxvHLH9p|k-$Rm0?ov>myw5J&poAlMnb|e z^Opz!AT^bd_@LrEvzP7>4qBt?Yp>>Xa%*<_O*MzHd{i9N^5g^TrEfwS79lf+@*C-q zM|J)axe<(01}c$UD&sRC7G!>O4UdoB(c_pW#KFKxEj=h!?a!U38>EqL^YgQ_=`PoO zHX4yD)@F`2nd#Fj7a=k8tr09*ji7O^XWAi*FK_@pwP$45pcjaJ3EZ{#KeLUwNY~w9Hi^nw)4_^!e6JVs&~s_ zY!X^s?XRX2C+li!i;A1jnIIIoCGs9LE@$y4O38mpx8Qyv513AMcon$(y?iH?*QPhY zEoC6u1K5>7ZFjLhzv-wisV`!;K2X2tIeRxYhnGIH)D;vneX~}o0_NZO+u^raS6x^* zGc%*aw0h+1+R{0c#!v76b2ZsCuQRx*Ng#Ktt)j7UdaJshh?SLr=<(CO+0fk6tz#T^&-p7%%#8GILLKs=Tny$Y9$TN@cydA8t%J(ixPoL=I z3^4-cEb+O@b5_k$PX7XjW;+W}rr(x8&$I2x;$kgH3g*Rwi}suSW#gUv^9C_Fm~Zj!>}n%3%8Q+yYvt;C zr()%oyO*J~qL1j`xkkIr-d(zMXD$jV5ziKryP`u3%qRY02x|e>H_ieFx9fe3%D%hDNE_S&+Zz-{}H%=F3!E1;O*H*BPt<&Lakx?CUc>iI(@Hm+U zuW6K25_PKUG_R_vnh+Oflstk%7f3(_MA@grZw+UPJk-rvpSZS$?AU+<7Y_;&mdQ&V zBFZZ-nMQA~PCi{`uPAX#MpE*BTa_-@8RO?|>cpY&t$ITtbzaLD7})n^ih1olUr`4T z699$nhBr2oVbf3;=<*h@{5bup0T0*tH_~BO9rJ|#IE(U%Y>yaj9>uMfC(ts~gkS7G z-+ofAq~V4df0A(S716$TD25ZG`*O!+8!7I15zA|uYVv%#4AOg7*$Hm^-;!~CXO*SL zp9mR8mT**1W9F_Jc*XPIT&>cE3t6su>Kx65#>=df!jwfWS7w4x&C$DR8WiwR>19cE z@cSPd%?EATZSIY0gu~848A?oCrUOap`X1an8MiB-QV4=c_S2{F^S#+E2j2|T$`Lrw z_UhQAz%pHaZWBnaqB_{$AJSupMpb1vKR>?$iZ|6D07Km~br2H1lNp6tf;1dI|2U6V zP|ujABJ;AD^n3XtsP6X8gwdp`DlvCq`{tnC#@u{!vEAz}nH>Kk^1ztXRJWzh$JYrC zQ<^jVzrc+CN~*O8#8QH~9!6GPXmN34V=Lyn(n0ZXzBv-LJ;%)DvRREctrZk79K7=V$r zT9o=s_>^-u{XQfC<$+F{m?)08p6k%@wyfgbEfqU z)1FBAp*!SRdbu>u5-?!2xRjV)@?*LHsdsU)0;=#tcDrc-?O!sdSyNr?yKYi6geq)I zn`Pz&PH+vrkNF4#sjA8-D+*s3qhpw-G@lRDmef&I<;GjNzd1mo%-!+Y@0`)XvB>iF z0>HNu9QiFR8#e#=L9&Tf# zsJBoRndvmW-?u55+tn-d*4Eav>#g(hD$f;PQ$zsirpmOjMaN6oOgR!WGriUal8vnz z$xwsMLe&7Jo&3_Cp zY?u3Gt{7Y8M%sIdH^-sXajNofE%0CRe_Ekv+tYbHH6~134OSp}BS+7Pd&XgdY#n{8 z8=m9=_#L!(nEd=WSOY1!D8ryJJj@Q-nVGC&94sRJq(2Bl zYeqp38R|O`pA$h4;mRh={enu24#33p!y5xELj8=IP)p-2;-uyj7l?)Y{S1CQz* zztgf~K+hd@*wW%d@A)2|?V}D_6;ghFCDm%La7n}tdPl2zME0XN#t-8Io}An{0MKKz z;blLa=R+UqN?EetVH))< zAN9f1zRSjqtBcWnneo3^l!64e2(7NCoHZ^OGWcrX(MuU_DTkBC$?DLB#o+MR^tv4& z8p-w8S{6zW?2&y&p@Niw!$IVnl?E7(d?pgoG3H7tooS1TJM-m<9(lHtBS}R2Js~*q zT~#JY+${VD;~nVG))H-({gbapTA_wv6Z&j=;WT%fp9lA}ON%-VyrS6JYfNCUzel2| z(J|i+zoRgHg9)Zhfw@MH?mS?Q>{FjwOQaDt5EsEz`B3vB3Omqe-Sn-7cOP{%3x~k& zrERIE-@57QhByj7{vM>8k^*t#Q7iQ(ssl-qDQ0w6ctyx165%kwiM@+oQU>NPZ57yF z%)cW|Zu&gQT(C0|)6jB%h`l=(ve3#}zNH|i1X^8N`uhRUaOYTkA}iX0WMLr&c5H|% z4-3Bz6Q+rz`~V3Kc~%A`Q*6<5#=ytV&x&&Zz4FR*_eF@an@68nm{KR6FNFG{owj=& z8X9{p_<{T*oQ}t;b12;uor0@$?pJlylb+&)!K*Wm{drluSHivEd*X^F}%e>Z9&;M)u`1uLoUE=CnI zgUB3zANUiEaMjcpj5D5C74$g^6_)o39?*(BP{`+ws2m{^B3}5s5K0a)JfX_GWlO;In@ z5ibxsR5r|SIz+xEncow$7Ua%!d506dE%P$P?{$1rekX3eD3+to6Y-gX;>EK(tmHmYV9q_VjoRzxMau$1U{)u*dCwSpc%`HokV0W6 z{Y*Xge8KJVSnl#p*U@Z`b&R%+Djg;g1*#f0*O5EQ@a!K^YhvN)JmDKOBaqv zqYS6QRfXzOd7iw`Y5Q`gn^Hu{{wN_KiI>m^KtNg9Mn(KckFB_bI1Jv2Rmhx@a=08; zScD{)WZ0w=SJDh=v}3oTP{@#QsIBD+5Vd|cl-YN<#Kh|0i8tjEfT09xIR?JdsU-bT zh)iVb+nrw5ct~P5|I+50P7-PlYPMGY0l)Y3ZKF5&Z-5inN%u`~aoMBV5Izz$+~Y)mO=`djYwET8dXs%e`8 zQP9S#H{Kqn#GV&|Adm(&1c)heOQ%-a;A&LJgcEdBqQ5l9-wcZ;BN@wnD%dBLqfrZ7 z>DA>f-f=$Hbib=D!(dIJCqHqL%Q6g9sDu>I= z{L!VT*aA9!IG#B}!lXGcEColDt@InZ@S}GL%Gwgw?Te;M;>7OAsx<^XMuHu8rS&cI zLc4&Nl_t1D8MO&lu_&^4TyEr0cBkr5`SAwZh67o$0M-H-2k zxIu!O4|-cK^mHf5Y4CHrXgt9_07GPr33a^BU}{ijXXG1BRf7eg`1m9_#c>mM%HG}S z&Dr{#9_N}2LDY9>Q`~&*@6)>!cF3?%3&)m)$5DZ%>NcB78*NR3)ABx-`<~Qjz{|?RYxE2BF*(-U4m&wXfHW`9+_Jh-T66wlu|Th6 zf5kYTCTzNiSS}h**DDupaBTcm%Rex1!Vfqa5kII8+J8 zj%7fqH119OYZge0%Lw(eBI$&qr(z;keIA=0P>5Q>Cf zU#mF!e2Q`(mv`Rh2a##91v19GKP4h#lQhaHlhw0fr<8;dXSfmEU2FD+qt4L%);R@r*$D9k3>oY_n!21h>K?=L_ z-Zm)7bQ-_&(&N*EsK6)MWDZpL_(>29wzgn8@mOm2ib6>B9|igDR&|}-)!kg9lURGY z^DV#oyQ2!P52%<_OIIH?iJq?hamCcAyvl=|OO1!W9hV)11FY}Q&ereLTb5Q7nawT5 znfzl(-f9QFk{i%&G!_)Bay}Vsc<^*?<@2IWWYgAo%iNh0wQMHBX*RH{ohx>ICT>Je zK;=8^#QoV-Xx;1V49xkY{Wh;L{m+|#Mnk>hL-_60FrOP)sNsIvs6)3Qm>a10K446_ zd6rO+HIw4(*u?#u{QRJ=(XOzfo$>1IhTWVfUjgdU*yzr)rus3xFS5?>q_P< ztdL^(c9zs4gh%1uAII*2{wQcNfuW92?S`{FHFaX+<<`IpXNU`jTB#@uw!I*SJ9O~# zRZKwF<>@C%KJOVVI|jRD2{ibXf7^=m6A+q4?v->-5W;shxcG9O3LJ1H2JZB0$KJxkb}Q)DLSDGzgPKrz3~sj zpn~(p?JYy}xEudu8#I)hfy)ve^Z!A=A23d(Q>Fc9Jy+2`Vae^G8usEgR#qm~_5ks3 zCUAQbV_GK*dvjVT8F?jjAA;v-rC0wb8KXr4M*pb+;DE66vO>67Av`MVoC2IY0^GbT o5DozdWNBbs;lCMJ*%(`xy8O=u(J^|*Xaj%@R6(L#%)s|Q0H|j25C8xG literal 0 HcmV?d00001 diff --git a/dot_emacs.d/layers/+tools/languagetool/packages.el b/dot_emacs.d/layers/+tools/languagetool/packages.el new file mode 100644 index 0000000..f797146 --- /dev/null +++ b/dot_emacs.d/layers/+tools/languagetool/packages.el @@ -0,0 +1,29 @@ +;;; packages.el --- languagetool layer packages file for Spacemacs. +;; +;; Copyright (c) 2012-2017 Sylvain Benner & Contributors +;; +;; Author: Robbert van der Helm +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +(defconst languagetool-packages + '((langtool :toggle (spacemacs//languagetool-detect)))) + +(defun languagetool/init-langtool () + (use-package langtool + :defer t + :init + (progn + ;; The whitespace rules give a lot of false positives when linting rich + ;; text. + (setq-default langtool-disabled-rules '("WHITESPACE_RULE")) + (spacemacs/set-leader-keys + "Sl" 'spacemacs/languagetool-toggle + "SL" 'langtool-correct-buffer) + (define-key evil-normal-state-map (kbd "[ a") + 'spacemacs/languagetool-previous-error) + (define-key evil-normal-state-map (kbd "] a") + 'spacemacs/languagetool-next-error)))) diff --git a/dot_emacs.d/layers/+tools/lsp/README.org b/dot_emacs.d/layers/+tools/lsp/README.org index 4aaea7c..349038c 100644 --- a/dot_emacs.d/layers/+tools/lsp/README.org +++ b/dot_emacs.d/layers/+tools/lsp/README.org @@ -7,13 +7,18 @@ - [[#features][Features:]] - [[#configuration][Configuration]] - [[#variables][Variables]] + - [[#code-lens][Code Lens]] + - [[#error-statistics-on-modeline][Error statistics on modeline]] + - [[#code-actions-on-modeline][Code actions on modeline]] - [[#navigation-mode][Navigation mode]] + - [[#breadcrumb-on-headerline][Breadcrumb on headerline]] - [[#key-bindings][Key bindings]] - [[#key-binding-prefixes][Key binding prefixes]] - [[#core-key-bindings][Core key bindings]] - [[#language-specific-key-binding-extensions][Language-specific key binding extensions]] - [[#spacemacslsp-define-extensions-layer-name-kind-request-optional-extra-parameters][~spacemacs/lsp-define-extensions layer-name kind request &optional extra-parameters~]] - [[#spacemacslsp-bind-extensions-for-mode][~spacemacs/lsp-bind-extensions-for-mode~]] +- [[#dap-integration][DAP integration]] - [[#diagnostics][Diagnostics]] - [[#references][References]] @@ -24,7 +29,7 @@ This layer adds support for basic language server protocol packages speaking Different language servers may support the language server protocol to varying degrees and they may also provide extensions; check the language server's website for details. -=M-x lsp-describe-session= in a LSP buffer to list capabilities of the server. +~M-x lsp-describe-session~ in a LSP buffer to list capabilities of the server. ** Features: - Cross references (definitions, references, document symbol, workspace symbol @@ -32,21 +37,22 @@ details. - Workspace-wide symbol rename - Symbol highlighting - Flycheck -- Completion with =lsp= -- Signature help with eldoc +- Completion with =LSP= +- Signature help with =eldoc= - Symbol documentation in a child frame (=lsp-ui-doc=) -- Navigation using imenu +- Navigation using =imenu= - Consistent core key bindings in LSP modes +- Code folding (=lsp-origami=) * Configuration Enabling this layer will set the used backend for all supported languages to -=lsp= unless you explicitly set a specific backend for the language. +=LSP= unless you explicitly set a specific backend for the language. The LSP ecosystem is based on two packages: [[https://github.com/emacs-lsp/lsp-mode][lsp-mode]] and [[https://github.com/emacs-lsp/lsp-ui][lsp-ui]]. Please check out their documentation. -If you add =lsp-*-enable= to major mode hooks for auto initialization of -language clients, customize =lsp-project-whitelist= =lsp-project-blacklist= to +If you add =lsp-**-enable= to major mode hooks for auto initialization of +language clients, customize ~lsp-project-whitelist~ and ~lsp-project-blacklist~ to disable projects you don't want to enable LSP. ** Variables @@ -54,14 +60,73 @@ A number of configuration variables have been exposed via the LSP layer =config. Sensible defaults have been provided, however they may all be overridden in your .spacemacs, or dynamically using the bindings added under the derived mode t prefix by =(spacemacs/lsp-bind-keys-for-mode mode)= -| Variable name | Default | Description | -|---------------------------------+---------+-------------------------------------------------------------------------------------------| -| =lsp-navigation= | `both' | `simple' or `peek' to bind only xref OR lsp-ui-peek navigation functions | -| =lsp-ui-remap-xref-keybindings= | nil | When non-nil, xref key bindings remapped to lsp-ui-peek-find-{definition,references} | -| =lsp-ui-doc-enable= | t | When non-nil, the documentation overlay is displayed | -| =lsp-ui-doc-include-signature= | nil | When nil, signature omitted from lsp-ui-doc overlay (this is usually redundant) | -| =lsp-ui-sideline-enable= | t | When non-nil, the symbol information overlay is displayed | -| =lsp-ui-sideline-show-symbol= | nil | When non-nil, the symbol information overlay includes symbol name (redundant for c-modes) | +| Variable name | Default | Description | +|--------------------------------------+--------------------------------------+-----------------------------------------------------------------------------------------------------------------| +| =lsp-headerline-breadcrumb-enable= | nil | When non-nil, shows breadcrumb on headerline. | +| =lsp-headerline-breadcrumb-segments= | `'(path-up-to-project file symbols)' | Display the path to the root of project, the name of the current file, and also its symbols. See details below. | +| =lsp-lens-enable= | nil | When non-nil, shows code lens when it's supported. | +| =lsp-modeline-diagnostics-enable= | t | When non-nil, shows error diagnostics in modeline. | +| =lsp-modeline-diagnostics-scope= | `:project' | Displays all error statistcs per projects. See details below. | +| =lsp-modeline-code-actions-enable= | t | When non-nil, shows available code actions in modeline. | +| =lsp-modeline-code-actions-segments= | `'(count icon)' | Display the number of available code actions and an icon. See details below. | +| =lsp-navigation= | `both' | `simple' or `peek' to bind only xref OR lsp-ui-peek navigation functions. | +| =lsp-ui-remap-xref-keybindings= | nil | When non-nil, xref key bindings remapped to lsp-ui-peek-find-{definition,references}. | +| =lsp-ui-doc-enable= | t | When non-nil, the documentation overlay is displayed. | +| =lsp-ui-doc-include-signature= | nil | When nil, signature omitted from lsp-ui-doc overlay (this is usually redundant). | +| =lsp-ui-sideline-enable= | t | When non-nil, the symbol information overlay is displayed. | +| =lsp-ui-sideline-show-symbol= | nil | When non-nil, the symbol information overlay includes symbol name (redundant for c-modes). | + +** Code Lens +Code lens is a feature that displays ="actionable contextual information interspersed"= in your source code. +In other words, it displays extra information of the source code, and allows you to perform certain actions. +For example, the LSP server may decorate the entry point of a program, and also provides a quick access for running/debugging the program. + +To always display code lens, + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables lsp-lens-enable nil))) +#+END_SRC + +This doesn't have any effect when code lens is not supported by current language server. + +** Error statistics on modeline +By default, all error statistics of a project is displayed in the modeline. +To disable this feature, set ~lsp-modeline-diagnostics-enable~ to ~nil~. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables lsp-modeline-diagnostics-enable nil))) +#+END_SRC + +To only display errors for the current file, you can set ~lsp-modeline-diagnostics-scope~ to ~:file~. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables lsp-modeline-diagnostics-scope :file))) +#+END_SRC + +Alternatively, if you want to see all errors across all projects, you can set it to ~:global~. + +** Code actions on modeline +By default, available code actions are displayed in modeline. To disable this feature, set ~lsp-modeline-code-actions-enable~ to ~nil~. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables lsp-modeline-code-actions-enable nil))) +#+END_SRC + +You can also customize its appearance via ~lsp-modeline-code-actions-segments~. Available segments are: +- ~icon~ shows a lightbulb icon. +- ~name~ shows the name of the preferred code action. +- ~count~ shows the how many code actions are available. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables + ;; default segments + lsp-modeline-code-actions-segments '(count icon)))) +#+END_SRC ** Navigation mode The ~lsp-navigation~ variable defined in =config.el= allows you to define a preference for lightweight or pretty @@ -69,6 +134,29 @@ The ~lsp-navigation~ variable defined in =config.el= allows you to define a pref and the =lsp-ui-peek= variants under ~SPC m G~. Setting ~lsp-navigation~ to either ~'simple~ or ~'peek~ eliminates the bindings under ~SPC m G~ and creates bindings under ~SPC m g~ according to the specified preference. +** Breadcrumb on headerline +To display breadcrumb in the headerline, set ~lsp-headerline-breadcrumb-segments~ to ~t~. + +You can customize the breadcrumb segments via ~lsp-headerline-breadcrumb-segments~. Available segments are: +- ~project~ shows the name of the current project. +- ~file~ shows the name of the current file. +- ~path-up-to-project~ shows the path up to the current project. +- ~symbols~ shows the document symbols. + +For example, to display only the symbols, + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables lsp-headerline-breadcrumb-segments '(symbols)))) +#+END_SRC + +To display the current project, current file, and document symbols, + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-configuration-layers + '((lsp :variables lsp-headerline-breadcrumb-segments '(project file symbols)))) +#+END_SRC + * Key bindings A number of lsp features useful for all/most modes have been bound to the lsp minor mode, meaning they'll be available in all language layers based on the lsp layer. @@ -100,46 +188,47 @@ The lsp minor mode bindings are: | binding | function | |-------------+----------------------------------------------------------------------------------| -| ~SPC m = b~ | format buffer (lsp) | -| ~SPC m = r~ | format region (lsp) | +| ~SPC m = b~ | format buffer (=lsp-mode=) | +| ~SPC m = r~ | format region (=lsp-mode=) | | ~SPC m = o~ | format (organise) imports | |-------------+----------------------------------------------------------------------------------| -| Note | /The ~f~, ~r~ and ~s~ actions are placeholders for imminent ~lsp-mode~ features/ | +| Note | /The ~f~, ~r~ and ~s~ actions are placeholders for imminent =lsp-mode= features/ | | ~SPC m a a~ | Execute code action | | ~SPC m a f~ | Execute fix action | | ~SPC m a r~ | Execute refactor action | | ~SPC m a s~ | Execute source action | |-------------+----------------------------------------------------------------------------------| -| ~SPC m g t~ | goto type-definition (lsp) | -| ~SPC m g k~ | goto viewport word (avy) (See Note 1) | -| ~SPC m g K~ | goto viewport symbol (avy) (See Note 1) | -| ~SPC m g e~ | browse flycheck errors (lsp-treemacs) | -| ~SPC m g M~ | browse file symbols (lsp-ui-imenu) | +| ~SPC m g t~ | goto type-definition (=lsp-mode=) | +| ~SPC m g k~ | goto viewport word (=avy=) (See Note 1) | +| ~SPC m g K~ | goto viewport symbol (=avy=) (See Note 1) | +| ~SPC m g e~ | browse flycheck errors (=lsp-treemacs=) | +| ~SPC m g M~ | browse file symbols (=lsp-ui-imenu=) | |-------------+----------------------------------------------------------------------------------| -| Note | /Replaced by the lsp-ui-peek equivalents when ~lsp-navigation~ == ='peek=/ | -| ~SPC m g i~ | find implementations (lsp) | -| ~SPC m g d~ | find definitions (xref/lsp) | -| ~SPC m g r~ | find references (xref/lsp) | -| ~SPC m g s~ | find symbol in project (helm-lsp) | -| ~SPC m g S~ | find symbol in all projects (helm-lsp) | -| ~SPC m g p~ | goto previous (xref-pop-marker-stack) | +| Note | /Replaced by the lsp-ui-peek equivalents when ~lsp-navigation~ is ~'peek~ / | +| ~SPC m g i~ | find implementations (=lsp-mode=) | +| ~SPC m g d~ | find definitions (=xref= / =lsp-mode=) | +| ~SPC m g r~ | find references (=xref= / =lsp=) | +| ~SPC m g s~ | find symbol in project (=helm-lsp=) | +| ~SPC m g S~ | find symbol in all projects (=helm-lsp=) | +| ~SPC m g p~ | goto previous (~xref-pop-marker-stack~) | |-------------+----------------------------------------------------------------------------------| -| Note | /Omitted when ~lsp-navigation~ == ='peek= or ='simple=/ | +| Note | /Omitted when ~lsp-navigation~ is ~'peek~ or ~'simple~ / | | | /Bound under ~SPC m g~ rather than ~SPC m G~ when ~lsp-navigation~ == ='peek=/ | -| ~SPC m G i~ | find implementation (lsp-ui-peek) | -| ~SPC m G d~ | find definitions (lsp-ui-peek) | -| ~SPC m G r~ | find references (lsp-ui-peek) | -| ~SPC m G s~ | find workspace symbol (lsp-ui-peek) | -| ~SPC m G S~ | goto workspace symbol (lsp-treemacs-symbols) | -| ~SPC m G p~ | goto previous (lsp-ui-peek stack - see Note 2) | -| ~SPC m G n~ | goto next (lsp-ui-peek stack - see Note 2) | -| ~SPC m G E~ | browse flycheck errors (lsp-ui) | +| ~SPC m G i~ | find implementation (=lsp-ui-peek=) | +| ~SPC m G d~ | find definitions (=lsp-ui-peek=) | +| ~SPC m G r~ | find references (=lsp-ui-peek=) | +| ~SPC m G s~ | find workspace symbol (=lsp-ui-peek=) | +| ~SPC m G S~ | goto workspace symbol (~lsp-treemacs-symbols~) | +| ~SPC m G p~ | goto previous (=lsp-ui-peek= stack - see Note 2) | +| ~SPC m G n~ | goto next (=lsp-ui-peek stack= - see Note 2) | +| ~SPC m G E~ | browse flycheck errors (=lsp-ui=) | |-------------+----------------------------------------------------------------------------------| | ~SPC m h h~ | describe thing at point | |-------------+----------------------------------------------------------------------------------| -| ~SPC m b s~ | lsp-workspace-shutdown | -| ~SPC m b r~ | lsp-workspace-restart | -| ~SPC m b d~ | lsp-describe-session | +| ~SPC m b s~ | ~lsp-workspace-shutdown~ | +| ~SPC m b r~ | ~lsp-workspace-restart~ | +| ~SPC m b d~ | ~lsp-describe-session~ | +| ~SPC m b v~ | ~lsp-version~ | |-------------+----------------------------------------------------------------------------------| | ~SPC m r r~ | rename | |-------------+----------------------------------------------------------------------------------| @@ -225,12 +314,15 @@ whereas with ~lsp-navigation~ set to ~'peek~, this is equivalent to: etc. +* DAP integration +=lsp-mode= integrates with =dap-mode=, which implements DAP(Debugger Adapter Protocol). See documentation on =DAP= layer for details. + * Diagnostics If some features do not work as expected, here is a common check list. -- =M-x lsp-describe-session= If the LSP workspace is initialized correctly -- =M-: xref-backend-functions= should be =(lsp--xref-backend)= for cross +- ~M-x lsp-describe-session~ If the LSP workspace is initialized correctly +- ~M-: xref-backend-functions~ should be ~(lsp--xref-backend)~ for cross references -- =M-: completion-at-point-functions= should be =(lsp-completion-at-point)= for +- ~M-: completion-at-point-functions~ should be ~(lsp-completion-at-point)~ for completion * References diff --git a/dot_emacs.d/layers/+tools/lsp/config.el b/dot_emacs.d/layers/+tools/lsp/config.el index 904fded..9c5998c 100644 --- a/dot_emacs.d/layers/+tools/lsp/config.el +++ b/dot_emacs.d/layers/+tools/lsp/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Language Server Protocol Layer config file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fangrui Song ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/lsp/funcs.el b/dot_emacs.d/layers/+tools/lsp/funcs.el index 901e1ef..cbc7c69 100644 --- a/dot_emacs.d/layers/+tools/lsp/funcs.el +++ b/dot_emacs.d/layers/+tools/lsp/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Language Server Protocol Layer functions file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fangrui Song ;; URL: https://github.com/syl20bnr/spacemacs @@ -57,6 +57,7 @@ "bd" #'lsp-describe-session "br" #'lsp-workspace-restart "bs" #'lsp-workspace-shutdown + "bv" #'lsp-version ;; refactor "rr" #'lsp-rename ;; toggles diff --git a/dot_emacs.d/layers/+tools/lsp/layers.el b/dot_emacs.d/layers/+tools/lsp/layers.el index b76ed31..d358f7b 100644 --- a/dot_emacs.d/layers/+tools/lsp/layers.el +++ b/dot_emacs.d/layers/+tools/lsp/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Language Server Protocol layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/lsp/packages.el b/dot_emacs.d/layers/+tools/lsp/packages.el index 0194d17..fcaab40 100644 --- a/dot_emacs.d/layers/+tools/lsp/packages.el +++ b/dot_emacs.d/layers/+tools/lsp/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Language Server Protocol Layer packages file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fangrui Song ;; URL: https://github.com/syl20bnr/spacemacs @@ -16,6 +16,7 @@ (helm-lsp :requires helm) (lsp-ivy :requires ivy) (lsp-treemacs :requires treemacs) + (lsp-origami :requires lsp-mode) popwin)) (defun lsp/init-lsp-mode () @@ -57,6 +58,12 @@ (defun lsp/init-lsp-treemacs () (use-package lsp-treemacs :defer t)) +(defun lsp/init-lsp-origami () + (use-package lsp-origami + :defer t + :init + (add-hook 'lsp-after-open-hook #'lsp-origami-try-enable))) + (defun lsp/pre-init-popwin () (spacemacs|use-package-add-hook popwin :post-config diff --git a/dot_emacs.d/layers/+tools/nginx/packages.el b/dot_emacs.d/layers/+tools/nginx/packages.el index 0231885..7a21fa8 100644 --- a/dot_emacs.d/layers/+tools/nginx/packages.el +++ b/dot_emacs.d/layers/+tools/nginx/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- nginx layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Nathaniel Waisbrot ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/node/config.el b/dot_emacs.d/layers/+tools/node/config.el index 28c260d..d4a80ba 100644 --- a/dot_emacs.d/layers/+tools/node/config.el +++ b/dot_emacs.d/layers/+tools/node/config.el @@ -1,6 +1,6 @@ ;;; config.el --- node layer configuration file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Eivind Fonn ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/node/packages.el b/dot_emacs.d/layers/+tools/node/packages.el index a85c766..d7b5a12 100644 --- a/dot_emacs.d/layers/+tools/node/packages.el +++ b/dot_emacs.d/layers/+tools/node/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- node layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Juan Placencia ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/pandoc/funcs.el b/dot_emacs.d/layers/+tools/pandoc/funcs.el index 12654ff..bad8384 100644 --- a/dot_emacs.d/layers/+tools/pandoc/funcs.el +++ b/dot_emacs.d/layers/+tools/pandoc/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- pandoc Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christoph Paulik ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/pandoc/packages.el b/dot_emacs.d/layers/+tools/pandoc/packages.el index 11853e0..f971210 100644 --- a/dot_emacs.d/layers/+tools/pandoc/packages.el +++ b/dot_emacs.d/layers/+tools/pandoc/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- pandoc Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christoph Paulik ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/pass/README.org b/dot_emacs.d/layers/+tools/pass/README.org index 677832c..2b1f493 100644 --- a/dot_emacs.d/layers/+tools/pass/README.org +++ b/dot_emacs.d/layers/+tools/pass/README.org @@ -15,6 +15,9 @@ function properly. ** Features: - Use Spacemacs as your password manager +- Support for OTP via (password-store-otp) +- Use password-store as an Emacs auth source (auth-source-pass) + See [[https://www.gnu.org/software/emacs/manual/html_node/auth/The-Unix-password-store.html][its info page]] for more details on using it. * Install To use this configuration layer, add it to your =~/.spacemacs=. You will need to @@ -23,17 +26,22 @@ file. * Key bindings -| Key bindings | Description | -|---------------+-----------------------------------------------| -| ~SPC a t P /~ | copy password using =helm-pass= or =ivy-pass= | -| ~SPC a t P y~ | copy password | -| ~SPC a t P Y~ | copy and describe password | -| ~SPC a t P ?~ | describe password | -| ~SPC a t P g~ | generate new password | -| ~SPC a t P i~ | insert new password | -| ~SPC a t P c~ | edit password | -| ~SPC a t P r~ | rename password | -| ~SPC a t P d~ | remove from password store | -| ~SPC a t P D~ | clear the password store | -| ~SPC a t P I~ | initialize the password store | -| ~SPC a t P w~ | open url | +| Key bindings | Description | +|-----------------+--------------------------------------------------------| +| ~SPC a t P /~ | copy password using =helm-pass= or =ivy-pass= | +| ~SPC a t P y~ | copy password | +| ~SPC a t P Y~ | copy and describe password | +| ~SPC a t P ?~ | describe password | +| ~SPC a t P g~ | generate new password | +| ~SPC a t P i~ | insert new password | +| ~SPC a t P c~ | edit password | +| ~SPC a t P r~ | rename password | +| ~SPC a t P d~ | remove from password store | +| ~SPC a t P D~ | clear the password store | +| ~SPC a t P I~ | initialize the password store | +| ~SPC a t P w~ | open url | +| ~SPC a t P o y~ | copy OTP token | +| ~SPC a t P o Y~ | copy OTP URI | +| ~SPC a t P o i~ | insert new OTP | +| ~SPC a t P o a~ | append OTP to an entry | +| ~SPC a t P o A~ | append OTP to an entry from QR code image in clipboard | diff --git a/dot_emacs.d/layers/+tools/pass/funcs.el b/dot_emacs.d/layers/+tools/pass/funcs.el index eb9ecb3..4b40336 100644 --- a/dot_emacs.d/layers/+tools/pass/funcs.el +++ b/dot_emacs.d/layers/+tools/pass/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el -- Passwords Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrew Oppenlander ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/pass/packages.el b/dot_emacs.d/layers/+tools/pass/packages.el index 0ff5759..b7f4c3a 100644 --- a/dot_emacs.d/layers/+tools/pass/packages.el +++ b/dot_emacs.d/layers/+tools/pass/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Passwords Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Andrew Oppenlander ;; URL: https://github.com/syl20bnr/spacemacs @@ -13,7 +13,9 @@ '( (ivy-pass :requires ivy) (helm-pass :requires helm) + auth-source-pass password-store + password-store-otp )) (defun pass/init-helm-pass () @@ -44,3 +46,22 @@ "atPw" 'password-store-url "atP?" 'spacemacs/pass-describe "atPY" 'spacemacs/pass-copy-and-describe)))) + +(defun pass/init-password-store-otp () + (use-package password-store-otp + :defer t + :init + (progn + (spacemacs/declare-prefix "atPo" "otp") + (spacemacs/set-leader-keys + "atPoy" 'password-store-otp-token-copy + "atPoY" 'password-store-otp-uri-copy + "atPoi" 'password-store-otp-insert + "atPoa" 'password-store-otp-append + "atPoA" 'password-store-otp-append-from-image)))) + +(defun pass/init-auth-source-pass () + (use-package auth-source-pass + :after auth-source + :config + (auth-source-pass-enable))) diff --git a/dot_emacs.d/layers/+tools/prettier/config.el b/dot_emacs.d/layers/+tools/prettier/config.el index 5ea5c0b..24a427b 100644 --- a/dot_emacs.d/layers/+tools/prettier/config.el +++ b/dot_emacs.d/layers/+tools/prettier/config.el @@ -1,6 +1,6 @@ ;;; config.el --- prettier Layer configuration file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/prettier/packages.el b/dot_emacs.d/layers/+tools/prettier/packages.el index 8f01f9d..d377846 100644 --- a/dot_emacs.d/layers/+tools/prettier/packages.el +++ b/dot_emacs.d/layers/+tools/prettier/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- prettier Layer packages file for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Seong Yong-ju ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/prodigy/packages.el b/dot_emacs.d/layers/+tools/prodigy/packages.el index 173ac13..5242444 100644 --- a/dot_emacs.d/layers/+tools/prodigy/packages.el +++ b/dot_emacs.d/layers/+tools/prodigy/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Prodigy Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/puppet/layers.el b/dot_emacs.d/layers/+tools/puppet/layers.el index 190d513..bab65bf 100644 --- a/dot_emacs.d/layers/+tools/puppet/layers.el +++ b/dot_emacs.d/layers/+tools/puppet/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Puppet layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/puppet/packages.el b/dot_emacs.d/layers/+tools/puppet/packages.el index 5519d37..ca68948 100644 --- a/dot_emacs.d/layers/+tools/puppet/packages.el +++ b/dot_emacs.d/layers/+tools/puppet/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Puppet layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/quickurl/keybindings.el b/dot_emacs.d/layers/+tools/quickurl/keybindings.el index 37f1e94..89c9240 100644 --- a/dot_emacs.d/layers/+tools/quickurl/keybindings.el +++ b/dot_emacs.d/layers/+tools/quickurl/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Quickurl dispatch layer. ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Spenser Truex ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ranger/README.org b/dot_emacs.d/layers/+tools/ranger/README.org index 41aa0fc..a7c6d47 100644 --- a/dot_emacs.d/layers/+tools/ranger/README.org +++ b/dot_emacs.d/layers/+tools/ranger/README.org @@ -18,11 +18,17 @@ To use this configuration layer, add it to your =~/.spacemacs=. You will need to add =ranger= to the existing =dotspacemacs-configuration-layers= list in this file. -To default with preview enabled when entering ranger: +To use ranger/deer by default set ~ranger-override-dired~ to ~ranger/deer~ like +shown in the example below (setting this via customize as explained by the +original [[https://github.com/ralesi/ranger.el#installation][ranger installation instructions]] will not work). To default with +preview enabled when entering ranger set ~ranger-show-preview~ to ~t~. The following +example code shows how you can set both variables at once via the +~dotspacemacs-configuration-layers~ of your dotfiles as follows: #+BEGIN_SRC emacs-lisp (setq-default dotspacemacs-configuration-layers '(ranger :variables + ranger-override-dired 'ranger ranger-show-preview t)) #+END_SRC diff --git a/dot_emacs.d/layers/+tools/ranger/config.el b/dot_emacs.d/layers/+tools/ranger/config.el index f7c3c12..b7c181d 100644 --- a/dot_emacs.d/layers/+tools/ranger/config.el +++ b/dot_emacs.d/layers/+tools/ranger/config.el @@ -1,7 +1,7 @@ ;;; config.el --- ranger Layer config File for Spacemacs ;; -;; Copyright (c) 2012-2014 Sylvain Benner -;; Copyright (c) 2014-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner +;; Copyright (c) 2020-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/ranger/packages.el b/dot_emacs.d/layers/+tools/ranger/packages.el index 9142b17..85fd353 100644 --- a/dot_emacs.d/layers/+tools/ranger/packages.el +++ b/dot_emacs.d/layers/+tools/ranger/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- ranger Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Rich Alesi ;; Author: Sylvain Benner diff --git a/dot_emacs.d/layers/+tools/rebox/config.el b/dot_emacs.d/layers/+tools/rebox/config.el index d3dcb67..585db77 100644 --- a/dot_emacs.d/layers/+tools/rebox/config.el +++ b/dot_emacs.d/layers/+tools/rebox/config.el @@ -1,6 +1,6 @@ ;;; config.el --- rebox layer configuration file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian E. Hopps ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/rebox/funcs.el b/dot_emacs.d/layers/+tools/rebox/funcs.el index 18d2561..5dd26c0 100644 --- a/dot_emacs.d/layers/+tools/rebox/funcs.el +++ b/dot_emacs.d/layers/+tools/rebox/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- rebox layer function file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian E. Hopps ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/rebox/packages.el b/dot_emacs.d/layers/+tools/rebox/packages.el index 5374cc7..f2c3c30 100644 --- a/dot_emacs.d/layers/+tools/rebox/packages.el +++ b/dot_emacs.d/layers/+tools/rebox/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- rebox layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Christian E. Hopps ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/restclient/config.el b/dot_emacs.d/layers/+tools/restclient/config.el index e6e3eec..b02bfdc 100644 --- a/dot_emacs.d/layers/+tools/restclient/config.el +++ b/dot_emacs.d/layers/+tools/restclient/config.el @@ -1,6 +1,6 @@ ;;; config.el --- restclient configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/restclient/funcs.el b/dot_emacs.d/layers/+tools/restclient/funcs.el index 0135194..2d4865a 100644 --- a/dot_emacs.d/layers/+tools/restclient/funcs.el +++ b/dot_emacs.d/layers/+tools/restclient/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- restclient Layer functions File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/restclient/packages.el b/dot_emacs.d/layers/+tools/restclient/packages.el index 8b68128..715aa88 100644 --- a/dot_emacs.d/layers/+tools/restclient/packages.el +++ b/dot_emacs.d/layers/+tools/restclient/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- restclient Layer Packages File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/sailfish-developer/packages.el b/dot_emacs.d/layers/+tools/sailfish-developer/packages.el index ed50ec6..e5f2d67 100644 --- a/dot_emacs.d/layers/+tools/sailfish-developer/packages.el +++ b/dot_emacs.d/layers/+tools/sailfish-developer/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- sailfish-developer layer packages file for Spacemacs. ;; -;; Copyright (c) 2017 Sylvain Benner & Contributors +;; Copyright (c) 2020 Sylvain Benner & Contributors ;; ;; Author: Victor Polevoy ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/salt/packages.el b/dot_emacs.d/layers/+tools/salt/packages.el index 1315204..632f954 100644 --- a/dot_emacs.d/layers/+tools/salt/packages.el +++ b/dot_emacs.d/layers/+tools/salt/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Salt Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Ben Hayden ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/sphinx/layers.el b/dot_emacs.d/layers/+tools/sphinx/layers.el index dc6e149..9ff235e 100644 --- a/dot_emacs.d/layers/+tools/sphinx/layers.el +++ b/dot_emacs.d/layers/+tools/sphinx/layers.el @@ -1,6 +1,6 @@ ;;; layers.el --- Sphinx layer layers File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/sphinx/packages.el b/dot_emacs.d/layers/+tools/sphinx/packages.el index 7a1b1cb..3e2ea61 100644 --- a/dot_emacs.d/layers/+tools/sphinx/packages.el +++ b/dot_emacs.d/layers/+tools/sphinx/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Sphinx layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/systemd/packages.el b/dot_emacs.d/layers/+tools/systemd/packages.el index eb3e00f..f8199ef 100644 --- a/dot_emacs.d/layers/+tools/systemd/packages.el +++ b/dot_emacs.d/layers/+tools/systemd/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- systemd layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Fabien Dubosson ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/tmux/packages.el b/dot_emacs.d/layers/+tools/tmux/packages.el index a875434..3579738 100644 --- a/dot_emacs.d/layers/+tools/tmux/packages.el +++ b/dot_emacs.d/layers/+tools/tmux/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- tmux Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/transmission/config.el b/dot_emacs.d/layers/+tools/transmission/config.el index 33b4754..3637e48 100644 --- a/dot_emacs.d/layers/+tools/transmission/config.el +++ b/dot_emacs.d/layers/+tools/transmission/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Transmission Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/transmission/packages.el b/dot_emacs.d/layers/+tools/transmission/packages.el index a736722..dc4695e 100644 --- a/dot_emacs.d/layers/+tools/transmission/packages.el +++ b/dot_emacs.d/layers/+tools/transmission/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Transmission Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/vagrant/README.org b/dot_emacs.d/layers/+tools/vagrant/README.org index 2479750..ed5aee5 100644 --- a/dot_emacs.d/layers/+tools/vagrant/README.org +++ b/dot_emacs.d/layers/+tools/vagrant/README.org @@ -31,7 +31,7 @@ file. to install the =ruby= layer as well. ** Vagrant -Follow the [[https://www.vagrantup.com/docs/installation/index.html][Installing Vagrant]] and [[https://www.vagrantup.com/intro/getting-started/index.html][Getting Started]] guides in +Follow the [[https://www.vagrantup.com/docs/installation#installing-vagrant][Installing Vagrant]] and [[https://www.vagrantup.com/intro/getting-started/index.html][Getting Started]] guides in Vagrant's documentation. ** Testing diff --git a/dot_emacs.d/layers/+tools/vagrant/packages.el b/dot_emacs.d/layers/+tools/vagrant/packages.el index 1e7b3d5..e51a669 100644 --- a/dot_emacs.d/layers/+tools/vagrant/packages.el +++ b/dot_emacs.d/layers/+tools/vagrant/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Vagrant Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Brian Hicks ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/web-beautify/config.el b/dot_emacs.d/layers/+tools/web-beautify/config.el index f83a934..877aad6 100644 --- a/dot_emacs.d/layers/+tools/web-beautify/config.el +++ b/dot_emacs.d/layers/+tools/web-beautify/config.el @@ -1,6 +1,6 @@ ;;; config.el --- web-beautify Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/web-beautify/packages.el b/dot_emacs.d/layers/+tools/web-beautify/packages.el index d03012b..a09b624 100644 --- a/dot_emacs.d/layers/+tools/web-beautify/packages.el +++ b/dot_emacs.d/layers/+tools/web-beautify/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- web-beautify Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/xclipboard/config.el b/dot_emacs.d/layers/+tools/xclipboard/config.el index f49d38e..1901d59 100644 --- a/dot_emacs.d/layers/+tools/xclipboard/config.el +++ b/dot_emacs.d/layers/+tools/xclipboard/config.el @@ -1,6 +1,6 @@ ;;; config.el --- xclipboard configuration File for Spacemacs ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Hong Xu ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/xclipboard/funcs.el b/dot_emacs.d/layers/+tools/xclipboard/funcs.el index 7c7a5c2..50239a5 100644 --- a/dot_emacs.d/layers/+tools/xclipboard/funcs.el +++ b/dot_emacs.d/layers/+tools/xclipboard/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- xclipboard layer functions file for Spacemacs. ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Hong Xu ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+tools/xclipboard/local/spacemacs-xclipboard/spacemacs-xclipboard.el b/dot_emacs.d/layers/+tools/xclipboard/local/spacemacs-xclipboard/spacemacs-xclipboard.el index cd6e6d1..fd75caa 100644 --- a/dot_emacs.d/layers/+tools/xclipboard/local/spacemacs-xclipboard/spacemacs-xclipboard.el +++ b/dot_emacs.d/layers/+tools/xclipboard/local/spacemacs-xclipboard/spacemacs-xclipboard.el @@ -1,6 +1,6 @@ ;;; spacemacs-xclipboard.el --- Add support for xclipboard in the terminal ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Authors: Charles Weill ;; Google LLC. diff --git a/dot_emacs.d/layers/+tools/xclipboard/packages.el b/dot_emacs.d/layers/+tools/xclipboard/packages.el index e87872c..1d65492 100644 --- a/dot_emacs.d/layers/+tools/xclipboard/packages.el +++ b/dot_emacs.d/layers/+tools/xclipboard/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- xclipboard layer packages file for Spacemacs. ;; -;; Copyright (c) 2012-2019 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Authors: Charles Weill ;; Google LLC. diff --git a/dot_emacs.d/layers/+vim/evil-commentary/packages.el b/dot_emacs.d/layers/+vim/evil-commentary/packages.el index 07f143f..31968a7 100644 --- a/dot_emacs.d/layers/+vim/evil-commentary/packages.el +++ b/dot_emacs.d/layers/+vim/evil-commentary/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- evil-commentary Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+vim/evil-snipe/config.el b/dot_emacs.d/layers/+vim/evil-snipe/config.el index a65a290..571109a 100644 --- a/dot_emacs.d/layers/+vim/evil-snipe/config.el +++ b/dot_emacs.d/layers/+vim/evil-snipe/config.el @@ -1,6 +1,6 @@ ;;; config.el --- evil-snipe Layer configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+vim/vinegar/config.el b/dot_emacs.d/layers/+vim/vinegar/config.el index e8090ee..3c0ebb0 100644 --- a/dot_emacs.d/layers/+vim/vinegar/config.el +++ b/dot_emacs.d/layers/+vim/vinegar/config.el @@ -1,6 +1,6 @@ ;;; config.el --- Vinegar Layer Configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+vim/vinegar/funcs.el b/dot_emacs.d/layers/+vim/vinegar/funcs.el index 2ef1cde..1e795fb 100644 --- a/dot_emacs.d/layers/+vim/vinegar/funcs.el +++ b/dot_emacs.d/layers/+vim/vinegar/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Vinegar Layer Functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+vim/vinegar/keybindings.el b/dot_emacs.d/layers/+vim/vinegar/keybindings.el index 47d4b56..12a2fa5 100644 --- a/dot_emacs.d/layers/+vim/vinegar/keybindings.el +++ b/dot_emacs.d/layers/+vim/vinegar/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Vinegar Layer keybindings File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+vim/vinegar/packages.el b/dot_emacs.d/layers/+vim/vinegar/packages.el index 4d63e4a..55c986c 100644 --- a/dot_emacs.d/layers/+vim/vinegar/packages.el +++ b/dot_emacs.d/layers/+vim/vinegar/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- vinegar Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+web-services/confluence/funcs.el b/dot_emacs.d/layers/+web-services/confluence/funcs.el index b4b9082..31ffea4 100644 --- a/dot_emacs.d/layers/+web-services/confluence/funcs.el +++ b/dot_emacs.d/layers/+web-services/confluence/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- Confluence Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+web-services/confluence/packages.el b/dot_emacs.d/layers/+web-services/confluence/packages.el index c92d7fe..eb7af6e 100644 --- a/dot_emacs.d/layers/+web-services/confluence/packages.el +++ b/dot_emacs.d/layers/+web-services/confluence/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Confluence Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+web-services/evernote/packages.el b/dot_emacs.d/layers/+web-services/evernote/packages.el index aa54318..9e5d448 100644 --- a/dot_emacs.d/layers/+web-services/evernote/packages.el +++ b/dot_emacs.d/layers/+web-services/evernote/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- Evernote Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+web-services/search-engine/config.el b/dot_emacs.d/layers/+web-services/search-engine/config.el index c2e8876..388f453 100644 --- a/dot_emacs.d/layers/+web-services/search-engine/config.el +++ b/dot_emacs.d/layers/+web-services/search-engine/config.el @@ -1,6 +1,6 @@ ;;; config.el --- search-engine configuration File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+web-services/search-engine/funcs.el b/dot_emacs.d/layers/+web-services/search-engine/funcs.el index 4505941..c7d2f4e 100644 --- a/dot_emacs.d/layers/+web-services/search-engine/funcs.el +++ b/dot_emacs.d/layers/+web-services/search-engine/funcs.el @@ -1,6 +1,6 @@ ;;; funcs.el --- search-engine Layer functions File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/+web-services/search-engine/packages.el b/dot_emacs.d/layers/+web-services/search-engine/packages.el index 73faff2..e0276b7 100644 --- a/dot_emacs.d/layers/+web-services/search-engine/packages.el +++ b/dot_emacs.d/layers/+web-services/search-engine/packages.el @@ -1,6 +1,6 @@ ;;; packages.el --- search-engine Layer packages File for Spacemacs ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/layers/LAYERS.org b/dot_emacs.d/layers/LAYERS.org index 0e49ac4..ad126c0 100644 --- a/dot_emacs.d/layers/LAYERS.org +++ b/dot_emacs.d/layers/LAYERS.org @@ -28,6 +28,7 @@ - [[#quickurl][Quickurl]] - [[#semantic][Semantic]] - [[#smex][Smex]] + - [[#tabs][Tabs]] - [[#typography][Typography]] - [[#file-trees][File trees]] - [[#neotree][Neotree]] @@ -45,6 +46,7 @@ - [[#keyboard-layout][Keyboard-layout]] - [[#miscellaneous][Miscellaneous]] - [[#copy-as-format][Copy-as-format]] + - [[#dtrt-indent][Dtrt-indent]] - [[#ietf][Ietf]] - [[#multiple-cursors][Multiple-cursors]] - [[#nlinum][Nlinum]] @@ -181,6 +183,8 @@ - [[#epub][Epub]] - [[#pdf][PDF]] - [[#speed-reading][Speed Reading]] +- [[#readmeorg-files-that-need-proper-tags][README.org files that need proper tags]] + - [[#languagetool][LanguageTool]] - [[#source-control][Source control]] - [[#git][Git]] - [[#github][GitHub]] @@ -482,6 +486,7 @@ Features: - Insertion of images via [[https://github.com/abo-abo/org-download][org-download]] - Project-specific TODOs via [[https://github.com/IvanMalison/org-projectile][org-projectile]] - Easy insert of URLs from clipboard with org format via [[https://github.com/rexim/org-cliplink][org-cliplink]] +- Rich insert of code (into a source block with highlighting, and a link) from other buffers via [[https://github.com/unhammer/org-rich-yank][org-rich-yank]] ** Outshine [[file:+emacs/outshine/README.org][+emacs/outshine/README.org]] @@ -537,6 +542,14 @@ This layer provides a more traditional alternative to =helm-M-x= based on =ido=. Features: - Provides an alternative way for =helm-M-x= based on =ido= and [[https://github.com/nonsequitur/smex][smex]] +** Tabs +[[file:+emacs/tabs/README.org][+emacs/tabs/README.org]] + +This layer adds support for tabs. Implementation is done using [[https://github.com/ema2159/centaur-tabs][Centaur Tabs]]. + +Features: +- Sets up tabs using Centaur tabs as backend + ** Typography [[file:+emacs/typography/README.org][+emacs/typography/README.org]] @@ -591,7 +604,7 @@ readme]]. In short, Treemacs offers: ** Unicode-fonts [[file:+fonts/unicode-fonts/README.org][+fonts/unicode-fonts/README.org]] -This layer adds support for the [[https://github.com/rolandwalker/unicode-fonts][unicode-fonts]] package. It is recommended to +This layer adds support for [[https://github.com/rolandwalker/unicode-fonts][unicode-fonts]] package. It is recommended to install the fonts listed in the [[https://github.com/rolandwalker/unicode-fonts#quickstart][Quickstart]] section of the unicode-fonts README. Features: @@ -599,6 +612,7 @@ Features: - Easily override glyphs or sections of glyphs. - Display color emoji on both the macOS port version of Emacs and emacs-plus (with =unicode-fonts-force-multi-color-on-mac= set to non nil). +- Enable support for font ligature in Emacs 27 + via [[https://github.com/mickeynp/ligature.el][ligatures.el]]. * Fun ** Emoji @@ -674,7 +688,7 @@ Features: - [[https://github.com/emacs-jp/migemo][migemo]]: Japanese incremental search through dynamic pattern expansion - [[https://github.com/emacs-helm/helm/wiki/Migemo][helm-migemo-mode]]: helm with migemo - [[https://github.com/momomo5717/avy-migemo/blob/master/README.jp.org][avy-migemo]]: avy with migemo -- [[https://github.com/hsaito/ddskk][ddskk]]: Simple Kana to Kanji conversion program (SKK) +- [[https://github.com/skk-dev/ddskk][ddskk]]: Simple Kana to Kanji conversion program (SKK) - [[https://github.com/emacs-jp/japanese-holidays][japanese-holidays]]: calendar functions for the Japanese calendar - [[https://github.com/coldnew/pangu-spacing][pangu-spacing]]: emacs minor-mode to add space between Japanese and English characters. @@ -701,6 +715,16 @@ This layer adds support for [[https://github.com/sshaw/copy-as-format][copy-as-f Features: - Function to copy buffer locations as GitHub/Slack/JIRA/HipChat/... formatted code +** Dtrt-indent +[[file:+misc/dtrt-indent/README.org][+misc/dtrt-indent/README.org]] + +This is a simple layer wrapping the dtrt-indent Emacs package for automatic detection and switching of indentation style. + +It is automatically enabled using the method [[https://github.com/syl20bnr/spacemacs/issues/3203#issuecomment-264175032][suggested here]]. + +Features: +- Indentation style detection and automatic configuration to match file in open buffer. + ** Ietf [[file:+misc/ietf/README.org][+misc/ietf/README.org]] @@ -771,6 +795,7 @@ Features: - archive-mode - bookmark - conf-mode + - cus-edit - dired - dired-x - display-line-numbers (only in Emacs 26.x and newer) @@ -815,7 +840,7 @@ Features: - Support for selecting, copying and opening links using =avy= via =link-hint=. - Adding of sample text via =lorem-ipsum=. - Transient state for moving text via =move-text=. -- Support for folding of code via =origami=. +- Support for folding of code via =origami= and =evil-vimish-fold=. - Support for password generation via =password-generator=. - Support for improving parenthesis handling via =smartparens=. - Automatic whitespace cleanup on save via =spacemacs-whitespace-cleanup=. @@ -937,7 +962,7 @@ This layer tweaks =org-mode= to integrate nicely into Spacemacs. Features: - Configuration for =flyspell= to check =org-buffers= for typos. - Support for automatically generated Table-Of-Contents via =toc-org=. -- Support for custom bullet markers via =org-bullets=. +- Support for custom bullet markers via =org-superstar=. - Support for a special view mode for org documents via =space-doc=. ** Spacemacs-project @@ -1322,7 +1347,7 @@ Features: **** Semantic Web [[file:+lang/semantic-web/README.org][+lang/semantic-web/README.org]] -This layer adds support for RDF files in N3 and [[https://www.w3.org/TR/turtle/][Turtle syntax]] using [[https://bitbucket.org/nxg/ttl-mode][ttl-mode]] +This layer adds support for RDF files in N3 and [[https://www.w3.org/TR/turtle/][Turtle syntax]] using [[https://github.com/nxg/ttl-mode][ttl-mode]] and for [[https://www.w3.org/TR/sparql11-query/][SPARQL]] queries using [[https://github.com/ljos/sparql-mode][sparql-mode]]. SPARQL-mode supports the execution of queries. When first called, you will be @@ -1884,7 +1909,7 @@ This layer adds support for F# language using [[https://github.com/fsharp/fsharp Features: - Syntax highlighting -- Code completion +- Code completion (through Eglot) - Flycheck integration - REPL - Compile/Run/Interpreter and info tooltip shortcuts @@ -1910,17 +1935,17 @@ This layer adds extensive support for the [[https://golang.org][Go]] programming Features: - Run [[https://golang.org/cmd/gofmt/][gofmt]] / [[https://godoc.org/golang.org/x/tools/cmd/goimports][goimports]] on file save (see [[file:+lang/go/README.org][Autoformat]]) -- Auto-completion using [[https://github.com/nsf/gocode/tree/master/emacs][go-autocomplete.el]], via the =auto-completion= layer (see [[file:+lang/go/README.org][Auto-completion]]) +- Auto-completion - Source analysis using [[https://docs.google.com/document/d/1_Y9xCEMj5S-7rv2ooHpZNH15JgRT5iM742gJkw5LtmQ][go-guru]] (see [[file:+lang/go/README.org][Guru]]) -- Refactoring with [[http://gorefactor.org/][godoctor]] +- Refactoring with [[https://github.com/godoctor/godoctor][godoctor]] - Edit struct field tags with [[https://github.com/fatih/gomodifytags][gomodifytags]] -- Linting with flycheck's built-in checkers or [[https://github.com/golangci/golangci-lint][golangci-lint]] (see [[file:+lang/go/README.org][Linting]]) +- Syntax checking with flycheck's built-in checkers or [[https://github.com/golangci/golangci-lint][golangci-lint]] (see [[file:+lang/go/README.org][Linting]]) - Test generation via [[https://github.com/s-kostyaev/go-gen-test][go-gen-test]] (see [[file:+lang/go/README.org][Tests]]) - Coverage profile visualization (see [[file:+lang/go/README.org][Coverage]]) - List packages faster with [[https://github.com/haya14busa/gopkgs][gopkgs]] - Fill a structure with default values using the [[https://github.com/davidrjenni/reftools/tree/master/cmd/fillstruct][fillstruct]] -- LSP backend (see [[file:+lang/go/README.org][LSP backend]]) -- Interactive debugger using [[https://github.com/emacs-lsp/dap-mode][dap-mode]] +- Gopls backend support (see [[file:+lang/go/README.org][LSP backend]]) +- Interactive debugger with LSP using [[https://github.com/emacs-lsp/dap-mode][dap-mode]] **** Groovy [[file:+lang/groovy/README.org][+lang/groovy/README.org]] @@ -2094,7 +2119,7 @@ This layer adds support for the Python language. Features: - Support for the following backends: - [[https://github.com/proofit404/anaconda-mode][anaconda]] (default), - - [[https://github.com/emacs-lsp/lsp-python][Language Server Protocol]] (experimental - 2 implementations), + - [[https://github.com/emacs-lsp/lsp-python-ms][Language Server Protocol]] (experimental - 2 implementations), - python-language-server - Microsoft python language server - Auto-completion @@ -2248,10 +2273,8 @@ Features: This layer adds support for the [[https://www.haskell.org/][Haskell]] language. Features: -- syntax highlighting for [[https://github.com/haskell/haskell-mode][haskell source]], [[https://github.com/haskell/haskell-mode][cabal files]], [[https://github.com/bgamari/cmm-mode][C-- source]], -- auto-completion with one of the selected backends (=dante= or =lsp=). - -*This layer is under construction, it needs your contributions and bug reports.* +- syntax highlighting for [[https://github.com/haskell/haskell-mode][haskell source]], [[https://github.com/haskell/haskell-mode][cabal files]], [[https://github.com/bgamari/cmm-mode][C-- source]] +- auto-completion and syntax-checking with one of the selected backends (=dante= or =lsp=). **** Idris [[file:+lang/idris/README.org][+lang/idris/README.org]] @@ -2390,6 +2413,16 @@ A speed reading mode for Emacs. Features: - Support for =speed-reading= of arbitrary texts +* README.org files that need proper tags +** LanguageTool +[[file:+tools/languagetool/README.org][+tools/languagetool/README.org]] + +This layer adds grammar checking using [[https://www.languagetool.org/][LanguageTool]]. LanguageTool will use the +language set using ~SPC S d~ if the =spell-checking= layer is enabled. + +Features: +- Spelling and grammar checking + * Source control ** Git [[file:+source-control/git/README.org][+source-control/git/README.org]] @@ -2478,7 +2511,7 @@ Features: This layer loads the necessary packages for spacemacs to start-up. Features: -- Loads =evil= key bindings and macros for auto-evilifcation of maps +- Loads =evil= key bindings and macros for auto-evilification of maps - Loads =holy= and =hybrid= modes - Loads the official Spacemacs theme - Loads =use-package= which is used to load other packages more easily @@ -2775,7 +2808,7 @@ This layer adds support for basic language server protocol packages speaking Different language servers may support the language server protocol to varying degrees and they may also provide extensions; check the language server's website for details. -=M-x lsp-describe-session= in a LSP buffer to list capabilities of the server. +~M-x lsp-describe-session~ in a LSP buffer to list capabilities of the server. Features: - Cross references (definitions, references, document symbol, workspace symbol @@ -2783,11 +2816,12 @@ Features: - Workspace-wide symbol rename - Symbol highlighting - Flycheck -- Completion with =lsp= -- Signature help with eldoc +- Completion with =LSP= +- Signature help with =eldoc= - Symbol documentation in a child frame (=lsp-ui-doc=) -- Navigation using imenu +- Navigation using =imenu= - Consistent core key bindings in LSP modes +- Code folding (=lsp-origami=) ** Meson [[file:+tools/meson/README.org][+tools/meson/README.org]] @@ -2839,6 +2873,9 @@ function properly. Features: - Use Spacemacs as your password manager +- Support for OTP via (password-store-otp) +- Use password-store as an Emacs auth source (auth-source-pass) + See [[https://www.gnu.org/software/emacs/manual/html_node/auth/The-Unix-password-store.html][its info page]] for more details on using it. ** Prettier [[file:+tools/prettier/README.org][+tools/prettier/README.org]] @@ -2882,11 +2919,17 @@ To use this configuration layer, add it to your =~/.spacemacs=. You will need to add =ranger= to the existing =dotspacemacs-configuration-layers= list in this file. -To default with preview enabled when entering ranger: +To use ranger/deer by default set ~ranger-override-dired~ to ~ranger/deer~ like +shown in the example below (setting this via customize as explained by the +original [[https://github.com/ralesi/ranger.el#installation][ranger installation instructions]] will not work). To default with +preview enabled when entering ranger set ~ranger-show-preview~ to ~t~. The following +example code shows how you can set both variables at once via the +~dotspacemacs-configuration-layers~ of your dotfiles as follows: #+BEGIN_SRC emacs-lisp (setq-default dotspacemacs-configuration-layers '(ranger :variables + ranger-override-dired 'ranger ranger-show-preview t)) #+END_SRC diff --git a/dot_emacs.d/layers/auto-layer.el b/dot_emacs.d/layers/auto-layer.el index 1558f88..0f1b07f 100644 --- a/dot_emacs.d/layers/auto-layer.el +++ b/dot_emacs.d/layers/auto-layer.el @@ -1,6 +1,6 @@ ;;; auto-layer.el --- auto-mode-alist entries for layer installation ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -57,6 +57,7 @@ (configuration-layer/lazy-install 'ocaml :extensions '("\\(\\.ml[ip]?\\'\\|\\.eliomi?\\'\\)" tuareg-mode)) (configuration-layer/lazy-install 'perl5 :extensions '("\\.\\(p[lm]x?\\|P[LM]X?\\)\\'" cperl-mode)) (configuration-layer/lazy-install 'php :extensions '("\\(\\.amk\\'\\|/Amkfile\\'\\|\\.phtml\\'\\|\\.php[s345t]?\\'\\|[^/]\\.\\(module\\|test\\|install\\|profile\\|tpl\\.php\\|theme\\|inc\\)\\'\\|\\.php\\'\\)" php-mode)) +(configuration-layer/lazy-install 'protobuf :extensions '("\\(\\.proto\\'\\)" protobuf-mode)) (configuration-layer/lazy-install 'makepkg :extensions '("\\`PKGBUILD\\'" pkgbuild-mode)) (configuration-layer/lazy-install 'purescript :extensions '("\\(\\.purs\\'\\)" purescript-mode)) (configuration-layer/lazy-install 'python :extensions '("\\(\\.pyx\\'\\|\\.pxd\\'\\|\\.pxi\\'\\)" cython-mode)) diff --git a/dot_emacs.d/spacemacs.mk b/dot_emacs.d/spacemacs.mk index 0cfa68d..15b56d8 100644 --- a/dot_emacs.d/spacemacs.mk +++ b/dot_emacs.d/spacemacs.mk @@ -1,6 +1,6 @@ ## Makefile --- Spacemacs master makefile ## -## Copyright (c) 2012-2018 Sylvain Benner & Contributors +## Copyright (c) 2012-2020 Sylvain Benner & Contributors ## ## Author: Sylvain Benner ## URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/core/Makefile b/dot_emacs.d/tests/core/Makefile index 839eca0..3c05c16 100644 --- a/dot_emacs.d/tests/core/Makefile +++ b/dot_emacs.d/tests/core/Makefile @@ -1,6 +1,6 @@ ## Makefile --- Spacemacs Core ## -## Copyright (c) 2012-2018 Sylvain Benner & Contributors +## Copyright (c) 2012-2020 Sylvain Benner & Contributors ## ## Author: Sylvain Benner ## URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/core/core-configuration-layer-ftest.el b/dot_emacs.d/tests/core/core-configuration-layer-ftest.el index faee3b9..45c30fd 100644 --- a/dot_emacs.d/tests/core/core-configuration-layer-ftest.el +++ b/dot_emacs.d/tests/core/core-configuration-layer-ftest.el @@ -1,6 +1,6 @@ ;;; core-configuration-layer-ftest.el --- Spacemacs Functional Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -50,8 +50,9 @@ ;; --------------------------------------------------------------------------- (ert-deftest test-stable-elpa-verify-archive--verification-ok () - ;; We gonna skip this test while testing PRs. FIXME: Handle this better. - (skip-unless (not (string= (getenv "CIRCLECI") "true"))) + ;; FIXME: >_> @syl20bnr + (skip-unless (not (and (version< emacs-version "27.1") + (string-equal system-type "windows-nt")))) (cl-letf (((symbol-function 'configuration-layer//stable-elpa-tarball-local-file) (lambda () (concat spacemacs-test-directory @@ -72,6 +73,9 @@ (should (equal t (configuration-layer//stable-elpa-verify-archive))))) (ert-deftest test-stable-elpa-verify-archive--verification-failed () + ;; FIXME: >_> @syl20bnr + (skip-unless (not (and (version< emacs-version "27.1") + (string-equal system-type "windows-nt")))) (let (verification-error) (cl-letf (((symbol-function 'configuration-layer//stable-elpa-tarball-local-file) (lambda () diff --git a/dot_emacs.d/tests/core/core-configuration-layer-utest.el b/dot_emacs.d/tests/core/core-configuration-layer-utest.el index 2c8fbed..cbed0e5 100644 --- a/dot_emacs.d/tests/core/core-configuration-layer-utest.el +++ b/dot_emacs.d/tests/core/core-configuration-layer-utest.el @@ -1,6 +1,6 @@ ;;; core-configuration-layer-utest.el --- Spacemacs Unit Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/core/core-funcs-utest.el b/dot_emacs.d/tests/core/core-funcs-utest.el index aacdcb3..af70e54 100644 --- a/dot_emacs.d/tests/core/core-funcs-utest.el +++ b/dot_emacs.d/tests/core/core-funcs-utest.el @@ -1,6 +1,6 @@ ;;; core-funcs-utest.el --- Spacemacs Unit Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/core/core-release-management-ftest.el b/dot_emacs.d/tests/core/core-release-management-ftest.el index 9902c6d..a74a614 100644 --- a/dot_emacs.d/tests/core/core-release-management-ftest.el +++ b/dot_emacs.d/tests/core/core-release-management-ftest.el @@ -1,6 +1,6 @@ ;;; core-release-management-ftest.el --- Spacemacs Functional Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Alberto Zaccagni ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/core/core-spacebind-utest.el b/dot_emacs.d/tests/core/core-spacebind-utest.el index 4dea9c8..c54d986 100644 --- a/dot_emacs.d/tests/core/core-spacebind-utest.el +++ b/dot_emacs.d/tests/core/core-spacebind-utest.el @@ -615,26 +615,26 @@ NOTE: `spacebind--eager-bind' set to true. " py-mode "s R" python-shell-send-region nil) (spacemacs/set-leader-keys "C-v b" bar-fn nil) - (spacemacs/declare-prefix - "C-p" "compile/execute" nil) - (spacemacs/declare-prefix - "d" "debug" nil) - (spacemacs/declare-prefix - "r" "refactor" nil) - (spacemacs/declare-prefix - "s" "REPL" nil) - (spacemacs/declare-prefix - "a" "section under a key" nil) - (spacemacs/declare-prefix - "a c" "sub section under c key" nil) - (spacemacs/declare-prefix - "a c d" "sub sub section under d key" nil) - (spacemacs/declare-prefix - "a" "section under a key" nil) - (spacemacs/declare-prefix - "a b" "sub section under b key" nil) - (spacemacs/declare-prefix - "a b c" "sub sub section under c key" nil) + (spacemacs/declare-prefix-for-mode + py-mode "C-p" "compile/execute" nil) + (spacemacs/declare-prefix-for-mode + py-mode "d" "debug" nil) + (spacemacs/declare-prefix-for-mode + py-mode "r" "refactor" nil) + (spacemacs/declare-prefix-for-mode + py-mode "s" "REPL" nil) + (spacemacs/declare-prefix-for-mode + some-minor-mode "a" "section under a key" nil) + (spacemacs/declare-prefix-for-mode + some-minor-mode "a c" "sub section under c key" nil) + (spacemacs/declare-prefix-for-mode + some-minor-mode "a c d" "sub sub section under d key" nil) + (spacemacs/declare-prefix-for-mode + some-another-minor-mode "a" "section under a key" nil) + (spacemacs/declare-prefix-for-mode + some-another-minor-mode "a b" "sub section under b key" nil) + (spacemacs/declare-prefix-for-mode + some-another-minor-mode "a b c" "sub sub section under c key" nil) (spacemacs/declare-prefix "C-v" "section under a key" nil) (which-key-add-major-mode-key-based-replacements diff --git a/dot_emacs.d/tests/core/core-spacemacs-buffer-ftest.el b/dot_emacs.d/tests/core/core-spacemacs-buffer-ftest.el index 04de945..2be65d2 100644 --- a/dot_emacs.d/tests/core/core-spacemacs-buffer-ftest.el +++ b/dot_emacs.d/tests/core/core-spacemacs-buffer-ftest.el @@ -1,6 +1,6 @@ ;;; core-spacemacs-buffer-ftest.el --- Spacemacs Unit Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/core/core-spacemacs-ftest.el b/dot_emacs.d/tests/core/core-spacemacs-ftest.el index 37035c7..7e9c8d3 100644 --- a/dot_emacs.d/tests/core/core-spacemacs-ftest.el +++ b/dot_emacs.d/tests/core/core-spacemacs-ftest.el @@ -1,6 +1,6 @@ ;;; core-spacemacs-ftest.el --- Spacemacs Functional Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Alberto Zaccagni ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/doc/Makefile b/dot_emacs.d/tests/doc/Makefile index b7d58d1..ae56638 100644 --- a/dot_emacs.d/tests/doc/Makefile +++ b/dot_emacs.d/tests/doc/Makefile @@ -1,6 +1,6 @@ ## Makefile --- Spacemacs org tests ## -## Copyright (c) 2012-2018 Sylvain Benner & Contributors +## Copyright (c) 2012-2020 Sylvain Benner & Contributors ## ## Author: smile13241324 ## URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/doc/org-export-ftest.el b/dot_emacs.d/tests/doc/org-export-ftest.el index 4ee86c8..637039d 100644 --- a/dot_emacs.d/tests/doc/org-export-ftest.el +++ b/dot_emacs.d/tests/doc/org-export-ftest.el @@ -1,6 +1,6 @@ ;;; org-export-ftest.el --- Spacemacs Org Export Functional Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: smile13241324 ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/layers/+distribution/spacemacs-base/Makefile b/dot_emacs.d/tests/layers/+distribution/spacemacs-base/Makefile index bf06407..5fd720c 100644 --- a/dot_emacs.d/tests/layers/+distribution/spacemacs-base/Makefile +++ b/dot_emacs.d/tests/layers/+distribution/spacemacs-base/Makefile @@ -1,6 +1,6 @@ ## Makefile --- Spacemacs Core ## -## Copyright (c) 2012-2018 Sylvain Benner & Contributors +## Copyright (c) 2012-2020 Sylvain Benner & Contributors ## ## Author: Sylvain Benner ## URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-ftest.el b/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-ftest.el index 8ad2a5c..741ed89 100644 --- a/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-ftest.el +++ b/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-ftest.el @@ -1,6 +1,6 @@ ;;; core-evilified-state-ftest.el --- Spacemacs Functional Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-utest.el b/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-utest.el index 3801f24..703ac07 100644 --- a/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-utest.el +++ b/dot_emacs.d/tests/layers/+distribution/spacemacs-base/evil-evilified-state-utest.el @@ -1,6 +1,6 @@ ;;; evil-evilified-state-utest.el --- Spacemacs Unit Test File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs diff --git a/dot_emacs.d/tests/layers/+distribution/spacemacs/Makefile b/dot_emacs.d/tests/layers/+distribution/spacemacs/Makefile index 2699b8e..e091782 100644 --- a/dot_emacs.d/tests/layers/+distribution/spacemacs/Makefile +++ b/dot_emacs.d/tests/layers/+distribution/spacemacs/Makefile @@ -1,6 +1,6 @@ ## Makefile --- Spacemacs Core ## -## Copyright (c) 2012-2018 Sylvain Benner & Contributors +## Copyright (c) 2012-2020 Sylvain Benner & Contributors ## ## Author: Sylvain Benner ## URL: https://github.com/syl20bnr/spacemacs