added formatter + reformat existing codebase (#175)

plugins/null-ls/default.nix

@@ -1,10 +1,13 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.plugins.null-ls;
-  helpers = (import ../helpers.nix { inherit lib; });
-in
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.plugins.null-ls;
+  helpers = import ../helpers.nix {inherit lib;};
+in {
   imports = [
     ./servers.nix
   ];
@@ -36,15 +39,14 @@ in
     # };
   };
 
-  config =
-    let
-      options = {
-        debug = cfg.debug;
-        sources = cfg.sourcesItems;
-      };
-    in
+  config = let
+    options = {
+      debug = cfg.debug;
+      sources = cfg.sourcesItems;
+    };
+  in
     mkIf cfg.enable {
-      extraPlugins = [ cfg.package ];
+      extraPlugins = [cfg.package];
 
       extraConfigLua = ''
         require("null-ls").setup(${helpers.toLuaObject options})

plugins/null-ls/helpers.nix

@@ -1,30 +1,41 @@
-{ pkgs, config, lib, ... }:
 {
-  mkServer =
-    { name
-    , sourceType
-    , description ? "${name} source, for null-ls."
-    , package ? null
-    , extraPackages ? [ ]
-    , ...
-    }:
-    # returns a module
-    { pkgs, config, lib, ... }@args:
-      with lib;
-      let
-        helpers = import ../helpers.nix args;
-        cfg = config.plugins.null-ls.sources.${sourceType}.${name};
-        # does this evaluate package?
-        packageOption = if package == null then { } else {
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  mkServer = {
+    name,
+    sourceType,
+    description ? "${name} source, for null-ls.",
+    package ? null,
+    extraPackages ? [],
+    ...
+  }:
+  # returns a module
+  {
+    pkgs,
+    config,
+    lib,
+    ...
+  } @ args:
+    with lib; let
+      helpers = import ../helpers.nix args;
+      cfg = config.plugins.null-ls.sources.${sourceType}.${name};
+      # does this evaluate package?
+      packageOption =
+        if package == null
+        then {}
+        else {
           package = mkOption {
             type = types.package;
             default = package;
             description = "Package to use for ${name} by null-ls";
           };
         };
-      in
-      {
-        options.plugins.null-ls.sources.${sourceType}.${name} = {
+    in {
+      options.plugins.null-ls.sources.${sourceType}.${name} =
+        {
           enable = mkEnableOption description;
 
           # TODO: withArgs can exist outside of the module in a generalized manner
@@ -37,20 +48,22 @@
             #   '\'{ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }'\'
             # '';
           };
-        } // packageOption;
+        }
+        // packageOption;
 
-        config = mkIf cfg.enable {
-          # Does this evaluate package?
-          extraPackages = extraPackages ++ optional (package != null) cfg.package;
+      config = mkIf cfg.enable {
+        # Does this evaluate package?
+        extraPackages = extraPackages ++ optional (package != null) cfg.package;
 
-          # Add source to list of sources
-          plugins.null-ls.sourcesItems =
-            let
-              sourceItem = "${sourceType}.${name}";
-              withArgs = if (isNull cfg.withArgs) then sourceItem else "${sourceItem}.with ${cfg.withArgs}";
-              finalString = ''require("null-ls").builtins.${withArgs}'';
-            in
-            [ (helpers.mkRaw finalString) ];
-        };
+        # Add source to list of sources
+        plugins.null-ls.sourcesItems = let
+          sourceItem = "${sourceType}.${name}";
+          withArgs =
+            if (isNull cfg.withArgs)
+            then sourceItem
+            else "${sourceItem}.with ${cfg.withArgs}";
+          finalString = ''require("null-ls").builtins.${withArgs}'';
+        in [(helpers.mkRaw finalString)];
       };
+    };
 }

plugins/null-ls/servers.nix

@@ -1,14 +1,18 @@
-{ pkgs, config, lib, ... }@args:
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+} @ args: let
   helpers = import ./helpers.nix args;
   serverData = {
     code_actions = {
-      gitsigns = { };
+      gitsigns = {};
       shellcheck = {
         package = pkgs.shellcheck;
       };
     };
-    completion = { };
+    completion = {};
     diagnostics = {
       flake8 = {
         package = pkgs.python3Packages.flake8;
@@ -65,20 +69,20 @@ let
   #   sourceType = "formatting";
   #   packages = [...];
   # }]
-  serverDataFormatted = lib.mapAttrsToList
-    (sourceType: sourceSet:
-      lib.mapAttrsToList (name: attrs: attrs // { inherit sourceType name; }) sourceSet
+  serverDataFormatted =
+    lib.mapAttrsToList
+    (
+      sourceType: sourceSet:
+        lib.mapAttrsToList (name: attrs: attrs // {inherit sourceType name;}) sourceSet
     )
     serverData;
   dataFlattened = lib.flatten serverDataFormatted;
-in
-{
+in {
   imports = lib.lists.map (helpers.mkServer) dataFlattened;
 
-  config =
-    let
-      cfg = config.plugins.null-ls;
-    in
+  config = let
+    cfg = config.plugins.null-ls;
+  in
     lib.mkIf cfg.enable {
       plugins.gitsigns.enable = lib.mkIf (cfg.sources.code_actions.gitsigns.enable) true;
     };