.vim/vimrc: Update format programs

Use emacs from vim with emacs-batch-indent to format lisp code

2 files changed, 39 insertions, 3 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index 70dc24f..20e78b5 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -27,7 +27,7 @@ in
       paths = [
         Terminal Graphical Xorg Wayland Awesome Fonts Audio LaTeX Dictionary Android
         JavaScript Python PHP Lua Elixir HTML Shell Haskell Perl Nix C Golang Rust CSS
-        SQL YAML Ruby Nim Themes Emulators Clojure Lisp
+        SQL YAML HTTP Ruby Nim Themes Emulators Clojure Lisp
       ];
     };
 
@@ -66,8 +66,9 @@ in
       paths = [
         (import ./shells/larynx/shell.nix).fhs
         (import ./shells/larynx-server/shell.nix).fhs
-        (callPackage ./packages/hugo/default.nix { })
         (callPackage ./packages/chromexup/default.nix { })
+        (callPackage ./packages/emacs-batch-indent/default.nix { })
+        (callPackage ./packages/hugo/default.nix { })
         (callPackage ./packages/pdf2htmlex/default.nix { })
         (callPackage ./packages/rxvt-unicode/default.nix { })
         (callPackage ./packages/systemd2nix/default.nix { })
@@ -84,7 +85,6 @@ in
         bat
         bind
         bleachbit
-        caddy
         cava
         csvkit
         curlftpfs
@@ -452,6 +452,7 @@ in
           pygments
           pylint
         ]))
+        ruff
       ];
     };
 
@@ -557,6 +558,11 @@ in
       paths = [ guile sbcl ];
     };
 
+    HTTP = pkgs.buildEnv {
+      name = "http";
+      paths = [ caddy apacheHttpd ];
+    };
+
     CSS = pkgs.buildEnv {
       name = "css";
       paths = [
diff --git a/.config/nixpkgs/packages/emacs-batch-indent/default.nix b/.config/nixpkgs/packages/emacs-batch-indent/default.nix
new file mode 100644
index 0000000..92042af
--- /dev/null
+++ b/.config/nixpkgs/packages/emacs-batch-indent/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+
+  name = "emacs-batch-indent";
+  version = "145e8771b9709a82e3df82cdc06c6d9505de905d";
+  url = "https://github.com/cwfoo/emacs-batch-indent";
+
+  src = fetchgit {
+    inherit url;
+    rev = version;
+    sha256 = "sha256-Qqg/ZLbfTZnH2aO7ZW2XiiVBqEvK2+LMo2Kz6HSnOCE=";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir --parents $out/bin
+    cp emacs-batch-indent $out/bin
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = url;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    description = "Indent Common Lisp, Emacs Lisp, and Scheme from the command line using Emacs.";
+  };
+}