From 906fe2fb8d2c5e2eaf50e4308520945a8e948311 Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Mon, 15 Apr 2024 19:29:58 +0100
Subject: [PATCH] Move the minibuffer module to the nix side

---
 nix/modules/editor/default.nix                   |  4 ++++
 nix/modules/editor/lisp/fg42/editor.el           |  2 +-
 .../modules/editor/lisp}/fg42/minibuffer.el      | 16 +++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)
 rename {lisp => nix/modules/editor/lisp}/fg42/minibuffer.el (96%)

diff --git a/nix/modules/editor/default.nix b/nix/modules/editor/default.nix
index d9d1ed9..06f4467 100644
--- a/nix/modules/editor/default.nix
+++ b/nix/modules/editor/default.nix
@@ -38,6 +38,10 @@ let
     yasnippet
     yasnippet-snippets
     flycheck
+    vertico
+    orderless
+    ctrlf
+    marginalia
     base16-theme
   ]);
   drv = makeFG42Drv {
diff --git a/nix/modules/editor/lisp/fg42/editor.el b/nix/modules/editor/lisp/fg42/editor.el
index 0a99620..c036dec 100644
--- a/nix/modules/editor/lisp/fg42/editor.el
+++ b/nix/modules/editor/lisp/fg42/editor.el
@@ -40,7 +40,7 @@
   ;; (require 'fg42/git)
   ;; (require 'fg42/wm)
   ;; (require 'fg42/org)
-  ;; (require 'fg42/minibuffer)
+  (require 'fg42/minibuffer)
   ;; (require 'fg42/graphics)
   ;; (require 'fg42/modeline)
   )
diff --git a/lisp/fg42/minibuffer.el b/nix/modules/editor/lisp/fg42/minibuffer.el
similarity index 96%
rename from lisp/fg42/minibuffer.el
rename to nix/modules/editor/lisp/fg42/minibuffer.el
index 9926646..aa7880b 100644
--- a/lisp/fg42/minibuffer.el
+++ b/nix/modules/editor/lisp/fg42/minibuffer.el
@@ -22,7 +22,9 @@
 ;;; Commentary:
 ;;; Code:
 (eval-when-compile
-  (require 'fpkg))
+  (require 'fpkg)
+  (require 'fg42/config))
+
 
 (use! vertico
   "Vertico provides a performant and minimalistic vertical completion UI
@@ -201,12 +203,12 @@ match all of the components in any order."
   :bind (("M-g e" . consult-compile-error)))
 
 
-(use! nerd-icons-completion
-  "Nerd icons in marginalia"
-  :after marginalia
-  :config
-  (nerd-icons-completion-mode)
-  (add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup))
+;; (use! nerd-icons-completion
+;;   "Nerd icons in marginalia"
+;;   :after marginalia
+;;   :config
+;;   (nerd-icons-completion-mode)
+;;   (add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup))