diff --git a/machines/pentos/hardware.nix b/machines/pentos/hardware.nix
index fe7e4ac6..d36960ac 100644
--- a/machines/pentos/hardware.nix
+++ b/machines/pentos/hardware.nix
@@ -7,7 +7,7 @@
   # Early KMS start
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/0eb8b94a-5fc2-4b24-962a-94b3675b6f5b";
diff --git a/packages/jdtls/default.nix b/packages/jdtls/default.nix
new file mode 100644
index 00000000..d444abf2
--- /dev/null
+++ b/packages/jdtls/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, pkgs, ... }:
+
+stdenv.mkDerivation rec {
+  pname = "jdtls";
+  version = "0.50.0";
+  src = pkgs.fetchurl {
+    url = "http://download.eclipse.org/${pname}/milestones/${version}/jdt-language-server-${version}-202002171858.tar.gz";
+    sha256 = "bf72084dc7988f76e01668d778c826c7490c287ee96a9f82e9e11afb6b722ab7";
+  };
+  sourceRoot = ".";
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/share/java/jdtls
+    mv config_* features plugins $out/share/java/jdtls
+    mkdir $out/bin
+    cat >$out/bin/jdtls <<HERE
+    #!${pkgs.bash}/bin/bash
+
+    tmp_dir=\$(mktemp -d /tmp/jdtls.XXXXX)
+    cp -R $out/share/java/jdtls/config_linux \$tmp_dir
+    chmod -R u=rwX \$tmp_dir
+    trap "{ rm -rf \$tmp_dir; }" 0
+
+    ${pkgs.jdk11}/bin/java \
+      -Declipse.application=org.eclipse.jdt.ls.core.id1 \
+      -Dosgi.bundles.defaultStartLevel=4 \
+      -Declipse.product=org.eclipse.jdt.ls.core.product \
+      -noverify \
+      -Xms1G \
+      -jar $out/share/java/jdtls/plugins/org.eclipse.equinox.launcher_*.jar \
+      -configuration "\$tmp_dir/config_linux" \
+      "\$@"
+    HERE
+    chmod +x $out/bin/jdtls
+  '';
+}
diff --git a/packages/node/default.nix b/packages/node/default.nix
index 64fef2ed..61cabd96 100644
--- a/packages/node/default.nix
+++ b/packages/node/default.nix
@@ -1,8 +1,11 @@
 # This file has been generated by node2nix 1.7.0. Do not edit!
 
