Redo emacs package setup

1 files changed, 13 insertions, 53 deletions

diff --git a/packages/emacs.nix b/packages/emacs.nix
index 42b40f83..a2ed3992 100644
--- a/packages/emacs.nix
+++ b/packages/emacs.nix
@@ -1,6 +1,6 @@
 {
-  pkgs ? import <nixpkgs> {},
-  emacs ? pkgs.emacs
+  pkgs ? import <nixpkgs-unstable> {},
+  emacs ? pkgs.emacsMacport
 }:
 
 let
@@ -16,41 +16,23 @@ in
     ace-link
     add-node-modules-path
     ag
-    auto-compile
+    amx
     auto-async-byte-compile
     avy
-    bbdb
-    bind-key
+    basic-theme
     caddyfile-mode
-    cider
-    clj-refactor
-    clojure-mode
-    cmd-to-echo
-    command-log-mode
     company
-    company-go
+    company-box
     company-lsp
-    company-restclient
-    company-tern
     company-web
     counsel
-    counsel-etags
     counsel-projectile
     crux
-    cyphejor
-    define-word
-    dired-subtree
-    discover-my-major
-    discover-js2-refactor
     docker-compose-mode
     dockerfile-mode
-    dtrt-indent
-    dumb-jump
-    eacl
-    easy-hugo
     editorconfig
     eink-theme
-    elisp-slime-nav
+    eldoc-box
     emmet-mode
     evil
     evil-collection
@@ -59,35 +41,27 @@ in
     evil-magit
     evil-org
     evil-quickscope
-    evil-snipe
     evil-space
     evil-surround
     exec-path-from-shell
     eyebrowse
     feature-mode
     flycheck
-    flycheck-pos-tip
-    flycheck-vale
-    geiser
-    ggtags
-    ghq
+    general
     git-gutter-fringe
     git-messenger
     git-timemachine
-    go-eldoc
-    go-mode
-    go-projectile
+    gitattributes-mode
+    gitconfig-mode
+    gitignore-mode
+    gitlab-ci-mode
+    gitlab-ci-mode-flycheck
     goto-chg
     haskell-mode
-    helm
     helpful
-    highlight-stages
-    imenu-anywhere
-    indium
     ivy-hydra
     jinja2-mode
     js2-mode
-    js2-refactor
     json-mode
     k8s-mode
     # kubernetes
@@ -98,17 +72,14 @@ in
     magit
     markdown-mode
     minions
-    mocha
     monotropic-theme
     moody
     nginx-mode
     nix-mode
-    nix-sandbox
     org-journal
-    page-break-lines
     paredit
-    password-store
     php-mode
+    posframe
     prettier-js
     projectile
     projectile-ripgrep
@@ -117,16 +88,9 @@ in
     restclient
     ripgrep
     rjsx-mode
-    sentence-navigation
     scss-mode
-    shrink-whitespace
-    slime
-    smart-tabs-mode
-    smex
     spacemacs-theme
     swiper
-    tern
-    tide
     toml-mode
     typescript-mode
     undo-tree
@@ -138,9 +102,5 @@ in
   ]) ++ (with epkgs.elpaPackages; [
     rainbow-mode
   ]) ++ [
-    epkgs.redshank
-
-    epkgs.hook-helpers
-    epkgs.dired-du
     # From main packages set
   ])