@@ -8,37 +8,19 @@ let
   myEmacs = emacs;
   emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages;
 in
-  emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
-    diminish
-    bind-key
-    use-package
-  ]) ++ (with epkgs.melpaPackages; [
-    spacemacs-theme
-    evil
-    evil-collection
-    evil-commentary
-    evil-goggles
-    evil-magit
-    evil-mu4e
-    evil-org
-    evil-quickscope
-    evil-surround
-    evil-leader
-    evil-space
-    evil-snipe
-
+  emacsWithPackages (epkgs: (with epkgs.melpaPackages; [
     ace-link
-    ace-window
     add-node-modules-path
     ag
     auto-compile
     avy
     bbdb
-    beginend
+    bind-key
     cider
     clj-refactor
     clojure-mode
     cmd-to-echo
+    coffee-mode
     command-log-mode
     company
     company-go
@@ -51,29 +33,37 @@ counsel-projectile
     crux
     cyphejor
     define-word
-    dired-narrow
+    diminish
     dired-subtree
     discover-my-major
+    discover-js2-refactor
+    docker-compose-mode
+    docker-tramp
     dockerfile-mode
-    docker-tramp
-    docker-compose-mode
     dtrt-indent
     dumb-jump
     eacl
     easy-hugo
     editorconfig
+    eink-theme
     elisp-slime-nav
     emmet-mode
-    ensime
+    evil
+    evil-collection
+    evil-commentary
+    evil-leader
+    evil-magit
+    evil-mu4e
+    evil-org
+    evil-quickscope
+    evil-snipe
+    evil-space
+    evil-surround
     exec-path-from-shell
-    expand-region
     eyebrowse
-    flow-minor-mode
     flycheck
-    flycheck-flow
     flycheck-pos-tip
     flycheck-vale
-    fontawesome
     geiser
     ggtags
     ghq
@@ -85,8 +75,9 @@ go-mode
     go-projectile
     goto-chg
     haskell-mode
+    helm
+    helpful
     highlight-stages
-    helpful
     imenu-anywhere
     indium
     ivy-hydra
@@ -94,25 +85,27 @@ jinja2-mode
     js2-mode
     js2-refactor
     json-mode
+    kubernetes
     ledger-mode
     lsp-javascript-typescript
     lsp-mode
+    lsp-ui
     magit
     magithub
     markdown-mode
     mocha
-    move-text
-    multiple-cursors
+    monotropic-theme
+    navi-mode
     nginx-mode
     nix-mode
     nix-sandbox
+    org-journal
     outorg
     outshine
-    navi-mode
-    org-journal
     page-break-lines
     paredit
     password-store
+    php-mode
     projectile
     projectile-ripgrep
     quickrun
@@ -120,25 +113,21 @@ relative-buffers
     restclient
     ripgrep
     rjsx-mode
-    php-mode
-    scala-mode
+    sentence-navigation
     scss-mode
     shrink-whitespace
     slime
     smart-tabs-mode
     smex
     spaceline
-    suggest
+    spacemacs-theme
     swiper
     tern
     toml-mode
     typescript-mode
     undo-tree
-    visual-regexp
+    use-package
     web-mode
-    eink-theme
-    monotropic-theme
-    spacemacs-theme
     wgrep-ag
     which-key
     yaml-mode
@@ -147,8 +136,10 @@ rainbow-mode
   ]) ++ [
     epkgs.redshank
     # I just need the one org-package
-    epkgs.orgPackages.org-plus-contrib
+
     epkgs.hook-helpers
     epkgs.dired-du
     # From main packages set
+
+    pkgs.mu
   ])