From d149b9b70b6cb7ac53d11b54ee6eaf5ef431f530 Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Sat, 1 Jun 2024 00:27:41 -0700
Subject: [PATCH] Added alejandra for formatting

Formatted all files in repo and set up alejandra to run automatically
when nix files are saved.
---
 config/plugins/lsp.nix     | 10 +++++--
 config/plugins/lualine.nix |  2 +-
 flake.nix                  | 58 ++++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix
index 4ee8765..85bfcc6 100644
--- a/config/plugins/lsp.nix
+++ b/config/plugins/lsp.nix
@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   plugins.lsp = {
     enable = true;
     servers = {
@@ -19,7 +19,13 @@
       ocamllsp.enable = true;
 
       # nix
-      nixd.enable = true;
+      nixd = {
+        enable = true;
+        settings.formatting.command = ["${pkgs.alejandra}/bin/alejandra"];
+      };
     };
   };
+
+  plugins.lsp-format.enable = true;
+  plugins.lsp-lines.enable = true;
 }
diff --git a/config/plugins/lualine.nix b/config/plugins/lualine.nix
index 6d81bfe..4a22946 100644
--- a/config/plugins/lualine.nix
+++ b/config/plugins/lualine.nix
@@ -7,7 +7,7 @@
     };
     "sectionSeparators" = {
       right = "";
-      left= "";
+      left = "";
     };
   };
 }
diff --git a/flake.nix b/flake.nix
index 8e80918..69b600e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,12 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
   };
 
-  outputs =
-    { nixvim, flake-parts, ... }@inputs:
-    flake-parts.lib.mkFlake { inherit inputs; } {
+  outputs = {
+    nixvim,
+    flake-parts,
+    ...
+  } @ inputs:
+    flake-parts.lib.mkFlake {inherit inputs;} {
       systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -17,31 +20,32 @@
         "aarch64-darwin"
       ];
 
-      perSystem =
-        { pkgs, system, ... }:
-        let
-          nixvimLib = nixvim.lib.${system};
-          nixvim' = nixvim.legacyPackages.${system};
-          nixvimModule = {
-            inherit pkgs;
-            module = import ./config; # import the module directly
-            # You can use `extraSpecialArgs` to pass additional arguments to your module files
-            extraSpecialArgs = {
-              # inherit (inputs) foo;
-            };
-          };
-          nvim = nixvim'.makeNixvimWithModule nixvimModule;
-        in
-        {
-          checks = {
-            # Run `nix flake check .` to verify that your config is not broken
-            default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
-          };
-
-          packages = {
-            # Lets you run `nix run .` to start nixvim
-            default = nvim;
+      perSystem = {
+        pkgs,
+        system,
+        ...
+      }: let
+        nixvimLib = nixvim.lib.${system};
+        nixvim' = nixvim.legacyPackages.${system};
+        nixvimModule = {
+          inherit pkgs;
+          module = import ./config; # import the module directly
+          # You can use `extraSpecialArgs` to pass additional arguments to your module files
+          extraSpecialArgs = {
+            # inherit (inputs) foo;
           };
         };
+        nvim = nixvim'.makeNixvimWithModule nixvimModule;
+      in {
+        checks = {
+          # Run `nix flake check .` to verify that your config is not broken
+          default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
+        };
+
+        packages = {
+          # Lets you run `nix run .` to start nixvim
+          default = nvim;
+        };
+      };
     };
 }