1 files changed, 31 insertions, 39 deletions
diff --git a/infra/libkookie/overlays/kookie/emacs/default.nix b/infra/libkookie/overlays/kookie/emacs/default.nix
index be3a634fe47a..d89863eaa270 100644
--- a/infra/libkookie/overlays/kookie/emacs/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/default.nix
@@ -4,47 +4,39 @@ with (import ./builder.nix args);
 pkgs.emacsWithPackages (epkgs:
   let
     include = path: (import path { inherit buildModule pkgs epkgs; });
-    modules = [ ./base ./move-lines ./theme ./rust ];
+    modules = [
+      ./base
+      ./move-lines
+      ./multi-cursor
+      ./notmuch
+      ./org
+      ./rust
+      ./theme
+    ];
     kookie-config = bootstrap (map (p: include p) modules);
-  in [
-    kookie-config
-  ])
+  in
+    with epkgs; [
+      kookie-config
 
+      ##################################################################
+      # A set of simple module that don't require special configuration
+      #
+      #
 
+      # Simple language modes
+      fish-mode
+      markdown-mode
+      nim-mode
+      nix-mode
+      python-mode
 
+      # Utility moduse
+      direnv
+      fzf
+      magit
+      treemacs
+      undo-tree
+      visual-fill-column
+      which-key
+    ])
 
-  
-  # Language support
-  # fish-mode
-  # lsp-mode
-  # markdown-mode
-  # nim-mode
-  # nix-mode
-  # protobuf-mode
-  # python-mode
-  # rust-mode
-
-  # color-identifiers-mode
-  # color-theme-sanityinc-tomorrow
-  # company
-  # company-lsp
-  # direnv
-  # fzf
-  # ido-vertical-mode
-  # ledger-mode
-  # lsp-ui
-  # magit
-  # monokai-theme
-  # multiple-cursors
-  # notmuch
-  # org
-  # protobuf-mode
-  # scad-mode
-  # smex
-  # sublimity
-  # treemacs
-  # undo-tree
-  # visual-fill-column
-  # which-key
-  # yasnippet
-  # ]))