Add fg42/lang-server-format to the before save of nix and c-family

nix/modules/c-family/lisp/fg42/c-family.el

@@ -38,8 +38,10 @@
 (use! cmake-ts-mode
   "Enable cmake-ts-mode instead of the non-TS version."
   :mode ("\\(?:CMakeLists\\.txt\\|\\.cmake\\)\\'" . cmake-ts-mode)
-  :hook ((cmake-ts-mode . fg42/autocomplete)
+  :hook
-         (cmake-ts-mode . fg42/ensure-lang-server)))
+  (cmake-ts-mode . fg42/autocomplete)
+  (cmake-ts-mode . fg42/ensure-lang-server)
+  (before-save . fg42/lang-server-format))
 
 
 (use! eldoc-cmake
@@ -86,7 +88,8 @@ return value of this function as well."
   :hook
   (c++-ts-mode . fg42/autocomplete)
   (c++-ts-mode . fg42/c-ts-mode-setup)
-  (c++-ts-mode . flyspell-prog-mode))
+  (c++-ts-mode . flyspell-prog-mode)
+  (before-save . fg42/lang-server-format))
 
 
 (provide 'fg42/c-family)

nix/modules/editor/lisp/fg42/editor.el

@@ -194,12 +194,11 @@ contextual information."
   "Flycheck is a modern on-the-fly syntax checking extension for GNU Emacs."
   :config (global-flycheck-mode))
 
-(use! rainbow-delimiters-mode
+(use! rainbow-delimiters
   "It is a rainbow parentheses like mode which highlights delimiters such as
  parentheses, brackets or braces according to their depth."
   ;; Enable rainbow-delimiters for programming
-  :commands rainbow-delimiters-mode
+  :hook (prog-mode . rainbow-delimiters-mode))
-  :hook (prog-mode-hook . rainbow-delimiters-mode))
 
 
 (use! direnv

nix/modules/elisp/default.nix

@@ -23,7 +23,6 @@
 let
   deps = (with pkgs.emacsPackages; [
     eros
-    rainbow-delimiters
     paredit
   ]);
   drv = makeFG42Drv {

nix/modules/elisp/lisp/fg42/elisp.el

@@ -33,13 +33,13 @@
   "Minor mode for editing parentheses."
   :commands enable-paredit-mode)
 
+
 (use! elisp-mode
   "Elisp mode."
   :hook
-  ((emacs-lisp-mode . rainbow-delimiters-mode)
+  (emacs-lisp-mode . enable-paredit-mode)
-   (emacs-lisp-mode . enable-paredit-mode)
+  (emacs-lisp-mode . fg42/lang-server-format)
-   ;; (emacs-lisp-mode . company-mode)
+  (emacs-lisp-mode . eros-mode))
-   (emacs-lisp-mode . eros-mode)))
 
 
 (provide 'fg42/elisp)

nix/modules/language-server/lisp/fg42/language-server.el

@@ -68,7 +68,7 @@ or via `use!' `:hook'."
 This function is supposed to be run as a hook handler."
   (interactive)
   (cond
-   ((and (boundp 'eglot-managed-p) (eglot-managed-p))
+   ((and (functionp 'eglot-managed-p) (eglot-managed-p))
     (eglot-format-buffer))))
 
 

nix/modules/nix/lisp/fg42/nix-support.el

@@ -41,7 +41,8 @@
     (let ((nil-lsp '(nix-mode . ("nil"
                                  :initializationOptions
                                  (:formatting (:command ["nixpkgs-fmt"]))))))
-      (add-to-list 'eglot-server-programs nil-lsp))))
+      (add-to-list 'eglot-server-programs nil-lsp)
+      (add-hook 'before-save-hook  #'fg42/lang-server-format))))
 
 
 (use! nix-drv-mode

nix/modules/python/lisp/fg42/python-support.el

@@ -31,7 +31,7 @@
              python-black-buffer
              python-black-region
              python-black-statement)
-  :hook (python-mode . python-black-on-save-mode))
+  :hook (python-ts-mode . python-black-on-save-mode))
 
 
 (use! poetry