about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2018-05-08T21·44+0200
committerVincent Ambo <tazjin@gmail.com>2018-05-08T21·44+0200
commit4a3d61555c2b159b4e5ab5b3990acc9b146153ac (patch)
tree25216e12a2f7e7c05b3ceb9adeb371432443264d
parent2a70e4e56c5cf503adc0a268a268869c7a6e3478 (diff)
chore(emacs): Install markdown-mode from unstable
The stable version does not seem to contain `gfm-view-mode` which is
required by LSP.

If it's not available the side-effect is nasty freezes of the entire
emacs session.
-rw-r--r--emacs.nix1
-rw-r--r--packages.nix26
2 files changed, 14 insertions, 13 deletions
diff --git a/emacs.nix b/emacs.nix
index ac410f3d0232..900aec30527e 100644
--- a/emacs.nix
+++ b/emacs.nix
@@ -94,7 +94,6 @@ in emacsWithPackages(epkgs:
     intero
     kotlin-mode
     magit
-    markdown-mode
     multi-term
     multiple-cursors
     nginx-mode
diff --git a/packages.nix b/packages.nix
index ae6a8cc70359..095bd8fc4534 100644
--- a/packages.nix
+++ b/packages.nix
@@ -42,18 +42,20 @@ in {
 
       # Override various Emacs packages from unstable:
       pinnedEmacs = with unstable.emacsPackagesNg; {
-        counsel = melpaPackages.counsel;
-        counsel-tramp = melpaPackages.counsel-tramp;
-        company-lsp = company-lsp;
-        exwm = elpaPackages.exwm;
-        ivy = melpaPackages.ivy;
-        ivy-gitlab = melpaPackages.ivy-gitlab;
-        ivy-hydra = melpaPackages.ivy-hydra;
-        ivy-pass = melpaPackages.ivy-pass;
-        swiper = melpaPackages.swiper;
-        lsp-mode = lsp-mode;
-        lsp-rust = lsp-rust;
-        lsp-ui = lsp-ui;
+        inherit
+          company-lsp
+          counsel
+          counsel-tramp
+          exwm
+          ivy
+          ivy-gitlab
+          ivy-hydra
+          ivy-pass
+          lsp-mode
+          lsp-rust
+          lsp-ui
+          markdown-mode
+          swiper;
       };
     };
   };