Merge pull request #61 from redyf/dev

Switch to Alejandra formatter
redyf · Feb 12, 2024 · 5dbdccf · 5dbdccf
2 parents e22d5c2 + 216f4d2
commit 5dbdccf
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/config/lsp/lsp.nix b/config/lsp/lsp.nix
@@ -7,7 +7,7 @@
       enable = true;
       capabilities = "offsetEncoding =  'utf-16'";
       servers = {
-        clangd = {enable = true;};
+        clangd = { enable = true; };
         lua-ls = {
           enable = true;
           extraOptions = {
@@ -19,15 +19,15 @@
                 telemetry = {
                   enabled = false;
                 };
-                hint = {enable = true;};
+                hint = { enable = true; };
               };
             };
           };
         };
-        nil_ls = {enable = true;};
+        nil_ls = { enable = true; };
         tsserver = {
           enable = false;
-          filetypes = ["javascript" "javascriptreact" "typescript" "typescriptreact"];
+          filetypes = [ "javascript" "javascriptreact" "typescript" "typescriptreact" ];
           extraOptions = {
             settings = {
               javascript = {
@@ -55,9 +55,9 @@
             };
           };
         };
-        eslint = {enable = true;};
-        pyright = {enable = true;};
-        ruff-lsp = {enable = true;};
+        eslint = { enable = true; };
+        pyright = { enable = true; };
+        ruff-lsp = { enable = true; };
 
         rust-analyzer = {
           enable = true;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,18 +6,20 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    nixvim,
-    flake-utils,
-    ...
-  } @ inputs: let
-    config = import ./config; # import the module directly
-  in
-    flake-utils.lib.eachDefaultSystem (system: let
+  outputs =
+    { self
+    , nixpkgs
+    , nixvim
+    , flake-utils
+    , ...
+    } @ inputs:
+    let
+      config = import ./config; # import the module directly
+    in
+    flake-utils.lib.eachDefaultSystem (system:
+    let
       nixvimLib = nixvim.lib.${system};
-      pkgs = import nixpkgs {inherit system;};
+      pkgs = import nixpkgs { inherit system; };
       nixvim' = nixvim.legacyPackages.${system};
       nvim = nixvim'.makeNixvimWithModule {
         inherit pkgs;
@@ -27,7 +29,8 @@
           inherit self;
         };
       };
-    in {
+    in
+    {
       checks = {
         # Run `nix flake check .` to verify that your config is not broken
         default = nixvimLib.check.mkTestDerivationFromNvim {
@@ -41,6 +44,6 @@
         default = nvim;
       };
 
-      formatter = pkgs.nixpkgs-fmt;
+      formatter = pkgs.alejandra;
     });
 }