~jack/nix-overlay

b91d77e2303ffe7de0d1d653c8c5d377f616409b — Jack Kelly 2 months ago 84f6959
jack-emacs: add dhall-mode
3 files changed, 9 insertions(+), 3 deletions(-)

M jack-emacs/default.el/default.nix
M jack-emacs/default.nix
M jack-emacs/nix-environment.el.in
M jack-emacs/default.el/default.nix => jack-emacs/default.el/default.nix +4 -0
@@ 42,6 42,10 @@ ${generic-config}
(use-package counsel
  :config
  (global-set-key (kbd "C-s") 'counsel-grep-or-swiper))
(use-package dhall-mode
  :mode "\\.dhall\\'"
  :config
  (setq dhall-use-header-line nil))
(use-package engine-mode
  :config
  (engine-mode t)

M jack-emacs/default.nix => jack-emacs/default.nix +4 -3
@@ 8,6 8,7 @@

, aspell
, cmus
, dhall
, discount
, elm
, elm-format


@@ 33,13 34,12 @@ let
  nix-environment = let
    rubocop = callPackage ./tools/rubocop {};
  in runCommand "nix-environment.el" {
    inherit aspell cmus discount elm fd firefox ghc git graphviz hlint ormolu
      ripgrep rubocop shellcheck solargraph sqlite;
    inherit aspell cmus dhall discount elm fd firefox ghc git
      graphviz hlint ormolu ripgrep rubocop shellcheck solargraph sqlite;
    inherit (pythonPackages) flake8 python pylint;

    # substituteAll dislikes hyphens
    elm_format = elm-format;

  } "substituteAll ${./nix-environment.el.in} $out";

  default-el = import ./default.el {


@@ 57,6 57,7 @@ let
    counsel
    counsel-projectile
    dante
    dhall-mode
    elm-mode
    engine-mode
    flx

M jack-emacs/nix-environment.el.in => jack-emacs/nix-environment.el.in +1 -0
@@ 7,6 7,7 @@
      ;recursive, number, extended, skipbin
      counsel-rg-base-command "@ripgrep@/bin/rg -S --no-heading --line-number --color never %s ."
      dante-ghci-command "@ghc@/bin/ghci"
      dhall-command "@dhall@/bin/dhall"
      elm-compile-command '("@elm@/bin/elm" "make")
      elm-create-package-command "@elm@/bin/elm make"
      elm-format-command "@elm_format@/bin/elm-format"