diff --git a/nix/modules/autocomplete/default.nix b/nix/modules/autocomplete/default.nix
new file mode 100644
index 0000000..4148d9f
--- /dev/null
+++ b/nix/modules/autocomplete/default.nix
@@ -0,0 +1,51 @@
+# Fg42 - Emacs Editor for advance users
+#
+# Copyright (c) 2010-2024 Sameer Rahmani <lxsameer@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This is the home manager module that exposes FG42. It differs
+# from FG42 modules that are structurally the same but used in
+# different context
+
+# A list of default FG42 modules to build FG42 with.
+{ lib, config, pkgs, makeFG42Drv, ... }:
+with lib;
+let
+  cfg = config.fg42.auto-complete;
+
+  deps =
+    (with pkgs.emacsPackages; [
+      company
+      company-box
+    ]);
+
+  drv = makeFG42Drv {
+    pname = "autocomplete";
+    version = config.fg42.version;
+    buildInputs = deps;
+    src = ./.;
+  };
+in
+{
+  options.fg42.auto-complete.enable = mkAndEnableOption "auto-complete";
+
+  config = mkIf cfg.enable {
+    fg42.elispPackages = [ drv ] ++ deps;
+
+    fg42.requires = [ drv.pname ];
+    fg42.vars = [
+      (defVar "auto-complete" cfg.enable "Auto completion for FG42.")
+    ];
+  };
+}
diff --git a/nix/modules/autocomplete/lisp/fg42/autocomplete.el b/nix/modules/autocomplete/lisp/fg42/autocomplete.el
new file mode 100644
index 0000000..2fe3e4c
--- /dev/null
+++ b/nix/modules/autocomplete/lisp/fg42/autocomplete.el
@@ -0,0 +1,73 @@
+;;; FG42 --- The mighty editor for the emacsians -*- lexical-binding: t; -*-
+;;
+;; Copyright (c) 2010-2024 Sameer Rahmani & Contributors
+;;
+;; Author: Sameer Rahmani <lxsameer@gnu.org>
+;; URL: https://devheroes.codes/FG42/FG42
+;; Version: 4.0.0
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;;; Commentary:
+;;; Code:
+(eval-when-compile
+  (require 'fpkg)
+  (require 'fg42/config))
+
+
+(use! company
+  "Company is a modular text completion framework for GNU Emacs."
+  :hook (emacs-startup . global-company-mode)
+  :bind (:map company-active-map
+              ("M-n" . company-select-next)
+              ("M-p" . company-select-previous)
+              ("TAB" . company-complete-common-or-cycle)
+              ("M-d" . company-show-doc-buffer))
+  
+  :init
+  ;; Use Company for completion
+  (setq company-show-numbers t)
+  (setq company-idle-delay 0)
+  (setq company-tooltip-limit 20)
+  (setq company-echo-delay 0)
+  (setq company-tooltip-align-annotations t)
+  (setq company-dabbrev-downcase nil)
+
+  :config
+  (setq-default company-backends
+                '((company-capf :with company-yasnippet :separate)
+                  (company-keywords :separate)
+                  company-files))
+  (bind-key [remap completion-at-point] #'company-complete company-mode-map))
+
+
+(use! company-box
+  "A company front-end with icons."
+  :after company
+  :hook (company-mode . company-box-mode))
+
+
+;;;###autoload
+(defun fg42/autocomplete ()
+  "Initialize FG42's auto complete.
+This function is meant to be used with hooks."
+  ;; Why? because if we end up with more auto completion alternatives
+  ;; to company mode, then we can setup them here rather than walking
+  ;; around fixing downstream modules.
+  (interactive)
+  (company-model t))
+
+
+(provide 'fg42/autocomplete)
+;;; autocomplete.el ends here
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index 48d7f54..01f991e 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -28,6 +28,7 @@ let
     ./minibuffer-vertico
     ./graphics
     ./noether
+    ./autocomplete
   ];
 
   pkgsModule = { config, ... }: {
diff --git a/nix/modules/editor/default.nix b/nix/modules/editor/default.nix
index 5a85649..89d0742 100644
--- a/nix/modules/editor/default.nix
+++ b/nix/modules/editor/default.nix
@@ -43,6 +43,7 @@ let
       flycheck
       org
       org-super-agenda
+      rainbow-delimiters
       org-ql
       org-modern
       base16-theme