diff --git a/flake.nix b/flake.nix
index 4b1aef0d..a2698286 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,9 @@
   inputs.nmdSrc.url = "gitlab:rycee/nmd";
   inputs.nmdSrc.flake = false;
 
+  inputs.beautysh.url = "github:lovesegfault/beautysh";
+  inputs.beautysh.inputs.nixpkgs.follows = "nixpkgs";
+
   outputs = { self, nixpkgs, nmdSrc, flake-utils, ... }@inputs:
     with nixpkgs.lib;
     with builtins;
@@ -22,6 +25,7 @@
               pkgs = mkForce pkgs;
               inherit (pkgs) lib;
               helpers = import ./plugins/helpers.nix { inherit (pkgs) lib; };
+              inputs = inputs;
             };
           };
         })
diff --git a/plugins/null-ls/servers.nix b/plugins/null-ls/servers.nix
index 476dde26..b5cfb213 100644
--- a/plugins/null-ls/servers.nix
+++ b/plugins/null-ls/servers.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }@args:
+{ pkgs, config, lib, inputs, ... }@args:
 let
   helpers = import ./helpers.nix args;
   serverData = {
@@ -8,6 +8,9 @@ let
       flake8 = {
         packages = [ pkgs.python3Packages.flake8 ];
       };
+      shellcheck = {
+        packages = [ pkgs.shellcheck ];
+      };
     };
     formatting = {
       phpcbf = {
@@ -25,6 +28,9 @@ let
       black = {
         packages = [ pkgs.python3Packages.black ];
       };
+      beautysh = {
+        packages = [ inputs.beautysh.packages.${pkgs.system}.beautysh-python38 ];
+      };
     };
   };
   # Format the servers to be an array of attrs like the following example
diff --git a/tests/flake.lock b/tests/flake.lock
index eef046ea..b6272a30 100644
--- a/tests/flake.lock
+++ b/tests/flake.lock
@@ -1,5 +1,51 @@
 {
   "nodes": {
+    "beautysh": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1667262410,
+        "narHash": "sha256-yqqvPvazG/Ci3WpIfPb+o+i2cNuyAYYY19lwJGCmUao=",
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "rev": "a1fdaff999db2dfc5032914630f5052360f4b432",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "type": "github"
+      }
+    },
+    "beautysh_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim-stable",
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix_2",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1667262410,
+        "narHash": "sha256-yqqvPvazG/Ci3WpIfPb+o+i2cNuyAYYY19lwJGCmUao=",
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "rev": "a1fdaff999db2dfc5032914630f5052360f4b432",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -91,23 +137,25 @@
     },
     "nixvim": {
       "inputs": {
+        "beautysh": "beautysh",
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_2",
         "nmdSrc": "nmdSrc"
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-b5FuoFQsTCgKsVTQS13qmFnMmVotIQWtcjPu+WT6ubo=",
-        "path": "/nix/store/m90wvnc3d4rci36q0r0j7d2i1sk35cgy-source",
+        "narHash": "sha256-sjdU/aCTVFGSDxU+jxgaHtDsZQeFNb1nA55wRPgc3tU=",
+        "path": "/nix/store/5wxj9v7dzrga7xvp4pr825ph20i1qb42-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/m90wvnc3d4rci36q0r0j7d2i1sk35cgy-source",
+        "path": "/nix/store/5wxj9v7dzrga7xvp4pr825ph20i1qb42-source",
         "type": "path"
       }
     },
     "nixvim-stable": {
       "inputs": {
+        "beautysh": "beautysh_2",
         "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs-stable"
@@ -116,12 +164,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-b5FuoFQsTCgKsVTQS13qmFnMmVotIQWtcjPu+WT6ubo=",
-        "path": "/nix/store/m90wvnc3d4rci36q0r0j7d2i1sk35cgy-source",
+        "narHash": "sha256-sjdU/aCTVFGSDxU+jxgaHtDsZQeFNb1nA55wRPgc3tU=",
+        "path": "/nix/store/5wxj9v7dzrga7xvp4pr825ph20i1qb42-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/m90wvnc3d4rci36q0r0j7d2i1sk35cgy-source",
+        "path": "/nix/store/5wxj9v7dzrga7xvp4pr825ph20i1qb42-source",
         "type": "path"
       }
     },
@@ -157,6 +205,60 @@
         "type": "gitlab"
       }
     },
+    "poetry2nix": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "beautysh",
+          "utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "beautysh",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1658665240,
+        "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
+    "poetry2nix_2": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim-stable",
+          "beautysh",
+          "utils"
+        ],
+        "nixpkgs": [
+          "nixvim-stable",
+          "beautysh",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1658665240,
+        "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -165,6 +267,36 @@
         "nixvim": "nixvim",
         "nixvim-stable": "nixvim-stable"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1667077288,
+        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_2": {
+      "locked": {
+        "lastModified": 1667077288,
+        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/tests/flake.nix b/tests/flake.nix
index 8f4eabf7..803be217 100644
--- a/tests/flake.nix
+++ b/tests/flake.nix
@@ -70,6 +70,13 @@
               plugins.trouble.enable = true;
             };
 
+            beautysh = build {
+              plugins.null-ls = {
+                enable = true;
+                sources.formatting.beautysh.enable = true;
+              };
+            };
+
             issue-40 = build-stable {
               plugins = {
                 nix.enable = true;