-{pkgs ? import <nixpkgs> {
+{ pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }
+, system ? builtins.currentSystem
+, nodejs ? pkgs."nodejs-12_x"
+}:
 
 let
   nodeEnv = import ./node-env.nix {
@@ -14,4 +17,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/packages/node/node-env.nix b/packages/node/node-env.nix
index 670556bf..23f636f7 100644
--- a/packages/node/node-env.nix
+++ b/packages/node/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{ stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile }:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -21,39 +21,42 @@ let
   buildNodeSourceDist =
     { name, version, src, ... }:
 
-    stdenv.mkDerivation {
-      name = "node-tarball-${name}-${version}";
-      inherit src;
-      buildInputs = [ nodejs ];
-      buildPhase = ''
-        export HOME=$TMPDIR
-        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
-      '';
-      installPhase = ''
-        mkdir -p $out/tarballs
-        mv $tgzFile $out/tarballs
-        mkdir -p $out/nix-support
-        echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
-      '';
-    };
+      stdenv.mkDerivation {
+        name = "node-tarball-${name}-${version}";
+        inherit src;
+        buildInputs = [ nodejs ];
+        buildPhase = ''
+          export HOME=$TMPDIR
+          tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
+        '';
+        installPhase = ''
+          mkdir -p $out/tarballs
+          mv $tgzFile $out/tarballs
+          mkdir -p $out/nix-support
+          echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
+        '';
+      };
 
-  includeDependencies = {dependencies}:
+  includeDependencies = { dependencies }:
     stdenv.lib.optionalString (dependencies != [])
-      (stdenv.lib.concatMapStrings (dependency:
-        ''
-          # Bundle the dependencies of the package
-          mkdir -p node_modules
-          cd node_modules
+      (
+        stdenv.lib.concatMapStrings (
+          dependency:
+            ''
+              # Bundle the dependencies of the package
+              mkdir -p node_modules
+              cd node_modules
 
-          # Only include dependencies if they don't exist. They may also be bundled in the package.
-          if [ ! -e "${dependency.name}" ]
-          then
-              ${composePackage dependency}
-          fi
+              # Only include dependencies if they don't exist. They may also be bundled in the package.
+              if [ ! -e "${dependency.name}" ]
+              then
+                  ${composePackage dependency}
+              fi
 
-          cd ..
-        ''
-      ) dependencies);
+              cd ..
+            ''
+        ) dependencies
+      );
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
@@ -103,7 +106,7 @@ let
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
-  pinpointDependencies = {dependencies, production}:
+  pinpointDependencies = { dependencies, production }:
     let
       pinpointDependenciesFromPackageJSON = writeTextFile {
         name = "pinpointDependencies.js";
@@ -158,10 +161,10 @@ let
         '';
       };
     in
-    ''
-      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+      ''
+        node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
 
-      ${stdenv.lib.optionalString (dependencies != [])
+        ${stdenv.lib.optionalString (dependencies != [])
         ''
           if [ -d node_modules ]
           then
@@ -170,7 +173,7 @@ let
               cd ..
           fi
         ''}
-    '';
+      '';
 
   # Recursively traverses all dependencies of a package and pinpoints all
   # dependencies in the package.json file to the versions that are actually
@@ -317,11 +320,11 @@ let
     '';
   };
 
-  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
+  prepareAndInvokeNPM = { packageName, bypassCache, reconstructLock, npmFlags, production }:
     let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
     in
-    ''
+      ''
         # Pinpoint the versions of all dependencies to the ones that are actually being used
         echo "pinpointing versions of dependencies..."
         source $pinpointDependenciesScriptPath
@@ -345,21 +348,21 @@ let
         runHook preRebuild
 
         ${stdenv.lib.optionalString bypassCache ''
-          ${stdenv.lib.optionalString reconstructLock ''
-            if [ -f package-lock.json ]
-            then
-                echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
-                echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
-                rm package-lock.json
-            else
-                echo "No package-lock.json file found, reconstructing..."
-            fi
+        ${stdenv.lib.optionalString reconstructLock ''
+        if [ -f package-lock.json ]
+        then
+            echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
+            echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
+            rm package-lock.json
+        else
+            echo "No package-lock.json file found, reconstructing..."
+        fi
 
-            node ${reconstructPackageLock}
-          ''}
+        node ${reconstructPackageLock}
+      ''}
 
-          node ${addIntegrityFieldsScript}
-        ''}
+        node ${addIntegrityFieldsScript}
+      ''}
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
@@ -370,7 +373,7 @@ let
 
             npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
-    '';
+      '';
 
   # Builds and composes an NPM package including all its dependencies
   buildNodePackage =
@@ -388,60 +391,63 @@ let
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
-    , ... }@args:
+    , ...
+    }@args:
 
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
-    in
-    stdenv.mkDerivation ({
-      name = "node_${name}-${version}";
-      buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
-        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-        ++ buildInputs;
+      let
+        extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+      in
+        stdenv.mkDerivation (
+          {
+            name = "node_${name}-${version}";
+            buildInputs = [ tarWrapper python nodejs ]
+            ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+            ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+            ++ buildInputs;
 
-      inherit dontStrip; # Stripping may fail a build for some package deployments
-      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
+            inherit dontStrip; # Stripping may fail a build for some package deployments
+            inherit dontNpmInstall preRebuild unpackPhase buildPhase;
 
-      compositionScript = composePackage args;
-      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+            compositionScript = composePackage args;
+            pinpointDependenciesScript = pinpointDependenciesOfPackage args;
 
-      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+            passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
 
-      installPhase = ''
-        # Create and enter a root node_modules/ folder
-        mkdir -p $out/lib/node_modules
-        cd $out/lib/node_modules
+            installPhase = ''
+              # Create and enter a root node_modules/ folder
+              mkdir -p $out/lib/node_modules
+              cd $out/lib/node_modules
 
-        # Compose the package and all its dependencies
-        source $compositionScriptPath
+              # Compose the package and all its dependencies
+              source $compositionScriptPath
 
-        ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+              ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
 
-        # Create symlink to the deployed executable folder, if applicable
-        if [ -d "$out/lib/node_modules/.bin" ]
-        then
-            ln -s $out/lib/node_modules/.bin $out/bin
-        fi
+              # Create symlink to the deployed executable folder, if applicable
+              if [ -d "$out/lib/node_modules/.bin" ]
+              then
+                  ln -s $out/lib/node_modules/.bin $out/bin
+              fi
 
-        # Create symlinks to the deployed manual page folders, if applicable
-        if [ -d "$out/lib/node_modules/${packageName}/man" ]
-        then
-            mkdir -p $out/share
-            for dir in "$out/lib/node_modules/${packageName}/man/"*
-            do
-                mkdir -p $out/share/man/$(basename "$dir")
-                for page in "$dir"/*
-                do
-                    ln -s $page $out/share/man/$(basename "$dir")
-                done
-            done
-        fi
+              # Create symlinks to the deployed manual page folders, if applicable
+              if [ -d "$out/lib/node_modules/${packageName}/man" ]
+              then
+                  mkdir -p $out/share
+                  for dir in "$out/lib/node_modules/${packageName}/man/"*
+                  do
+                      mkdir -p $out/share/man/$(basename "$dir")
+                      for page in "$dir"/*
+                      do
+                          ln -s $page $out/share/man/$(basename "$dir")
+                      done
+                  done
+              fi
 
-        # Run post install hook, if provided
-        runHook postInstall
-      '';
-    } // extraArgs);
+              # Run post install hook, if provided
+              runHook postInstall
+            '';
+          } // extraArgs
+        );
 
   # Builds a development shell
   buildNodeShell =
@@ -459,79 +465,82 @@ let
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
-    , ... }@args:
+    , ...
+    }@args:
 
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+      let
+        extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
 
-      nodeDependencies = stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
+        nodeDependencies = stdenv.mkDerivation (
+          {
+            name = "node-dependencies-${name}-${version}";
 
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
-          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
+            buildInputs = [ tarWrapper python nodejs ]
+            ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+            ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+            ++ buildInputs;
 
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
+            inherit dontStrip; # Stripping may fail a build for some package deployments
+            inherit dontNpmInstall unpackPhase buildPhase;
 
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+            includeScript = includeDependencies { inherit dependencies; };
+            pinpointDependenciesScript = pinpointDependenciesOfPackage args;
 
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+            passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
 
-        installPhase = ''
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
+            installPhase = ''
+              mkdir -p $out/${packageName}
+              cd $out/${packageName}
 
-          source $includeScriptPath
+              source $includeScriptPath
 
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${stdenv.lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-            fi
-          ''}
+              # Create fake package.json to make the npm commands work properly
+              cp ${src}/package.json .
+              chmod 644 package.json
+              ${stdenv.lib.optionalString bypassCache ''
+              if [ -f ${src}/package-lock.json ]
+              then
+                  cp ${src}/package-lock.json .
+              fi
+            ''}
 
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+              # Go to the parent folder to make sure that all packages are pinpointed
+              cd ..
+              ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
 
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+              ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
 
-          # Expose the executables that were installed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+              # Expose the executables that were installed
+              cd ..
+              ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
 
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
-    in
-    stdenv.mkDerivation {
-      name = "node-shell-${name}-${version}";
+              mv ${packageName} lib
+              ln -s $out/lib/node_modules/.bin $out/bin
+            '';
+          } // extraArgs
+        );
+      in
+        stdenv.mkDerivation {
+          name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-      buildCommand = ''
-        mkdir -p $out/bin
-        cat > $out/bin/shell <<EOF
-        #! ${stdenv.shell} -e
-        $shellHook
-        exec ${stdenv.shell}
-        EOF
-        chmod +x $out/bin/shell
-      '';
+          buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+          buildCommand = ''
+            mkdir -p $out/bin
+            cat > $out/bin/shell <<EOF
+            #! ${stdenv.shell} -e
+            $shellHook
+            exec ${stdenv.shell}
+            EOF
+            chmod +x $out/bin/shell
+          '';
 
-      # Provide the dependencies in a development shell through the NODE_PATH environment variable
-      inherit nodeDependencies;
-      shellHook = stdenv.lib.optionalString (dependencies != []) ''
-        export NODE_PATH=$nodeDependencies/lib/node_modules
-        export PATH="$nodeDependencies/bin:$PATH"
-      '';
-    };
+          # Provide the dependencies in a development shell through the NODE_PATH environment variable
+          inherit nodeDependencies;
+          shellHook = stdenv.lib.optionalString (dependencies != []) ''
+            export NODE_PATH=$nodeDependencies/lib/node_modules
+            export PATH="$nodeDependencies/bin:$PATH"
+          '';
+        };
 in
 {
   buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
diff --git a/packages/node/node-packages.nix b/packages/node/node-packages.nix
index 455bf8e3..0d9671fb 100644
--- a/packages/node/node-packages.nix
+++ b/packages/node/node-packages.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.7.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{ nodeEnv, fetchurl, fetchgit, globalBuildInputs ? [] }:
 
 let
   sources = {
@@ -6308,11 +6308,13 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."iterare-1.2.0"
-      (sources."jaeger-client-3.17.2" // {
-        dependencies = [
-          sources."opentracing-0.13.0"
-        ];
-      })
+      (
+        sources."jaeger-client-3.17.2" // {
+          dependencies = [
+            sources."opentracing-0.13.0"
+          ];
+        }
+      )
       sources."lodash-4.17.15"
       sources."long-2.4.0"
       sources."minimatch-3.0.4"
@@ -6340,11 +6342,13 @@ in
       sources."uuid-3.4.0"
       sources."vscode-jsonrpc-4.0.0"
       sources."vscode-languageserver-5.2.1"
-      (sources."vscode-languageserver-protocol-3.14.1" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.14.0"
-        ];
-      })
+      (
+        sources."vscode-languageserver-protocol-3.14.1" // {
+          dependencies = [
+            sources."vscode-languageserver-types-3.14.0"
+          ];
+        }
+      )
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-uri-1.0.8"
       sources."wrappy-1.0.2"
@@ -6432,30 +6436,34 @@ in
       sources."acorn-jsx-5.1.0"
       sources."ajv-6.12.0"
       sources."ajv-keywords-2.1.1"
-      (sources."ansi-align-3.0.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      (
+        sources."ansi-align-3.0.0" // {
+          dependencies = [
+            sources."ansi-regex-4.1.0"
+            sources."string-width-3.1.0"
+            sources."strip-ansi-5.2.0"
+          ];
+        }
+      )
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      (sources."anymatch-1.3.2" // {
-        dependencies = [
-          sources."arr-diff-2.0.0"
-          sources."array-unique-0.2.1"
-          sources."braces-1.8.5"
-          sources."expand-brackets-0.1.5"
-          sources."extglob-0.3.2"
-          sources."is-buffer-1.1.6"
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-          sources."kind-of-3.2.2"
-          sources."micromatch-2.3.11"
-        ];
-      })
+      (
+        sources."anymatch-1.3.2" // {
+          dependencies = [
+            sources."arr-diff-2.0.0"
+            sources."array-unique-0.2.1"
+            sources."braces-1.8.5"
+            sources."expand-brackets-0.1.5"
+            sources."extglob-0.3.2"
+            sources."is-buffer-1.1.6"
+            sources."is-extglob-1.0.0"
+            sources."is-glob-2.0.1"
+            sources."kind-of-3.2.2"
+            sources."micromatch-2.3.11"
+          ];
+        }
+      )
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -6471,57 +6479,69 @@ in
       sources."async-1.5.2"
       sources."async-each-1.0.3"
       sources."atob-2.1.2"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."js-tokens-3.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
+      (
+        sources."babel-code-frame-6.26.0" // {
+          dependencies = [
+            sources."ansi-regex-2.1.1"
+            sources."ansi-styles-2.2.1"
+            sources."chalk-1.1.3"
+            sources."js-tokens-3.0.2"
+            sources."strip-ansi-3.0.1"
+            sources."supports-color-2.0.0"
+          ];
+        }
+      )
       sources."babel-runtime-6.26.0"
       sources."bail-1.0.5"
       sources."balanced-match-1.0.0"
-      (sources."base-0.11.2" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
+      (
+        sources."base-0.11.2" // {
+          dependencies = [
+            sources."define-property-1.0.0"
+          ];
+        }
+      )
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
       sources."bootstrap-vue-helper-json-1.1.1"
-      (sources."boxen-3.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."camelcase-5.3.1"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      (
+        sources."boxen-3.2.0" // {
+          dependencies = [
+            sources."ansi-regex-4.1.0"
+            sources."camelcase-5.3.1"
+            sources."string-width-3.1.0"
+            sources."strip-ansi-5.2.0"
+          ];
+        }
+      )
       sources."brace-expansion-1.1.11"
-      (sources."braces-2.3.2" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
+      (
+        sources."braces-2.3.2" // {
+          dependencies = [
+            sources."extend-shallow-2.0.1"
+          ];
+        }
+      )
       sources."buefy-helper-json-1.0.3"
       sources."buffer-from-1.1.1"
       sources."builtin-modules-1.1.1"
       sources."cache-base-1.0.1"
-      (sources."cacheable-request-6.1.0" // {
-        dependencies = [
-          sources."get-stream-5.1.0"
-          sources."lowercase-keys-2.0.0"
-        ];
-      })
+      (
+        sources."cacheable-request-6.1.0" // {
+          dependencies = [
+            sources."get-stream-5.1.0"
+            sources."lowercase-keys-2.0.0"
+          ];
+        }
+      )
       sources."call-me-maybe-1.0.1"
-      (sources."caller-path-0.1.0" // {
-        dependencies = [
-          sources."callsites-0.2.0"
-        ];
-      })
+      (
+        sources."caller-path-0.1.0" // {
+          dependencies = [
+            sources."callsites-0.2.0"
+          ];
+        }
+      )
       sources."callsites-3.1.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
@@ -6532,33 +6552,41 @@ in
       sources."character-entities-legacy-1.1.4"
       sources."character-reference-invalid-1.1.4"
       sources."chardet-0.7.0"
-      (sources."chokidar-1.5.2" // {
-        dependencies = [
-          sources."glob-parent-2.0.0"
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
+      (
+        sources."chokidar-1.5.2" // {
+          dependencies = [
+            sources."glob-parent-2.0.0"
+            sources."is-extglob-1.0.0"
+            sources."is-glob-2.0.1"
+          ];
+        }
+      )
       sources."ci-info-2.0.0"
       sources."circular-json-0.3.3"
-      (sources."class-utils-0.3.6" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-        ];
-      })
+      (
+        sources."class-utils-0.3.6" // {
+          dependencies = [
+            sources."define-property-0.2.5"
+            (
+              sources."is-accessor-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-buffer-1.1.6"
+            (
+              sources."is-data-descriptor-0.1.4" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-descriptor-0.1.6"
+            sources."kind-of-5.1.0"
+          ];
+        }
+      )
       sources."cli-boxes-2.2.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
@@ -6571,12 +6599,14 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      (sources."columnify-1.5.4" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      (
+        sources."columnify-1.5.4" // {
+          dependencies = [
+            sources."ansi-regex-2.1.1"
+            sources."strip-ansi-3.0.1"
+          ];
+        }
+      )
       sources."comma-separated-tokens-1.0.8"
       sources."commander-2.20.3"
       sources."common-tags-1.8.0"
@@ -6590,20 +6620,24 @@ in
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
-      (sources."css-2.2.4" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
+      (
+        sources."css-2.2.4" // {
+          dependencies = [
+            sources."source-map-0.6.1"
+          ];
+        }
+      )
       sources."css-parse-2.0.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-3.2.6"
       sources."decamelize-1.2.0"
-      (sources."decamelize-keys-1.1.0" // {
-        dependencies = [
-          sources."map-obj-1.0.1"
-        ];
-      })
+      (
+        sources."decamelize-keys-1.1.0" // {
+          dependencies = [
+            sources."map-obj-1.0.1"
+          ];
+        }
+      )
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
@@ -6623,22 +6657,26 @@ in
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-5.16.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."debug-4.1.1"
-          sources."ignore-4.0.6"
-        ];
-      })
-      (sources."eslint-plugin-vue-6.2.1" // {
-        dependencies = [
-          sources."acorn-7.1.0"
-          sources."debug-4.1.1"
-          sources."eslint-scope-5.0.0"
-          sources."espree-6.1.2"
-          sources."vue-eslint-parser-7.0.0"
-        ];
-      })
+      (
+        sources."eslint-5.16.0" // {
+          dependencies = [
+            sources."cross-spawn-6.0.5"
+            sources."debug-4.1.1"
+            sources."ignore-4.0.6"
+          ];
+        }
+      )
+      (
+        sources."eslint-plugin-vue-6.2.1" // {
+          dependencies = [
+            sources."acorn-7.1.0"
+            sources."debug-4.1.1"
+            sources."eslint-scope-5.0.0"
+            sources."espree-6.1.2"
+            sources."vue-eslint-parser-7.0.0"
+          ];
+        }
+      )
       sources."eslint-scope-4.0.3"
       sources."eslint-utils-1.4.3"
       sources."eslint-visitor-keys-1.1.0"
@@ -6649,49 +6687,61 @@ in
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."execa-0.7.0"
-      (sources."expand-brackets-2.1.4" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."expand-range-1.8.2" // {
-        dependencies = [
-          sources."fill-range-2.2.4"
-          sources."is-buffer-1.1.6"
-          sources."is-number-2.1.0"
-          sources."isobject-2.1.0"
-          sources."kind-of-3.2.2"
-        ];
-      })
+      (
+        sources."expand-brackets-2.1.4" // {
+          dependencies = [
+            sources."debug-2.6.9"
+            sources."define-property-0.2.5"
+            sources."extend-shallow-2.0.1"
+            (
+              sources."is-accessor-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-buffer-1.1.6"
+            (
+              sources."is-data-descriptor-0.1.4" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-descriptor-0.1.6"
+            sources."kind-of-5.1.0"
+            sources."ms-2.0.0"
+          ];
+        }
+      )
+      (
+        sources."expand-range-1.8.2" // {
+          dependencies = [
+            sources."fill-range-2.2.4"
+            sources."is-buffer-1.1.6"
+            sources."is-number-2.1.0"
+            sources."isobject-2.1.0"
+            sources."kind-of-3.2.2"
+          ];
+        }
+      )
       sources."extend-3.0.2"
-      (sources."extend-shallow-3.0.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
+      (
+        sources."extend-shallow-3.0.2" // {
+          dependencies = [
+            sources."is-extendable-1.0.1"
+          ];
+        }
+      )
       sources."external-editor-3.1.0"
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-        ];
-      })
+      (
+        sources."extglob-2.0.4" // {
+          dependencies = [
+            sources."define-property-1.0.0"
+            sources."extend-shallow-2.0.1"
+          ];
+        }
+      )
       sources."fast-deep-equal-3.1.1"
       sources."fast-glob-2.2.7"
       sources."fast-json-stable-stringify-2.1.0"
@@ -6701,11 +6751,13 @@ in
       sources."file-entry-cache-5.0.1"
       sources."file-uri-to-path-1.0.0"
       sources."filename-regex-2.0.1"
-      (sources."fill-range-4.0.0" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
+      (
+        sources."fill-range-4.0.0" // {
+          dependencies = [
+            sources."extend-shallow-2.0.1"
+          ];
+        }
+      )
       sources."find-up-2.1.0"
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.1"
@@ -6722,43 +6774,53 @@ in
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
-      (sources."glob-base-0.3.0" // {
-        dependencies = [
-          sources."glob-parent-2.0.0"
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
-      (sources."glob-parent-3.1.0" // {
-        dependencies = [
-          sources."is-glob-3.1.0"
-        ];
-      })
+      (
+        sources."glob-base-0.3.0" // {
+          dependencies = [
+            sources."glob-parent-2.0.0"
+            sources."is-extglob-1.0.0"
+            sources."is-glob-2.0.1"
+          ];
+        }
+      )
+      (
+        sources."glob-parent-3.1.0" // {
+          dependencies = [
+            sources."is-glob-3.1.0"
+          ];
+        }
+      )
       sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
       sources."globals-11.12.0"
       sources."globby-8.0.2"
-      (sources."got-9.6.0" // {
-        dependencies = [
-          sources."get-stream-4.1.0"
-        ];
-      })
+      (
+        sources."got-9.6.0" // {
+          dependencies = [
+            sources."get-stream-4.1.0"
+          ];
+        }
+      )
       sources."graceful-fs-4.2.3"
       sources."gridsome-helper-json-1.0.3"
       sources."has-1.0.3"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      (
+        sources."has-ansi-2.0.0" // {
+          dependencies = [
+            sources."ansi-regex-2.1.1"
+          ];
+        }
+      )
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
-      (sources."has-values-1.0.0" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-4.0.0"
-        ];
-      })
+      (
+        sources."has-values-1.0.0" // {
+          dependencies = [
+            sources."is-buffer-1.1.6"
+            sources."kind-of-4.0.0"
+          ];
+        }
+      )
       sources."has-yarn-2.1.0"
       sources."hast-util-embedded-1.0.4"
       sources."hast-util-has-property-1.0.3"
@@ -6773,23 +6835,27 @@ in
       sources."http-cache-semantics-4.0.4"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
-      (sources."import-fresh-3.2.1" // {
-        dependencies = [
-          sources."resolve-from-4.0.0"
-        ];
-      })
+      (
+        sources."import-fresh-3.2.1" // {
+          dependencies = [
+            sources."resolve-from-4.0.0"
+          ];
+        }
+      )
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      (sources."inquirer-6.5.2" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      (
+        sources."inquirer-6.5.2" // {
+          dependencies = [
+            sources."ansi-regex-4.1.0"
+            sources."strip-ansi-5.2.0"
+          ];
+        }
+      )
       sources."invert-kv-2.0.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-alphabetical-1.0.4"
@@ -6812,12 +6878,14 @@ in
       sources."is-hidden-1.1.3"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-3.0.0"
-      (sources."is-number-3.0.0" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-3.2.2"
-        ];
-      })
+      (
+        sources."is-number-3.0.0" // {
+          dependencies = [
+            sources."is-buffer-1.1.6"
+            sources."kind-of-3.2.2"
+          ];
+        }
+      )
       sources."is-obj-1.0.1"
       sources."is-object-1.0.1"
       sources."is-path-inside-1.0.1"
@@ -6860,15 +6928,17 @@ in
       sources."lodash.rest-4.0.5"
       sources."lodash.unescape-4.0.1"
       sources."loglevel-1.6.7"
-      (sources."loglevel-colored-level-prefix-1.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
+      (
+        sources."loglevel-colored-level-prefix-1.0.0" // {
+          dependencies = [
+            sources."ansi-regex-2.1.1"
+            sources."ansi-styles-2.2.1"
+            sources."chalk-1.1.3"
+            sources."strip-ansi-3.0.1"
+            sources."supports-color-2.0.0"
+          ];
+        }
+      )
       sources."longest-streak-1.0.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
@@ -6880,16 +6950,20 @@ in
       sources."map-visit-1.0.0"
       sources."markdown-table-0.4.0"
       sources."math-random-1.0.4"
-      (sources."mem-4.3.0" // {
-        dependencies = [
-          sources."mimic-fn-2.1.0"
-        ];
-      })
-      (sources."meow-5.0.0" // {
-        dependencies = [
-          sources."read-pkg-up-3.0.0"
-        ];
-      })
+      (
+        sources."mem-4.3.0" // {
+          dependencies = [
+            sources."mimic-fn-2.1.0"
+          ];
+        }
+      )
+      (
+        sources."meow-5.0.0" // {
+          dependencies = [
+            sources."read-pkg-up-3.0.0"
+          ];
+        }
+      )
       sources."merge2-1.3.0"
       sources."micromatch-3.1.10"
       sources."mimic-fn-1.2.0"
@@ -6897,16 +6971,20 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."minimist-options-3.0.2"
-      (sources."mixin-deep-1.3.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      (
+        sources."mixin-deep-1.3.2" // {
+          dependencies = [
+            sources."is-extendable-1.0.1"
+          ];
+        }
+      )
+      (
+        sources."mkdirp-0.5.1" // {
+          dependencies = [
+            sources."minimist-0.0.8"
+          ];
+        }
+      )
       sources."mout-0.5.0"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
@@ -6923,20 +7001,24 @@ in
       sources."number-is-nan-1.0.1"
       sources."nuxt-helper-json-1.0.0"
       sources."object-assign-4.1.1"
-      (sources."object-copy-0.1.0" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-buffer-1.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
+      (
+        sources."object-copy-0.1.0" // {
+          dependencies = [
+            sources."define-property-0.2.5"
+            sources."is-accessor-descriptor-0.1.6"
+            sources."is-buffer-1.1.6"
+            sources."is-data-descriptor-0.1.4"
+            (
+              sources."is-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-5.1.0"
+                ];
+              }
+            )
+            sources."kind-of-3.2.2"
+          ];
+        }
+      )
       sources."object-visit-1.0.1"
       sources."object.omit-2.0.1"
       sources."object.pick-1.3.0"
@@ -6944,13 +7026,15 @@ in
       sources."onetime-2.0.1"
       sources."optionator-0.8.3"
       sources."os-homedir-1.0.2"
-      (sources."os-locale-3.1.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."get-stream-4.1.0"
-        ];
-      })
+      (
+        sources."os-locale-3.1.0" // {
+          dependencies = [
+            sources."cross-spawn-6.0.5"
+            sources."execa-1.0.0"
+            sources."get-stream-4.1.0"
+          ];
+        }
+      )
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-cancelable-1.1.0"
@@ -6960,20 +7044,24 @@ in
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      (sources."package-json-6.5.0" // {
-        dependencies = [
-          sources."semver-6.3.0"
-        ];
-      })
+      (
+        sources."package-json-6.5.0" // {
+          dependencies = [
+            sources."semver-6.3.0"
+          ];
+        }
+      )
       sources."parent-module-1.0.1"
       sources."parse-entities-1.2.2"
       sources."parse-gitignore-1.0.1"
-      (sources."parse-glob-3.0.4" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
+      (
+        sources."parse-glob-3.0.4" // {
+          dependencies = [
+            sources."is-extglob-1.0.0"
+            sources."is-glob-2.0.1"
+          ];
+        }
+      )
       sources."parse-json-4.0.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
@@ -6986,50 +7074,56 @@ in
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      (sources."pkg-conf-1.1.3" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."load-json-file-1.1.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-2.1.0"
-          sources."pify-2.3.0"
-          sources."strip-bom-2.0.0"
-        ];
-      })
+      (
+        sources."pkg-conf-1.1.3" // {
+          dependencies = [
+            sources."find-up-1.1.2"
+            sources."load-json-file-1.1.0"
+            sources."parse-json-2.2.0"
+            sources."path-exists-2.1.0"
+            sources."pify-2.3.0"
+            sources."strip-bom-2.0.0"
+          ];
+        }
+      )
       sources."pluralize-7.0.0"
       sources."posix-character-classes-0.1.1"
       sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
       sources."preserve-0.2.0"
       sources."prettier-1.19.1"
-      (sources."prettier-eslint-8.8.2" // {
-        dependencies = [
-          sources."acorn-5.7.3"
-          (sources."acorn-jsx-3.0.1" // {
-            dependencies = [
-              sources."acorn-3.3.0"
-            ];
-          })
-          sources."ajv-5.5.2"
-          sources."chardet-0.4.2"
-          sources."doctrine-2.1.0"
-          sources."eslint-4.19.1"
-          sources."eslint-scope-3.7.3"
-          sources."espree-3.5.4"
-          sources."external-editor-2.2.0"
-          sources."fast-deep-equal-1.1.0"
-          sources."file-entry-cache-2.0.0"
-          sources."flat-cache-1.3.4"
-          sources."inquirer-3.3.0"
-          sources."json-schema-traverse-0.3.1"
-          sources."regexpp-1.1.0"
-          sources."slice-ansi-1.0.0"
-          sources."table-4.0.2"
-          sources."typescript-2.9.2"
-          sources."vue-eslint-parser-2.0.3"
-          sources."write-0.2.1"
-        ];
-      })
+      (
+        sources."prettier-eslint-8.8.2" // {
+          dependencies = [
+            sources."acorn-5.7.3"
+            (
+              sources."acorn-jsx-3.0.1" // {
+                dependencies = [
+                  sources."acorn-3.3.0"
+                ];
+              }
+            )
+            sources."ajv-5.5.2"
+            sources."chardet-0.4.2"
+            sources."doctrine-2.1.0"
+            sources."eslint-4.19.1"
+            sources."eslint-scope-3.7.3"
+            sources."espree-3.5.4"
+            sources."external-editor-2.2.0"
+            sources."fast-deep-equal-1.1.0"
+            sources."file-entry-cache-2.0.0"
+            sources."flat-cache-1.3.4"
+            sources."inquirer-3.3.0"
+            sources."json-schema-traverse-0.3.1"
+            sources."regexpp-1.1.0"
+            sources."slice-ansi-1.0.0"
+            sources."table-4.0.2"
+            sources."typescript-2.9.2"
+            sources."vue-eslint-parser-2.0.3"
+            sources."write-0.2.1"
+          ];
+        }
+      )
       sources."prettier-tslint-0.4.2"
       sources."pretty-format-23.6.0"
       sources."process-nextick-args-2.0.1"
@@ -7040,22 +7134,26 @@ in
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."quick-lru-1.1.0"
-      (sources."randomatic-3.1.1" // {
-        dependencies = [
-          sources."is-number-4.0.0"
-        ];
-      })
+      (
+        sources."randomatic-3.1.1" // {
+          dependencies = [
+            sources."is-number-4.0.0"
+          ];
+        }
+      )
       sources."rc-1.2.8"
       sources."read-pkg-3.0.0"
-      (sources."read-pkg-up-4.0.0" // {
-        dependencies = [
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-limit-2.2.2"
-          sources."p-locate-3.0.0"
-          sources."p-try-2.2.0"
-        ];
-      })
+      (
+        sources."read-pkg-up-4.0.0" // {
+          dependencies = [
+            sources."find-up-3.0.0"
+            sources."locate-path-3.0.0"
+            sources."p-limit-2.2.2"
+            sources."p-locate-3.0.0"
+            sources."p-try-2.2.0"
+          ];
+        }
+      )
       sources."readable-stream-2.3.7"
       sources."readdirp-2.2.1"
       sources."redent-2.0.0"
@@ -7066,18 +7164,22 @@ in
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
       sources."rehype-sort-attribute-values-2.0.1"
-      (sources."remark-5.1.0" // {
-        dependencies = [
-          sources."unified-4.2.1"
-          sources."vfile-1.4.0"
-        ];
-      })
+      (
+        sources."remark-5.1.0" // {
+          dependencies = [
+            sources."unified-4.2.1"
+            sources."vfile-1.4.0"
+          ];
+        }
+      )
       sources."remark-parse-1.1.0"
-      (sources."remark-stringify-1.1.0" // {
-        dependencies = [
-          sources."stringify-entities-1.3.2"
-        ];
-      })
+      (
+        sources."remark-stringify-1.1.0" // {
+          dependencies = [
+            sources."stringify-entities-1.3.2"
+          ];
+        }
+      )
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -7085,11 +7187,13 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-relative-0.8.7"
-      (sources."require-uncached-1.0.3" // {
-        dependencies = [
-          sources."resolve-from-1.0.1"
-        ];
-      })
+      (
+        sources."require-uncached-1.0.3" // {
+          dependencies = [
+            sources."resolve-from-1.0.1"
+          ];
+        }
+      )
       sources."resolve-1.15.1"
       sources."resolve-from-5.0.0"
       sources."resolve-url-0.2.1"
@@ -7108,11 +7212,13 @@ in
       sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
-      (sources."set-value-2.0.1" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
+      (
+        sources."set-value-2.0.1" // {
+          dependencies = [
+            sources."extend-shallow-2.0.1"
+          ];
+        }
+      )
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."shellsubstitute-1.2.0"
@@ -7120,38 +7226,48 @@ in
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
       sources."slice-ansi-2.1.0"
-      (sources."snapdragon-0.8.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."snapdragon-node-2.1.1" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      (sources."snapdragon-util-3.0.1" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-3.2.2"
-        ];
-      })
+      (
+        sources."snapdragon-0.8.2" // {
+          dependencies = [
+            sources."debug-2.6.9"
+            sources."define-property-0.2.5"
+            sources."extend-shallow-2.0.1"
+            (
+              sources."is-accessor-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-buffer-1.1.6"
+            (
+              sources."is-data-descriptor-0.1.4" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-descriptor-0.1.6"
+            sources."kind-of-5.1.0"
+            sources."ms-2.0.0"
+          ];
+        }
+      )
+      (
+        sources."snapdragon-node-2.1.1" // {
+          dependencies = [
+            sources."define-property-1.0.0"
+          ];
+        }
+      )
+      (
+        sources."snapdragon-util-3.0.1" // {
+          dependencies = [
+            sources."is-buffer-1.1.6"
+            sources."kind-of-3.2.2"
+          ];
+        }
+      )
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.3"
       sources."source-map-url-0.4.0"
@@ -7163,24 +7279,30 @@ in
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
       sources."stampit-1.2.0"
-      (sources."static-extend-0.1.2" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-        ];
-      })
+      (
+        sources."static-extend-0.1.2" // {
+          dependencies = [
+            sources."define-property-0.2.5"
+            (
+              sources."is-accessor-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-buffer-1.1.6"
+            (
+              sources."is-data-descriptor-0.1.4" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              }
+            )
+            sources."is-descriptor-0.1.6"
+            sources."kind-of-5.1.0"
+          ];
+        }
+      )
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
       sources."stringify-entities-2.0.0"
@@ -7189,64 +7311,72 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-indent-2.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."stylint-1.5.9" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."camelcase-3.0.0"
-          sources."chalk-1.1.3"
-          sources."cliui-3.2.0"
-          sources."find-up-1.1.2"
-          sources."glob-7.0.4"
-          sources."invert-kv-1.0.0"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."lcid-1.0.0"
-          sources."load-json-file-1.1.0"
-          sources."os-locale-1.4.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-2.1.0"
-          sources."path-is-absolute-1.0.0"
-          sources."path-type-1.1.0"
-          sources."pify-2.3.0"
-          sources."read-pkg-1.1.0"
-          sources."read-pkg-up-1.0.1"
-          sources."set-blocking-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."strip-bom-2.0.0"
-          sources."supports-color-2.0.0"
-          sources."yargs-4.7.1"
-          sources."yargs-parser-2.4.1"
-        ];
-      })
-      (sources."stylus-0.54.7" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-          sources."semver-6.3.0"
-          sources."source-map-0.7.3"
-        ];
-      })
+      (
+        sources."stylint-1.5.9" // {
+          dependencies = [
+            sources."ansi-regex-2.1.1"
+            sources."ansi-styles-2.2.1"
+            sources."camelcase-3.0.0"
+            sources."chalk-1.1.3"
+            sources."cliui-3.2.0"
+            sources."find-up-1.1.2"
+            sources."glob-7.0.4"
+            sources."invert-kv-1.0.0"
+            sources."is-fullwidth-code-point-1.0.0"
+            sources."lcid-1.0.0"
+            sources."load-json-file-1.1.0"
+            sources."os-locale-1.4.0"
+            sources."parse-json-2.2.0"
+            sources."path-exists-2.1.0"
+            sources."path-is-absolute-1.0.0"
+            sources."path-type-1.1.0"
+            sources."pify-2.3.0"
+            sources."read-pkg-1.1.0"
+            sources."read-pkg-up-1.0.1"
+            sources."set-blocking-1.0.0"
+            sources."string-width-1.0.2"
+            sources."strip-ansi-3.0.1"
+            sources."strip-bom-2.0.0"
+            sources."supports-color-2.0.0"
+            sources."yargs-4.7.1"
+            sources."yargs-parser-2.4.1"
+          ];
+        }
+      )
+      (
+        sources."stylus-0.54.7" // {
+          dependencies = [
+            sources."debug-3.1.0"
+            sources."ms-2.0.0"
+            sources."semver-6.3.0"
+            sources."source-map-0.7.3"
+          ];
+        }
+      )
       sources."stylus-supremacy-2.14.0"
       sources."supports-color-5.5.0"
       sources."symbol-0.2.3"
-      (sources."table-5.4.6" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      (
+        sources."table-5.4.6" // {
+          dependencies = [
+            sources."ansi-regex-4.1.0"
+            sources."string-width-3.1.0"
+            sources."strip-ansi-5.2.0"
+          ];
+        }
+      )
       sources."term-size-1.2.0"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      (sources."to-object-path-0.3.0" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-3.2.2"
-        ];
-      })
+      (
+        sources."to-object-path-0.3.0" // {
+          dependencies = [
+            sources."is-buffer-1.1.6"
+            sources."kind-of-3.2.2"
+          ];
+        }
+      )
       sources."to-readable-stream-1.0.0"
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
@@ -7262,32 +7392,40 @@ in
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
       sources."typescript-3.8.2"
-      (sources."typescript-eslint-parser-16.0.1" // {
-        dependencies = [
-          sources."semver-5.5.0"
-        ];
-      })
+      (
+        sources."typescript-eslint-parser-16.0.1" // {
+          dependencies = [
+            sources."semver-5.5.0"
+          ];
+        }
+      )
       sources."unherit-1.1.3"
-      (sources."unified-7.1.0" // {
-        dependencies = [
-          sources."unist-util-stringify-position-1.1.2"
-          sources."vfile-3.0.1"
-          sources."vfile-message-1.1.1"
-        ];
-      })
-      (sources."unified-engine-6.0.1" // {
-        dependencies = [
-          sources."to-vfile-4.0.0"
-          sources."unist-util-stringify-position-1.1.2"
-          sources."vfile-3.0.1"
-          sources."vfile-message-1.1.1"
-          (sources."vfile-reporter-5.1.2" // {
-            dependencies = [
-              sources."unist-util-stringify-position-2.0.2"
-            ];
-          })
-        ];
-      })
+      (
+        sources."unified-7.1.0" // {
+          dependencies = [
+            sources."unist-util-stringify-position-1.1.2"
+            sources."vfile-3.0.1"
+            sources."vfile-message-1.1.1"
+          ];
+        }
+      )
+      (
+        sources."unified-engine-6.0.1" // {
+          dependencies = [
+            sources."to-vfile-4.0.0"
+            sources."unist-util-stringify-position-1.1.2"
+            sources."vfile-3.0.1"
+            sources."vfile-message-1.1.1"
+            (
+              sources."vfile-reporter-5.1.2" // {
+                dependencies = [
+                  sources."unist-util-stringify-position-2.0.2"
+                ];
+              }
+            )
+          ];
+        }
+      )
       sources."union-value-1.0.1"
       sources."unique-string-1.0.0"
       sources."unist-util-find-1.0.1"
@@ -7297,21 +7435,27 @@ in
       sources."unist-util-remove-position-1.1.4"
       sources."unist-util-stringify-position-2.0.2"
       sources."unist-util-visit-1.4.1"
-      (sources."unist-util-visit-parents-2.1.2" // {
-        dependencies = [
-          sources."unist-util-is-3.0.0"
-        ];
-      })
-      (sources."unset-value-1.0.0" // {
-        dependencies = [
-          (sources."has-value-0.3.1" // {
-            dependencies = [
-              sources."isobject-2.1.0"
-            ];
-          })
-          sources."has-values-0.1.4"
-        ];
-      })
+      (
+        sources."unist-util-visit-parents-2.1.2" // {
+          dependencies = [
+            sources."unist-util-is-3.0.0"
+          ];
+        }
+      )
+      (
+        sources."unset-value-1.0.0" // {
+          dependencies = [
+            (
+              sources."has-value-0.3.1" // {
+                dependencies = [
+                  sources."isobject-2.1.0"
+                ];
+              }
+            )
+            sources."has-values-0.1.4"
+          ];
+        }
+      )
       sources."untildify-2.1.0"
       sources."update-notifier-3.0.1"
       sources."uri-js-4.2.2"
@@ -7324,16 +7468,18 @@ in
       sources."vfile-4.0.2"
       sources."vfile-location-2.0.6"
       sources."vfile-message-2.0.2"
-      (sources."vfile-reporter-6.0.0" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-          sources."supports-color-6.1.0"
-        ];
-      })
+      (
+        sources."vfile-reporter-6.0.0" // {
+          dependencies = [
+            sources."ansi-regex-5.0.0"
+            sources."emoji-regex-8.0.0"
+            sources."is-fullwidth-code-point-3.0.0"
+            sources."string-width-4.2.0"
+            sources."strip-ansi-6.0.0"
+            sources."supports-color-6.1.0"
+          ];
+        }
+      )
       sources."vfile-sort-2.2.1"
       sources."vfile-statistics-1.1.3"
       sources."vscode-css-languageservice-4.0.2"
@@ -7345,11 +7491,13 @@ in
       sources."vscode-nls-4.1.1"
       sources."vscode-textbuffer-1.0.0"
       sources."vscode-uri-1.0.8"
-      (sources."vue-eslint-parser-6.0.5" // {
-        dependencies = [
-          sources."debug-4.1.1"
-        ];
-      })
+      (
+        sources."vue-eslint-parser-6.0.5" // {
+          dependencies = [
+            sources."debug-4.1.1"
+          ];
+        }
+      )
       sources."vue-onsenui-helper-json-1.0.2"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
@@ -7357,14 +7505,16 @@ in
       sources."widest-line-2.0.1"
       sources."window-size-0.2.0"
       sources."word-wrap-1.2.3"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      (
+        sources."wrap-ansi-2.1.0" // {
+          dependencies = [
+            sources."ansi-regex-2.1.1"
+            sources."is-fullwidth-code-point-1.0.0"
+            sources."string-width-1.0.2"
+            sources."strip-ansi-3.0.1"
+          ];
+        }
+      )
       sources."wrappy-1.0.2"
       sources."write-1.0.3"
       sources."write-file-atomic-2.4.3"
@@ -7374,11 +7524,13 @@ in
       sources."xtend-4.0.2"
       sources."y18n-3.2.1"
       sources."yallist-2.1.2"
-      (sources."yargs-11.1.1" // {
-        dependencies = [
-          sources."yargs-parser-9.0.2"
-        ];
-      })
+      (
+        sources."yargs-11.1.1" // {
+          dependencies = [
+            sources."yargs-parser-9.0.2"
+          ];
+        }
+      )
       sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -7391,4 +7543,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/programs/neovim/base.nix b/programs/neovim/base.nix
index 78452424..71708ab1 100644
--- a/programs/neovim/base.nix
+++ b/programs/neovim/base.nix
@@ -11,135 +11,135 @@ let
     };
   };
 in
-  {
-    customRC = ''
-      set autoread
-      "" Theming
+{
+  customRC = ''
+    set autoread
+    "" Theming
 
-      set background=light
-      colorscheme snow
+    set background=light
+    colorscheme snow
 
-      "" General settings
+    "" General settings
 
-      " Undo over sessions
-      set undofile
-      set undodir=~/.cache/nvimundo
+    " Undo over sessions
+    set undofile
+    set undodir=~/.cache/nvimundo
 
-      " Automatically save sessions on exit and load them on start
-      function! MakeSession()
-        let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd()
-        if (filewritable(b:sessiondir) != 2)
-          exe 'silent !mkdir -p ' b:sessiondir
-          redraw!
-        endif
-        let b:filename = b:sessiondir . '/session.vim'
-        exe "mksession! " . b:filename
-      endfunction
-
-      function! LoadSession()
-        let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd()
-        let b:sessionfile = b:sessiondir . "/session.vim"
-        if (filereadable(b:sessionfile))
-          exe 'source ' b:sessionfile
-        else
-          echo "No session loaded."
-        endif
-      endfunction
-      if(argc() == 0)
-        au VimEnter * nested :call LoadSession()
-        au VimLeave * :call MakeSession()
+    " Automatically save sessions on exit and load them on start
+    function! MakeSession()
+      let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd()
+      if (filewritable(b:sessiondir) != 2)
+        exe 'silent !mkdir -p ' b:sessiondir
+        redraw!
       endif
+      let b:filename = b:sessiondir . '/session.vim'
+      exe "mksession! " . b:filename
+    endfunction
 
-      "" Filetype configuration
+    function! LoadSession()
+      let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd()
+      let b:sessionfile = b:sessiondir . "/session.vim"
+      if (filereadable(b:sessionfile))
+        exe 'source ' b:sessionfile
+      else
+        echo "No session loaded."
+      endif
+    endfunction
+    if(argc() == 0)
+      au VimEnter * nested :call LoadSession()
+      au VimLeave * :call MakeSession()
+    endif
 
-      " Base settings for all files
+    "" Filetype configuration
 
-      syntax enable
-      set number
-      set showcmd
-      set scrolloff=8
-      set expandtab
-      set tabstop=4
-      set shiftwidth=4
-      set linebreak
+    " Base settings for all files
 
-      set list
-      set listchars=tab:·\ ,trail:·
-      set inccommand=split
-      set clipboard=unnamedplus
+    syntax enable
+    set number
+    set showcmd
+    set scrolloff=8
+    set expandtab
+    set tabstop=4
+    set shiftwidth=4
+    set linebreak
 
-      filetype plugin indent on
+    set list
+    set listchars=tab:·\ ,trail:·
+    set inccommand=split
+    set clipboard=unnamedplus
 
-      "" Fuzzy search in vim
+    filetype plugin indent on
 
-      function! s:completedFiles(winid, filename, ...) abort
-        bdelete!
-        call win_gotoid(a:winid)
-        if filereadable(a:filename)
-          let lines = readfile(a:filename)
-          if !empty(lines)
-            exe ':e ' . lines[0]
-          endif
-          call delete(a:filename)
+    "" Fuzzy search in vim
+
+    function! s:completedFiles(winid, filename, ...) abort
+      bdelete!
+      call win_gotoid(a:winid)
+      if filereadable(a:filename)
+        let lines = readfile(a:filename)
+        if !empty(lines)
+          exe ':e ' . lines[0]
         endif
-      endfunction
+        call delete(a:filename)
+      endif
+    endfunction
 
-      function! FzyFiles()
-        let file = tempname()
-        let winid = win_getid()
-        let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --files --hidden -g '!/.git' --smart-case | ${pkgs.fzy.out}/bin/fzy > " . file]
-        let F = function('s:completedFiles', [winid, file])
-        botright 10 new
-        call termopen(cmd, {'on_exit': F})
-        startinsert
-      endfunction
+    function! FzyFiles()
+      let file = tempname()
+      let winid = win_getid()
+      let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --files --hidden -g '!/.git' --smart-case | ${pkgs.fzy.out}/bin/fzy > " . file]
+      let F = function('s:completedFiles', [winid, file])
+      botright 10 new
+      call termopen(cmd, {'on_exit': F})
+      startinsert
+    endfunction
 
-      function! s:completedGrep(winid, filename, ...) abort
-        bdelete!
-        call win_gotoid(a:winid)
-        if filereadable(a:filename)
-          let lines = readfile(a:filename)
-          if !empty(lines)
-            let list = split(lines[0], ':')
-            let file = list[0]
-            let line = list[1]
-            exe ':e ' . file
-            exe line
-          endif
-          call delete(a:filename)
+    function! s:completedGrep(winid, filename, ...) abort
+      bdelete!
+      call win_gotoid(a:winid)
+      if filereadable(a:filename)
+        let lines = readfile(a:filename)
+        if !empty(lines)
+          let list = split(lines[0], ':')
+          let file = list[0]
+          let line = list[1]
+          exe ':e ' . file
+          exe line
         endif
-      endfunction
+        call delete(a:filename)
+      endif
+    endfunction
 
-      function! FzyGrep()
-        let file = tempname()
-        let winid = win_getid()
-        let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --vimgrep --hidden -g '!/.git' '^' | ${pkgs.fzy.out}/bin/fzy > " . file]
-        let F = function('s:completedGrep', [winid, file])
-        botright 10 new
-        call termopen(cmd, {'on_exit': F})
-        startinsert
-      endfunction
+    function! FzyGrep()
+      let file = tempname()
+      let winid = win_getid()
+      let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --vimgrep --hidden -g '!/.git' '^' | ${pkgs.fzy.out}/bin/fzy > " . file]
+      let F = function('s:completedGrep', [winid, file])
+      botright 10 new
+      call termopen(cmd, {'on_exit': F})
+      startinsert
+    endfunction
 
-      nnoremap <C-f> :call FzyFiles()<CR>
-      nnoremap <C-g> :call FzyGrep()<CR>
+    nnoremap <C-f> :call FzyFiles()<CR>
+    nnoremap <C-g> :call FzyGrep()<CR>
 
-      "" Plugin configuration
-      let g:ale_fixers = { '*': ['remove_trailing_lines', 'trim_whitespace'] }
-      let g:ale_fix_on_save = 1
+    "" Plugin configuration
+    let g:ale_fixers = { '*': ['remove_trailing_lines', 'trim_whitespace'] }
+    let g:ale_fix_on_save = 1
 
-      let g:deoplete#enable_at_startup = 1
-    '';
-    vam.knownPlugins = pkgs.vimPlugins // customPlugins;
-    vam.pluginDictionaries = [
-      {
-        names = [
-          "ale"
-          "auto-pairs"
-          "deoplete-nvim"
-          "editorconfig-vim"
-          "snow-color-theme"
-          "vim-nix"
-        ];
-      }
-    ];
-  }
+    let g:deoplete#enable_at_startup = 1
+  '';
+  vam.knownPlugins = pkgs.vimPlugins // customPlugins;
+  vam.pluginDictionaries = [
+    {
+      names = [
+        "ale"
+        "auto-pairs"
+        "deoplete-nvim"
+        "editorconfig-vim"
+        "snow-color-theme"
+        "vim-nix"
+      ];
+    }
+  ];
+}
diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix
index 6acf425e..b80095ca 100644
--- a/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
@@ -3,11 +3,13 @@ with import <nixpkgs> {};
 {
   home-manager.users.charlotte = { pkgs, ... }: {
     nixpkgs.overlays = [
-      (self: super: {
-        neovim = super.neovim.override {
-          configure = (import ./base.nix { pkgs = self; }) ;
-        };
-      })
+      (
+        self: super: {
+          neovim = super.neovim.override {
+            configure = (import ./base.nix { pkgs = self; });
+          };
+        }
+      )
     ];
     home.packages = [ pkgs.neovim ];
   };
diff --git a/programs/sway/default.nix b/programs/sway/default.nix
index 2e4748bd..63650dd2 100644
--- a/programs/sway/default.nix
+++ b/programs/sway/default.nix
@@ -6,294 +6,294 @@ let
   color-picker = import ./color-picker.nix { inherit pkgs; };
   screenshot = import ./screenshot.nix { inherit pkgs; };
 in
-  {
-    imports = [
-      ./kanshi.nix
-      ./waybar.nix
-    ];
-    programs = {
-      sway = {
-        enable = true;
-        extraPackages = [ pkgs.xwayland ];
-        extraSessionCommands = ''
-          export XDG_SESSION_TYPE=wayland
-          export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-          export QT_AUTO_SCREEN_SCALE_FACTOR=0
-          export QT_SCALE_FACTOR=1
-          export GDK_SCALE=1
-          export GDK_DPI_SCALE=1
-          export MOZ_ENABLE_WAYLAND=1
-          export _JAVA_AWT_WM_NONREPARENTING=1
-        '';
-      };
-    };
-
-    home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = [ color-picker launcher screenshot ];
-      xdg.configFile."sway/config".text = ''
-        # Config for sway
-        #
-        # Read `man 5 sway` for a complete reference.
-
-        ### Variables
-        #
-        # Logo key. Use Mod1 for Alt.
-        set $mod Mod4
-        # Home row direction keys, like vim
-        set $left h
-        set $down j
-        set $up k
-        set $right l
-        # Your preferred terminal emulator
-        set $term ${pkgs.kitty}/bin/kitty
-        # Your preferred application launcher
-        # Note: it's recommended that you pass the final command to sway
-        set $menu $term --class launcher -e ${launcher}/bin/launcher
-
-        ### Output configuration
-        exec_always pkill kanshi; exec ${pkgs.kanshi}/bin/kanshi
-
-        workspace 1 output eDP-1
-        workspace 2 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 3 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 4 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 5 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 6 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 7 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 8 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 9 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-        workspace 10 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
-
-        ### Idle configuration
-        #
-        # This will lock your screen after 300 seconds of inactivity, turn off
-        # your displays after another 150 seconds, and turn your screens back on when
-        # resumed. It will also lock your screen before your computer goes to sleep.
-        exec ${pkgs.swayidle}/bin/swayidle -w \
-                timeout 300 '${pkgs.swaylock}/bin/swaylock -f -c 000000' \
-                timeout 150 '${pkgs.sway}/bin/swaymsg "output * dpms off"' \
-                     resume '${pkgs.sway}/bin/swaymsg "output * dpms on"' \
-               before-sleep '${pkgs.swaylock}/bin/swaylock -f -c 000000'
-
-        ### Notification daemon
-        #
-        exec ${pkgs.mako}/bin/mako
-
-        # User services bound to the graphical session
-        exec "${pkgs.systemd}/bin/systemctl --user import-environment; ${pkgs.systemd}/bin/systemctl --user start graphical-session.target"
-
-        ### Window rules
-        #
-        # Common programs
-        assign [app_id="firefox"] 1
-        assign [app_id="thunderbird"] 3
-        assign [class="rambox"] 4
-
-        # Launcher popup
-        for_window [app_id="launcher"] floating enable
-
-        # Start accentor as floating window
-        for_window [class="accentor.Main"] floating enable
-
-        ### Startup programs
-        #
-        exec ${pkgs.firefox}/bin/firefox
-        exec ${pkgs.thunderbird}/bin/thunderbird
-        exec ${pkgs.rambox}/bin/rambox
-
-        ### Input configuration
-        #
-        # Example configuration:
-        #
-        #   input "2:14:SynPS/2_Synaptics_TouchPad" {
-        #       dwt enabled
-        #       tap enabled
-        #       natural_scroll enabled
-        #       middle_emulation enabled
-        #   }
-        #
-        # You can get the names of your inputs by running: swaymsg -t get_inputs
-        # Read `man 5 sway-input` for more information about this section.
-
-        input "1:1:AT_Translated_Set_2_keyboard" {
-          xkb_layout "us"
-          xkb_variant "altgr-intl"
-          xkb_numlock enabled
-        }
-
-        input "3141:30354:SONiX_USB_Keyboard" {
-          xkb_layout "us"
-          xkb_variant "altgr-intl"
-          xkb_numlock enabled
-        }
-
-        input "1241:513:USB-HID_Keyboard" {
-          xkb_layout "us"
-          xkb_variant "altgr-intl"
-          xkb_numlock enabled
-        }
-
-        input "1102:4639:DELL081C:00_044E:121F_Touchpad" {
-          drag enabled
-          dwt enabled
-          scroll_method two_finger
-          tap enabled
-        }
-
-        input "2:7:SynPS/2_Synaptics_TouchPad" {
-          drag enabled
-          dwt enabled
-          scroll_method two_finger
-          tap enabled
-        }
-
-        ### Key bindings
-        #
-        # Basics:
-        #
-        # start a terminal
-        bindsym $mod+Return exec $term
-
-        # kill focused window
-        bindsym $mod+Shift+c kill
-
-        # start your launcher
-        bindsym $mod+d exec $menu
-
-        # Drag floating windows by holding down $mod and left mouse button.
-        # Resize them with right mouse button + $mod.
-        # Despite the name, also works for non-floating windows.
-        # Change normal to inverse to use left mouse button for resizing and right
-        # mouse button for dragging.
-        floating_modifier $mod normal
-
-        # reload the configuration file
-        bindsym $mod+Shift+r reload
-
-        # exit sway (logs you out of your Wayland session)
-        bindsym $mod+Shift+e exec ${pkgs.sway}/bin/swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' '${pkgs.sway}/bin/swaymsg exit'
-
-        # lock screen
-        bindsym $mod+c exec ${pkgs.swaylock}/bin/swaylock -f -c 000000
-
-        # screenshot
-        bindsym Print exec ${screenshot}/bin/screenshot
-        bindsym Alt+Print exec ${screenshot}/bin/screenshot -d
-        bindsym Shift+Print exec ${screenshot}/bin/screenshot -r
-        bindsym Alt+Shift+Print exec ${screenshot}/bin/screenshot -r -d
-
-        # audio
-        bindsym XF86AudioRaiseVolume exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume $(${pkgs.pulseaudio}/bin/pacmd list-sinks |${pkgs.gawk}/bin/awk '/* index:/{print $3}') +5%
-        bindsym XF86AudioLowerVolume exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume $(${pkgs.pulseaudio}/bin/pacmd list-sinks |${pkgs.gawk}/bin/awk '/* index:/{print $3}') -5%
-        bindsym XF86AudioMute exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute $(${pkgs.pulseaudio}/bin/pacmd list-sinks |${pkgs.gawk}/bin/awk '/* index:/{print $3}') toggle
-
-        # brightness
-        bindsym XF86MonBrightnessDown exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-
-        bindsym XF86MonBrightnessUp exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%
-        #
-        # Moving around:
-        #
-        # Move your focus around
-        bindsym $mod+$left focus left
-        bindsym $mod+$down focus down
-        bindsym $mod+$up focus up
-        bindsym $mod+$right focus right
-        # or use $mod+[up|down|left|right]
-        bindsym $mod+Left focus left
-        bindsym $mod+Down focus down
-        bindsym $mod+Up focus up
-        bindsym $mod+Right focus right
-
-        # _move_ the focused window with the same, but add Shift
-        bindsym $mod+Shift+$left move left
-        bindsym $mod+Shift+$down move down
-        bindsym $mod+Shift+$up move up
-        bindsym $mod+Shift+$right move right
-        # ditto, with arrow keys
-        bindsym $mod+Shift+Left move left
-        bindsym $mod+Shift+Down move down
-        bindsym $mod+Shift+Up move up
-        bindsym $mod+Shift+Right move right
-        #
-        # Workspaces:
-        #
-        # switch to workspace
-        bindsym $mod+1 workspace 1
-        bindsym $mod+2 workspace 2
-        bindsym $mod+3 workspace 3
-        bindsym $mod+4 workspace 4
-        bindsym $mod+5 workspace 5
-        bindsym $mod+6 workspace 6
-        bindsym $mod+7 workspace 7
-        bindsym $mod+8 workspace 8
-        bindsym $mod+9 workspace 9
-        bindsym $mod+0 workspace 10
-        # move focused container to workspace
-        bindsym $mod+Shift+1 move container to workspace 1
-        bindsym $mod+Shift+2 move container to workspace 2
-        bindsym $mod+Shift+3 move container to workspace 3
-        bindsym $mod+Shift+4 move container to workspace 4
-        bindsym $mod+Shift+5 move container to workspace 5
-        bindsym $mod+Shift+6 move container to workspace 6
-        bindsym $mod+Shift+7 move container to workspace 7
-        bindsym $mod+Shift+8 move container to workspace 8
-        bindsym $mod+Shift+9 move container to workspace 9
-        bindsym $mod+Shift+0 move container to workspace 10
-        # move workspace to output
-        bindsym $mod+Alt+Left move workspace to output left
-        bindsym $mod+Alt+Right move workspace to output right
-        # Note: workspaces can have any name you want, not just numbers.
-        # We just use 1-10 as the default.
-
-        #
-        # Layout stuff:
-        #
-        # You can "split" the current object of your focus with
-        # $mod+b or $mod+v, for horizontal and vertical splits
-        # respectively.
-        bindsym $mod+b splith
-        bindsym $mod+v splitv
-
-        # Switch the current container between different layout styles
-        bindsym $mod+s layout stacking
-        bindsym $mod+w layout tabbed
-        bindsym $mod+e layout toggle split
-
-        # Make the current focus fullscreen
-        bindsym $mod+f fullscreen
-
-        # Toggle the current focus between tiling and floating mode
-        bindsym $mod+Shift+space floating toggle
-
-        # Swap focus between the tiling area and the floating area
-        bindsym $mod+space focus mode_toggle
-
-        # move focus to the parent container
-        bindsym $mod+a focus parent
-        #
-        # Scratchpad:
-        #
-        # Sway has a "scratchpad", which is a bag of holding for windows.
-        # You can send windows there and get them back later.
-
-        # Move the currently focused window to the scratchpad
-        bindsym $mod+Shift+minus move scratchpad
-
-        # Show the next scratchpad window or hide the focused scratchpad window.
-        # If there are multiple scratchpad windows, this command cycles through them.
-        bindsym $mod+minus scratchpad show
-
-        #
-        # Status Bar:
-        #
-        # Read `man 5 sway-bar` for more information about this section.
-        bar {
-          swaybar_command ${pkgs.waybar}/bin/waybar
-        }
-
-        default_border pixel
-
-        include /etc/sway/config.d/*
+{
+  imports = [
+    ./kanshi.nix
+    ./waybar.nix
+  ];
+  programs = {
+    sway = {
+      enable = true;
+      extraPackages = [ pkgs.xwayland ];
+      extraSessionCommands = ''
+        export XDG_SESSION_TYPE=wayland
+        export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+        export QT_AUTO_SCREEN_SCALE_FACTOR=0
+        export QT_SCALE_FACTOR=1
+        export GDK_SCALE=1
+        export GDK_DPI_SCALE=1
+        export MOZ_ENABLE_WAYLAND=1
+        export _JAVA_AWT_WM_NONREPARENTING=1
       '';
     };
-  }
+  };
+
+  home-manager.users.charlotte = { pkgs, ... }: {
+    home.packages = [ color-picker launcher screenshot ];
+    xdg.configFile."sway/config".text = ''
+      # Config for sway
+      #
+      # Read `man 5 sway` for a complete reference.
+
+      ### Variables
+      #
+      # Logo key. Use Mod1 for Alt.
+      set $mod Mod4
+      # Home row direction keys, like vim
+      set $left h
+      set $down j
+      set $up k
+      set $right l
+      # Your preferred terminal emulator
+      set $term ${pkgs.kitty}/bin/kitty
+      # Your preferred application launcher
+      # Note: it's recommended that you pass the final command to sway
+      set $menu $term --class launcher -e ${launcher}/bin/launcher
+
+      ### Output configuration
+      exec_always pkill kanshi; exec ${pkgs.kanshi}/bin/kanshi
+
+      workspace 1 output eDP-1
+      workspace 2 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 3 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 4 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 5 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 6 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 7 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 8 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 9 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+      workspace 10 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
+
+      ### Idle configuration
+      #
+      # This will lock your screen after 300 seconds of inactivity, turn off
+      # your displays after another 150 seconds, and turn your screens back on when
+      # resumed. It will also lock your screen before your computer goes to sleep.
+      exec ${pkgs.swayidle}/bin/swayidle -w \
+              timeout 300 '${pkgs.swaylock}/bin/swaylock -f -c 000000' \
+              timeout 150 '${pkgs.sway}/bin/swaymsg "output * dpms off"' \
+                   resume '${pkgs.sway}/bin/swaymsg "output * dpms on"' \
+             before-sleep '${pkgs.swaylock}/bin/swaylock -f -c 000000'
+
+      ### Notification daemon
+      #
+      exec ${pkgs.mako}/bin/mako
+
+      # User services bound to the graphical session
+      exec "${pkgs.systemd}/bin/systemctl --user import-environment; ${pkgs.systemd}/bin/systemctl --user start graphical-session.target"
+
+      ### Window rules
+      #
+      # Common programs
+      assign [app_id="firefox"] 1
+      assign [app_id="thunderbird"] 3
+      assign [class="rambox"] 4
+
+      # Launcher popup
+      for_window [app_id="launcher"] floating enable
+
+      # Start accentor as floating window
+      for_window [class="accentor.Main"] floating enable
+
+      ### Startup programs
+      #
+      exec ${pkgs.firefox}/bin/firefox
+      exec ${pkgs.thunderbird}/bin/thunderbird
+      exec ${pkgs.rambox}/bin/rambox
+
+      ### Input configuration
+      #
+      # Example configuration:
+      #
+      #   input "2:14:SynPS/2_Synaptics_TouchPad" {
+      #       dwt enabled
+      #       tap enabled
+      #       natural_scroll enabled
+      #       middle_emulation enabled
+      #   }
+      #
+      # You can get the names of your inputs by running: swaymsg -t get_inputs
+      # Read `man 5 sway-input` for more information about this section.
+
+      input "1:1:AT_Translated_Set_2_keyboard" {
+        xkb_layout "us"
+        xkb_variant "altgr-intl"
+        xkb_numlock enabled
+      }
+
+      input "3141:30354:SONiX_USB_Keyboard" {
+        xkb_layout "us"
+        xkb_variant "altgr-intl"
+        xkb_numlock enabled
+      }
+
+      input "1241:513:USB-HID_Keyboard" {
+        xkb_layout "us"
+        xkb_variant "altgr-intl"
+        xkb_numlock enabled
+      }
+
+      input "1102:4639:DELL081C:00_044E:121F_Touchpad" {
+        drag enabled
+        dwt enabled
+        scroll_method two_finger
+        tap enabled
+      }
+
+      input "2:7:SynPS/2_Synaptics_TouchPad" {
+        drag enabled
+        dwt enabled
+        scroll_method two_finger
+        tap enabled
+      }
+
+      ### Key bindings
+      #
+      # Basics:
+      #
+      # start a terminal
+      bindsym $mod+Return exec $term
+
+      # kill focused window
+      bindsym $mod+Shift+c kill
+
+      # start your launcher
+      bindsym $mod+d exec $menu
+
+      # Drag floating windows by holding down $mod and left mouse button.
+      # Resize them with right mouse button + $mod.
+      # Despite the name, also works for non-floating windows.
+      # Change normal to inverse to use left mouse button for resizing and right
+      # mouse button for dragging.
+      floating_modifier $mod normal
+
+      # reload the configuration file
+      bindsym $mod+Shift+r reload
+
+      # exit sway (logs you out of your Wayland session)
+      bindsym $mod+Shift+e exec ${pkgs.sway}/bin/swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' '${pkgs.sway}/bin/swaymsg exit'
+
+      # lock screen
+      bindsym $mod+c exec ${pkgs.swaylock}/bin/swaylock -f -c 000000
+
+      # screenshot
+      bindsym Print exec ${screenshot}/bin/screenshot
+      bindsym Alt+Print exec ${screenshot}/bin/screenshot -d
+      bindsym Shift+Print exec ${screenshot}/bin/screenshot -r
+      bindsym Alt+Shift+Print exec ${screenshot}/bin/screenshot -r -d
+
+      # audio
+      bindsym XF86AudioRaiseVolume exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume $(${pkgs.pulseaudio}/bin/pacmd list-sinks |${pkgs.gawk}/bin/awk '/* index:/{print $3}') +5%
+      bindsym XF86AudioLowerVolume exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume $(${pkgs.pulseaudio}/bin/pacmd list-sinks |${pkgs.gawk}/bin/awk '/* index:/{print $3}') -5%
+      bindsym XF86AudioMute exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute $(${pkgs.pulseaudio}/bin/pacmd list-sinks |${pkgs.gawk}/bin/awk '/* index:/{print $3}') toggle
+
+      # brightness
+      bindsym XF86MonBrightnessDown exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-
+      bindsym XF86MonBrightnessUp exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%
+      #
+      # Moving around:
+      #
+      # Move your focus around
+      bindsym $mod+$left focus left
+      bindsym $mod+$down focus down
+      bindsym $mod+$up focus up
+      bindsym $mod+$right focus right
+      # or use $mod+[up|down|left|right]
+      bindsym $mod+Left focus left
+      bindsym $mod+Down focus down
+      bindsym $mod+Up focus up
+      bindsym $mod+Right focus right
+
+      # _move_ the focused window with the same, but add Shift
+      bindsym $mod+Shift+$left move left
+      bindsym $mod+Shift+$down move down
+      bindsym $mod+Shift+$up move up
+      bindsym $mod+Shift+$right move right
+      # ditto, with arrow keys
+      bindsym $mod+Shift+Left move left
+      bindsym $mod+Shift+Down move down
+      bindsym $mod+Shift+Up move up
+      bindsym $mod+Shift+Right move right
+      #
+      # Workspaces:
+      #
+      # switch to workspace
+      bindsym $mod+1 workspace 1
+      bindsym $mod+2 workspace 2
+      bindsym $mod+3 workspace 3
+      bindsym $mod+4 workspace 4
+      bindsym $mod+5 workspace 5
+      bindsym $mod+6 workspace 6
+      bindsym $mod+7 workspace 7
+      bindsym $mod+8 workspace 8
+      bindsym $mod+9 workspace 9
+      bindsym $mod+0 workspace 10
+      # move focused container to workspace
+      bindsym $mod+Shift+1 move container to workspace 1
+      bindsym $mod+Shift+2 move container to workspace 2
+      bindsym $mod+Shift+3 move container to workspace 3
+      bindsym $mod+Shift+4 move container to workspace 4
+      bindsym $mod+Shift+5 move container to workspace 5
+      bindsym $mod+Shift+6 move container to workspace 6
+      bindsym $mod+Shift+7 move container to workspace 7
+      bindsym $mod+Shift+8 move container to workspace 8
+      bindsym $mod+Shift+9 move container to workspace 9
+      bindsym $mod+Shift+0 move container to workspace 10
+      # move workspace to output
+      bindsym $mod+Alt+Left move workspace to output left
+      bindsym $mod+Alt+Right move workspace to output right
+      # Note: workspaces can have any name you want, not just numbers.
+      # We just use 1-10 as the default.
+
+      #
+      # Layout stuff:
+      #
+      # You can "split" the current object of your focus with
+      # $mod+b or $mod+v, for horizontal and vertical splits
+      # respectively.
+      bindsym $mod+b splith
+      bindsym $mod+v splitv
+
+      # Switch the current container between different layout styles
+      bindsym $mod+s layout stacking
+      bindsym $mod+w layout tabbed
+      bindsym $mod+e layout toggle split
+
+      # Make the current focus fullscreen
+      bindsym $mod+f fullscreen
+
+      # Toggle the current focus between tiling and floating mode
+      bindsym $mod+Shift+space floating toggle
+
+      # Swap focus between the tiling area and the floating area
+      bindsym $mod+space focus mode_toggle
+
+      # move focus to the parent container
+      bindsym $mod+a focus parent
+      #
+      # Scratchpad:
+      #
+      # Sway has a "scratchpad", which is a bag of holding for windows.
+      # You can send windows there and get them back later.
+
+      # Move the currently focused window to the scratchpad
+      bindsym $mod+Shift+minus move scratchpad
+
+      # Show the next scratchpad window or hide the focused scratchpad window.
+      # If there are multiple scratchpad windows, this command cycles through them.
+      bindsym $mod+minus scratchpad show
+
+      #
+      # Status Bar:
+      #
+      # Read `man 5 sway-bar` for more information about this section.
+      bar {
+        swaybar_command ${pkgs.waybar}/bin/waybar
+      }
+
+      default_border pixel
+
+      include /etc/sway/config.d/*
+    '';
+  };
+}
diff --git a/programs/sway/launcher.nix b/programs/sway/launcher.nix
index 747999e4..23d17bcf 100644
--- a/programs/sway/launcher.nix
+++ b/programs/sway/launcher.nix
@@ -29,111 +29,111 @@ let
     '';
   };
 in
-  pkgs.writeScriptBin "launcher" ''
-    #!${pkgs.zsh}/bin/zsh
+pkgs.writeScriptBin "launcher" ''
+  #!${pkgs.zsh}/bin/zsh
 
-    _sighandler() {
-      kill -INT "$child" 2>/dev/null
-    }
+  _sighandler() {
+    kill -INT "$child" 2>/dev/null
+  }
 
-    calc_options() {
-      echo "calc "
-    }
+  calc_options() {
+    echo "calc "
+  }
 
-    calc() {
-      if [ -n "$1" ]
-      then
-        ${pkgs.libqalculate}/bin/qalc "$1"
-        sleep 5
-      else
-        ${pkgs.libqalculate}/bin/qalc
-      fi
-    }
-
-    emoji_options() {
-      cat ${emoji_list} | sed "s/^/emoji /"
-    }
-
-    emoji() {
-      char=$(echo -n "$1" | sed "s/^\([^ ]*\) .*/\1/")
-      ${pkgs.sway}/bin/swaymsg exec -- "echo -n $char | ${pkgs.wl-clipboard}/bin/wl-copy --foreground"
-    }
-
-    record_options() {
-      ${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[]["name"]' | sed "s/^/record /"
-      echo record select
-    }
-
-    record() {
-      filename="$(${pkgs.xdg-user-dirs}/bin/xdg-user-dir VIDEOS)/$(date +'screenrecording_%y-%m-%d-%H%M%S.mp4')"
-
-      trap _sighandler SIGINT
-      if [[ "$1" = "select" ]]
-      then
-        ${pkgs.wf-recorder}/bin/wf-recorder -g "$(${pkgs.slurp}/bin/slurp)" -f "$filename" &
-      else
-        wf-recorder -o $! -f "$filename" &
-      fi
-      child=$!
-      wait "$child"
-      # We wait two times, because the first wait exits when the process receives a signal. The process might have finished though, so we ignore errors.
-      wait "$child" 2>/dev/null
-      if [ -f "$filename" ]
-      then
-        echo "Saved as $filename"
-      else
-        echo "Something went wrong while recording"
-      fi
-      sleep 5
-    }
-
-    run_options() {
-      print -rl -- ''${(ko)commands} | sed "s/^/run /"
-    }
-
-    run() {
-      ${pkgs.sway}/bin/swaymsg exec $1
-    }
-
-    ssh_options() {
-      cat $HOME/.ssh/config | grep "^Host [a-zA-Z]\+" | sed "s/Host /ssh /"
-    }
-
-    ssh() {
-      ${pkgs.sway}/bin/swaymsg exec "${pkgs.kitty}/bin/kitty -e ssh $1"
-    }
-
-    systemctl_options() {
-      echo systemctl hibernate
-      echo systemctl poweroff
-      echo systemctl reboot
-      echo systemctl suspend
-    }
-
-    tmuxinator_options() {
-      ls ~/.config/tmuxinator | sed "s/\.yml$//" | sed "s/^/tmuxinator /"
-    }
-
-    tmuxinator() {
-      ${pkgs.sway}/bin/swaymsg exec "${pkgs.kitty}/bin/kitty -e ${pkgs.tmuxinator}/bin/tmuxinator start $1"
-    }
-
-    windows_options() {
-      ${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq -r 'recurse(.nodes[]?)|recurse(.floating_nodes[]?)|select(.layout=="none")|select(.app_id!="launcher")|select(.type=="con"),select(.type=="floating_con")|(if .app_id then .app_id else .window_properties.class end)+": "+.name+" ("+(.id|tostring)+")"' | sed "s/^/windows /"
-    }
-
-    windows() {
-      window=$(echo $@ | sed 's/.* (\([^)]*\))$/\1/')
-      ${pkgs.sway}/bin/swaymsg \[con_id="$window"\] focus
-    }
-
-    CHOSEN=$(cat <(windows_options) <(tmuxinator_options) <(ssh_options) <(systemctl_options) <(run_options) <(record_options) <(calc_options) <(emoji_options) | ${pkgs.fzy}/bin/fzy --lines 36 | tail -n1)
-
-    if [ -n "$CHOSEN" ]
+  calc() {
+    if [ -n "$1" ]
     then
-      PREFIX=$(echo $CHOSEN | sed "s/^\([^ ]*\) .*/\1/g")
-      WORD=$(echo $CHOSEN | sed "s/^[^ ]* \(.*\)/\1/g")
-
-      $PREFIX $WORD
+      ${pkgs.libqalculate}/bin/qalc "$1"
+      sleep 5
+    else
+      ${pkgs.libqalculate}/bin/qalc
     fi
-  ''
+  }
+
+  emoji_options() {
+    cat ${emoji_list} | sed "s/^/emoji /"
+  }
+
+  emoji() {
+    char=$(echo -n "$1" | sed "s/^\([^ ]*\) .*/\1/")
+    ${pkgs.sway}/bin/swaymsg exec -- "echo -n $char | ${pkgs.wl-clipboard}/bin/wl-copy --foreground"
+  }
+
+  record_options() {
+    ${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[]["name"]' | sed "s/^/record /"
+    echo record select
+  }
+
+  record() {
+    filename="$(${pkgs.xdg-user-dirs}/bin/xdg-user-dir VIDEOS)/$(date +'screenrecording_%y-%m-%d-%H%M%S.mp4')"
+
+    trap _sighandler SIGINT
+    if [[ "$1" = "select" ]]
+    then
+      ${pkgs.wf-recorder}/bin/wf-recorder -g "$(${pkgs.slurp}/bin/slurp)" -f "$filename" &
+    else
+      wf-recorder -o $! -f "$filename" &
+    fi
+    child=$!
+    wait "$child"
+    # We wait two times, because the first wait exits when the process receives a signal. The process might have finished though, so we ignore errors.
+    wait "$child" 2>/dev/null
+    if [ -f "$filename" ]
+    then
+      echo "Saved as $filename"
+    else
+      echo "Something went wrong while recording"
+    fi
+    sleep 5
+  }
+
+  run_options() {
+    print -rl -- ''${(ko)commands} | sed "s/^/run /"
+  }
+
+  run() {
+    ${pkgs.sway}/bin/swaymsg exec $1
+  }
+
+  ssh_options() {
+    cat $HOME/.ssh/config | grep "^Host [a-zA-Z]\+" | sed "s/Host /ssh /"
+  }
+
+  ssh() {
+    ${pkgs.sway}/bin/swaymsg exec "${pkgs.kitty}/bin/kitty -e ssh $1"
+  }
+
+  systemctl_options() {
+    echo systemctl hibernate
+    echo systemctl poweroff
+    echo systemctl reboot
+    echo systemctl suspend
+  }
+
+  tmuxinator_options() {
+    ls ~/.config/tmuxinator | sed "s/\.yml$//" | sed "s/^/tmuxinator /"
+  }
+
+  tmuxinator() {
+    ${pkgs.sway}/bin/swaymsg exec "${pkgs.kitty}/bin/kitty -e ${pkgs.tmuxinator}/bin/tmuxinator start $1"
+  }
+
+  windows_options() {
+    ${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq -r 'recurse(.nodes[]?)|recurse(.floating_nodes[]?)|select(.layout=="none")|select(.app_id!="launcher")|select(.type=="con"),select(.type=="floating_con")|(if .app_id then .app_id else .window_properties.class end)+": "+.name+" ("+(.id|tostring)+")"' | sed "s/^/windows /"
+  }
+
+  windows() {
+    window=$(echo $@ | sed 's/.* (\([^)]*\))$/\1/')
+    ${pkgs.sway}/bin/swaymsg \[con_id="$window"\] focus
+  }
+
+  CHOSEN=$(cat <(windows_options) <(tmuxinator_options) <(ssh_options) <(systemctl_options) <(run_options) <(record_options) <(calc_options) <(emoji_options) | ${pkgs.fzy}/bin/fzy --lines 36 | tail -n1)
+
+  if [ -n "$CHOSEN" ]
+  then
+    PREFIX=$(echo $CHOSEN | sed "s/^\([^ ]*\) .*/\1/g")
+    WORD=$(echo $CHOSEN | sed "s/^[^ ]* \(.*\)/\1/g")
+
+    $PREFIX $WORD
+  fi
+''
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index 8276da4b..70f2e50e 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -2,9 +2,9 @@
 
 {
   home-manager.users.charlotte = { pkgs, ... }: {
-      nixpkgs.overlays = [
-        (self: super: { waybar = super.waybar.override { pulseSupport = true; mpdSupport = false; }; })
-      ];
+    nixpkgs.overlays = [
+      (self: super: { waybar = super.waybar.override { pulseSupport = true; mpdSupport = false; }; })
+    ];
     xdg.configFile = {
       "waybar/config".text = ''
         {
diff --git a/programs/tmux/default.nix b/programs/tmux/default.nix
index 4e418a16..fcd11276 100644
--- a/programs/tmux/default.nix
+++ b/programs/tmux/default.nix
@@ -6,9 +6,9 @@
       enable = true;
       clock24 = true;
       extraConfig = ''
-          bind q kill-session
-          bind v run-shell "tmux setw main-pane-width $(($(tmux display -p '#{window_width}') * 70 / 100)); tmux select-layout main-vertical"
-          bind h run-shell "tmux setw main-pane-height $(($(tmux display -p '#{window_height}') * 70 / 100)); tmux select-layout main-horizontal"
+        bind q kill-session
+        bind v run-shell "tmux setw main-pane-width $(($(tmux display -p '#{window_width}') * 70 / 100)); tmux select-layout main-vertical"
+        bind h run-shell "tmux setw main-pane-height $(($(tmux display -p '#{window_height}') * 70 / 100)); tmux select-layout main-horizontal"
       '';
       keyMode = "vi";
       tmuxinator.enable = true;
diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix
index 2b1c5141..606baeb2 100644
--- a/shells/accentor-api.nix
+++ b/shells/accentor-api.nix
@@ -2,14 +2,15 @@ let
   pkgs = import <nixpkgs> {};
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
 in
-  pkgs.mkShell {
-    buildInputs = with pkgs; [
-      ffmpeg
-      postgresql
-      ruby_2_7
-      taglib
-      zlib
-      (neovim.override {
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    ffmpeg
+    postgresql
+    ruby_2_7
+    taglib
+    zlib
+    (
+      neovim.override {
         configure = {
           customRC = baseVimConfig.customRC + ''
             " Required for operations modifying multiple buffers like rename
@@ -29,23 +30,24 @@ in
             }
           ];
         };
-      })
-    ];
-    shellHook = ''
-      export PGDATA=$PWD/tmp/postgres_data
-      export PGHOST=$PWD/tmp/postgres
-      export PGDATABASE=postgres
-      export DATABASE_URL="postgresql:///postgres?host=$PGHOST"
-      if [ ! -d $PGHOST ]; then
-        mkdir -p $PGHOST
-      fi
-      if [ ! -d $PGDATA ]; then
-        echo 'Initializing postgresql database...'
-        initdb $PGDATA --auth=trust >/dev/null
-      fi
-      cat >"$PGDATA/postgresql.conf" <<HERE
-        listen_addresses = '''
-        unix_socket_directories = '$PGHOST'
-      HERE
-    '';
-  }
+      }
+    )
+  ];
+  shellHook = ''
+    export PGDATA=$PWD/tmp/postgres_data
+    export PGHOST=$PWD/tmp/postgres
+    export PGDATABASE=postgres
+    export DATABASE_URL="postgresql:///postgres?host=$PGHOST"
+    if [ ! -d $PGHOST ]; then
+      mkdir -p $PGHOST
+    fi
+    if [ ! -d $PGDATA ]; then
+      echo 'Initializing postgresql database...'
+      initdb $PGDATA --auth=trust >/dev/null
+    fi
+    cat >"$PGDATA/postgresql.conf" <<HERE
+      listen_addresses = '''
+      unix_socket_directories = '$PGHOST'
+    HERE
+  '';
+}
diff --git a/shells/accentor-web.nix b/shells/accentor-web.nix
index b13a2cea..f9626a43 100644
--- a/shells/accentor-web.nix
+++ b/shells/accentor-web.nix
@@ -7,8 +7,9 @@ pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs-12_x
     yarn
-    (neovim.override {
-      configure = {
+    (
+      neovim.override {
+        configure = {
           customRC = baseVimConfig.customRC + ''
             " Required for operations modifying multiple buffers like rename
             set hidden
@@ -26,7 +27,8 @@ pkgs.mkShell {
               ];
             }
           ];
-      };
-    })
+        };
+      }
+    )
   ];
 }
diff --git a/shells/dodona.nix b/shells/dodona.nix
index 6f2fbdd4..35357a0e 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -3,14 +3,15 @@ let
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
   nodePackages = import ../packages/node/default.nix { inherit pkgs; };
 in
-  pkgs.mkShell {
-    buildInputs = with pkgs; [
-      ruby
-      yarn
-      nodejs-12_x
-      libmysqlclient
-      zlib
-      (pkgs.writeScriptBin "start-db" ''
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    ruby
+    yarn
+    nodejs-12_x
+    libmysqlclient
+    zlib
+    (
+      pkgs.writeScriptBin "start-db" ''
         #!${pkgs.zsh}/bin/zsh
 
         trap "docker stop dodona-db" 0
@@ -18,8 +19,10 @@ in
 
         child=$!
         wait $child
-      '')
-      (neovim.override {
+      ''
+    )
+    (
+      neovim.override {
         configure = {
           customRC = baseVimConfig.customRC + ''
             " Required for operations modifying multiple buffers like rename
@@ -42,9 +45,10 @@ in
             }
           ];
         };
-      })
-    ];
-    shellHook = ''
-      export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
-    '';
-  }
+      }
+    )
+  ];
+  shellHook = ''
+    export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
+  '';
+}
diff --git a/shells/javafx.nix b/shells/javafx.nix
index c0a50cb4..109985a4 100644
--- a/shells/javafx.nix
+++ b/shells/javafx.nix
@@ -1,9 +1,33 @@
 let
   pkgs = import <nixpkgs> {};
+  jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
 in
-  pkgs.mkShell {
-    buildInputs = with pkgs; [
-      jdk11
-      openjfx11
-    ];
-  }
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    jdk11
+    openjfx11
+    jdtls
+    (
+      neovim.override {
+        configure = {
+          customRC = baseVimConfig.customRC + ''
+            " Required for operations modifying multiple buffers like rename
+            set hidden
+
+            let g:LanguageClient_serverCommands = {
+            \ 'java': ['${jdtls}/bin/jdtls'],
+            \ }
+          '';
+          vam.knownPlugins = baseVimConfig.vam.knownPlugins;
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
+            {
+              names = [
+                "LanguageClient-neovim"
+              ];
+            }
+          ];
+        };
+      }
+    )
+  ];
+}
diff --git a/shells/ledger.nix b/shells/ledger.nix
index f24fd80a..0f228654 100644
--- a/shells/ledger.nix
+++ b/shells/ledger.nix
@@ -2,14 +2,16 @@ let
   pkgs = import <nixpkgs> {};
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
 in
-  pkgs.mkShell {
-    buildInputs = with pkgs; [
-      (neovim.override {
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    (
+      neovim.override {
         configure = {
           customRC = baseVimConfig.customRC;
           vam.knownPlugins = baseVimConfig.vam.knownPlugins;
           vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ];
         };
-      })
-    ];
-  }
+      }
+    )
+  ];
+}
diff --git a/shells/nix.nix b/shells/nix.nix
index 21211c76..a5fb582b 100644
--- a/shells/nix.nix
+++ b/shells/nix.nix
@@ -1,6 +1,8 @@
 let
   pkgs = import <nixpkgs> {};
 in
-  pkgs.mkShell {
-    buildInputs = with pkgs; [];
-  }
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    nixpkgs-fmt
+  ];
+}