nixpkgs-fmt update

machines/oldtown/hardware.nix

@@ -6,7 +6,7 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835";

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";

packages/kotlin-language-server/default.nix

@@ -1,8 +1,8 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { } }:
 
 with pkgs;
 let
-  buildGradle = callPackage ./gradle-env.nix {};
+  buildGradle = callPackage ./gradle-env.nix { };
 in
 buildGradle {
   envSpec = ./gradle-env.json;

packages/kotlin-language-server/gradle-env.nix

@@ -40,7 +40,6 @@ let
     versionOlder unique mapAttrs last concatMapStringsSep removeSuffix
     optionalString groupBy' readFile hasSuffix
     ;
-
   mkDep = depSpec: stdenv.mkDerivation {
     inherit (depSpec) name;
 
@@ -55,13 +54,11 @@ let
       ln -s $src $out/${depSpec.path}/${depSpec.name}
     '';
   };
-
   mkModuleMetadata = deps:
     let
       ids = filter
         (id: id.type == "pom")
         (map (dep: dep.id) deps);
-
       modules = groupBy'
         (
           meta: id:
@@ -70,7 +67,8 @@ let
               isNewerRelease =
                 !(hasSuffix "-SNAPSHOT" id.version)
                 && versionOlder meta.release id.version;
-            in {
+            in
+            {
               groupId = id.group;
               artifactId = id.name;
               latest = if isNewer then id.version else meta.latest;
@@ -81,13 +79,15 @@ let
         {
           latest = "";
           release = "";
-          versions = [];
+          versions = [ ];
         }
         (id: "${replaceStrings [ "." ] [ "/" ] id.group}/${id.name}/maven-metadata.xml")
         ids;
     in
-      attrValues (
+    attrValues
-        mapAttrs (
+      (
+        mapAttrs
+          (
             path: meta:
               let
                 versions' = sort versionOlder (unique meta.versions);
@@ -108,11 +108,9 @@ let
               ''
           ) modules
       );
-
   mkSnapshotMetadata = deps:
     let
       snapshotDeps = filter (dep: dep ? build && dep ? timestamp) deps;
-
       modules = groupBy'
         (
           meta: dep:
@@ -120,17 +118,19 @@ let
               id = dep.id;
               isNewer = dep.build > meta.buildNumber;
               # Timestamp values can be bogus, e.g. jitpack.io
-              updated = if (match "[0-9]{8}\.[0-9]{6}" dep.timestamp) != null
+              updated =
+                if (match "[0-9]{8}\.[0-9]{6}" dep.timestamp) != null
                 then replaceStrings [ "." ] [ "" ] dep.timestamp
                 else "";
-            in {
+            in
+            {
               groupId = id.group;
               artifactId = id.name;
               version = id.version;
               timestamp = if isNewer then dep.timestamp else meta.timestamp;
               buildNumber = if isNewer then dep.build else meta.buildNumber;
               lastUpdated = if isNewer then updated else meta.lastUpdated;
-              versions = meta.versions or [] ++ [
+              versions = meta.versions or [ ] ++ [
                 {
                   classifier = id.classifier or "";
                   extension = id.extension;
@@ -147,7 +147,6 @@ let
         }
         (dep: "${replaceStrings [ "." ] [ "/" ] dep.id.group}/${dep.id.name}/${dep.id.version}/maven-metadata.xml")
         snapshotDeps;
-
       mkSnapshotVersion = version: ''
         <snapshotVersion>
           ${optionalString (version.classifier != "") "<classifier>${version.classifier}</classifier>"}
@@ -157,8 +156,10 @@ let
         </snapshotVersion>
       '';
     in
-      attrValues (
+    attrValues
-        mapAttrs (
+      (
+        mapAttrs
+          (
             path: meta:
               with meta; writeTextDir path ''
                 <?xml version="1.0" encoding="UTF-8"?>
@@ -180,12 +181,10 @@ let
               ''
           ) modules
       );
-
   mkRepo = project: type: deps: buildEnv {
     name = "${project}-gradle-${type}-env";
     paths = map mkDep deps ++ mkModuleMetadata deps ++ mkSnapshotMetadata deps;
   };
-
   mkInitScript = projectSpec:
     let
       repos = mapAttrs (mkRepo projectSpec.name) projectSpec.dependencies;
@@ -227,7 +226,6 @@ let
           }
       }
     '';
-
   mkGradle = gradleSpec:
     gradleGen.gradleGen {
       inherit (gradleSpec) nativeVersion;
@@ -238,27 +236,25 @@ let
         inherit (gradleSpec) url sha256;
       };
     };
-
   mkProjectEnv = projectSpec: {
     inherit (projectSpec) name version;
     initScript = mkInitScript projectSpec;
     gradle = args.gradlePackage or mkGradle projectSpec.gradle;
   };
-
   gradleEnv = mapAttrs
     (_: p: mkProjectEnv p)
     (fromJSON (readFile envSpec));
-
   projectEnv = gradleEnv."";
   pname = args.pname or projectEnv.name;
   version = args.version or projectEnv.version;
 in
-stdenv.mkDerivation (
+stdenv.mkDerivation
+  (
     args // {
 
       inherit pname version;
 
-    nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ projectEnv.gradle ];
+      nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ projectEnv.gradle ];
 
       buildPhase = args.buildPhase or ''
         runHook preBuild
@@ -280,4 +276,4 @@ stdenv.mkDerivation (
 
       dontStrip = true;
     }
-)
+  )

packages/node/node-env.nix

@@ -5,7 +5,7 @@ let
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
-  tarWrapper = runCommand "tarWrapper" {} ''
+  tarWrapper = runCommand "tarWrapper" { } ''
     mkdir -p $out/bin
 
     cat > $out/bin/tar <<EOF
@@ -35,11 +35,11 @@ let
         echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
       '';
     };
-
   includeDependencies = { dependencies }:
-    stdenv.lib.optionalString (dependencies != [])
+    stdenv.lib.optionalString (dependencies != [ ])
+      (
+        stdenv.lib.concatMapStrings
           (
-        stdenv.lib.concatMapStrings (
             dependency:
             ''
               # Bundle the dependencies of the package
@@ -58,7 +58,7 @@ let
       );
 
   # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+  composePackage = { name, packageName, src, dependencies ? [ ], ... }@args:
     ''
       DIR=$(pwd)
       cd $TMPDIR
@@ -104,7 +104,6 @@ let
       cd ..
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
-
   pinpointDependencies = { dependencies, production }:
     let
       pinpointDependenciesFromPackageJSON = writeTextFile {
@@ -161,9 +160,9 @@ 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
@@ -177,8 +176,7 @@ let
   # Recursively traverses all dependencies of a package and pinpoints all
   # dependencies in the package.json file to the versions that are actually
   # being used.
-
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [ ], production ? true, ... }@args:
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
     ''
       if [ -d "${packageName}" ]
       then
@@ -191,7 +189,7 @@ let
 
   # Extract the Node.js source code which is used to compile packages with
   # native bindings
-  nodeSources = runCommand "node-sources" {} ''
+  nodeSources = runCommand "node-sources" { } ''
     tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
     mv node-* $out
   '';
@@ -318,7 +316,6 @@ let
       fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
     '';
   };
-
   prepareAndInvokeNPM = { packageName, bypassCache, reconstructLock, npmFlags, production }:
     let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@@ -379,8 +376,8 @@ let
     { name
     , packageName
     , version
-    , dependencies ? []
+    , dependencies ? [ ]
-    , buildInputs ? []
+    , buildInputs ? [ ]
     , production ? true
     , npmFlags ? ""
     , dontNpmInstall ? false
@@ -395,7 +392,8 @@ let
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
     in
-        stdenv.mkDerivation (
+    stdenv.mkDerivation
+      (
         {
           name = "node_${name}-${version}";
           buildInputs = [ tarWrapper python nodejs ]
@@ -453,8 +451,8 @@ let
     , packageName
     , version
     , src
-    , dependencies ? []
+    , dependencies ? [ ]
-    , buildInputs ? []
+    , buildInputs ? [ ]
     , production ? true
     , npmFlags ? ""
     , dontNpmInstall ? false
@@ -467,8 +465,8 @@ let
     }@args:
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
+      nodeDependencies = stdenv.mkDerivation
-        nodeDependencies = stdenv.mkDerivation (
+        (
           {
             name = "node-dependencies-${name}-${version}";
 
@@ -533,7 +531,7 @@ let
 
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
-          shellHook = stdenv.lib.optionalString (dependencies != []) ''
+      shellHook = stdenv.lib.optionalString (dependencies != [ ]) ''
         export NODE_PATH=$nodeDependencies/lib/node_modules
         export PATH="$nodeDependencies/bin:$PATH"
       '';

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 = {
     "@babel/code-frame-7.8.3" = {

profiles/common/default.nix

@@ -59,7 +59,7 @@
           ];
         }
       )
-      (pass.withExtensions (ext: [ext.pass-otp ext.pass-genphrase]))
+      (pass.withExtensions (ext: [ ext.pass-otp ext.pass-genphrase ]))
       ripgrep
       unzip
     ];

profiles/graphical/default.nix

@@ -70,7 +70,13 @@
         chromium
         citrix_workspace
         deluge
-        firefox
+        (
+          firefox.override {
+            extraNativeMessagingHosts = [
+              (passff-host.override { pass = (pass.withExtensions (ext: [ ext.pass-otp ext.pass-genphrase ])); })
+            ];
+          }
+        )
         google-chrome
         (gnupg.override { guiSupport = true; })
         hledger

programs/i3/default.nix

@@ -1,4 +1,4 @@
-with import <nixpkgs> {};
+with import <nixpkgs> { };
 { ... }:
 let
   launcher = import ../sway/launcher.nix { inherit pkgs stdenv; };
@@ -26,7 +26,7 @@ in
               statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${status-configuration}";
             }
           ];
-          floating.criteria = [ { class = "launcher"; } { class = "accentor.Main"; } ];
+          floating.criteria = [{ class = "launcher"; } { class = "accentor.Main"; }];
           fonts = [ "Fira Code Normal 9" ];
           menu = "${pkgs.kitty}/bin/kitty --class launcher -e ${launcher}/bin/launcher";
           modifier = "Mod4";

programs/neovim/default.nix

@@ -1,4 +1,4 @@
-with import <nixpkgs> {};
+with import <nixpkgs> { };
 
 {
   home-manager.users.charlotte = { pkgs, ... }: {

programs/sway/default.nix

@@ -1,4 +1,4 @@
-with import <nixpkgs> {};
+with import <nixpkgs> { };
 { pkgs, ... }:
 let
   launcher = import ./launcher.nix { inherit pkgs stdenv; };

programs/sway/launcher.nix

@@ -7,7 +7,6 @@ let
     type = "gem";
     version = "4.0.0.rc2";
   };
-
   emoji_list = stdenv.mkDerivation {
     name = "emoji_list";
     buildInputs = [ pkgs.ruby gemoji ];

programs/sway/status-configuration.nix

@@ -48,7 +48,7 @@ pkgs.writeText "configuration.toml" ''
   block = "net"
   device = "wlp0s20f3"
   ssid = true
-  signal_strength = true
+  signal_strength = false
   speed_up = false
   speed_down = false
   hide_missing = true

programs/zsh/default.nix

@@ -43,6 +43,7 @@
       sessionVariables = {
         DEFAULT_USER = "charlotte";
         EDITOR = "nvim";
+        PASSWORD_STORE_DIR = "$HOME/repos/passwords";
       };
       shellAliases = {
         upgrade = "sudo nix-channel --update && sudo nixos-rebuild switch";

shells/accentor-android.nix

@@ -23,7 +23,6 @@ let
     # useGoogleTVAddOns = false;
     # includeExtras = [ "extras;google;gcm" ];
   };
-
   customPlugins.kotlin-vim = pkgs.vimUtils.buildVimPlugin {
     name = "kotlin-vim";
     src = pkgs.fetchFromGitHub {
@@ -33,7 +32,6 @@ let
       sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz";
     };
   };
-
   gradle-fhs-nix = pkgs.writeText "gradle-fhs.nix" ''
     { run }:
     let
@@ -48,14 +46,12 @@ let
         runScript = "bash -c '''''${run}'''";
       }).env
   '';
-
   gradle-run-script = pkgs.writeScriptBin "gradle" ''
     #!${pkgs.bash}/bin/bash
 
     REPO_ROOT="$(git rev-parse --show-toplevel)"
     nix-shell --argstr run "\"$REPO_ROOT/gradlew $@\"" "${gradle-fhs-nix}"
   '';
-
   sign-release = pkgs.writeScriptBin "sign-release" ''
     #!${pkgs.bash}/bin/bash
 
@@ -90,7 +86,7 @@ pkgs.mkShell {
             \ }
           '';
           vam.knownPlugins = baseVimConfig.vam.knownPlugins // customPlugins;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
             {
               names = [
                 "kotlin-vim"

shells/accentor-api.nix

@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
 in
 pkgs.mkShell {
@@ -21,7 +21,7 @@ pkgs.mkShell {
             \ }
           '';
           vam.knownPlugins = baseVimConfig.vam.knownPlugins;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
             {
               names = [
                 "LanguageClient-neovim"

shells/accentor-web.nix

@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
   nodePackages = import ../packages/node/default.nix { inherit pkgs; };
 in
@@ -19,7 +19,7 @@ pkgs.mkShell {
             \ }
           '';
           vam.knownPlugins = baseVimConfig.vam.knownPlugins;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
             {
               names = [
                 "LanguageClient-neovim"

shells/dodona.nix

@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
   nodePackages = import ../packages/node/default.nix { inherit pkgs; };
 in
@@ -36,7 +36,7 @@ pkgs.mkShell {
             \ }
           '';
           vam.knownPlugins = baseVimConfig.vam.knownPlugins;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
             {
               names = [
                 "LanguageClient-neovim"

shells/javafx.nix

@@ -1,8 +1,7 @@
 let
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
   jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
-
   extraRpath = pkgs.stdenv.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg ]);
 in
 pkgs.mkShell {
@@ -41,7 +40,7 @@ pkgs.mkShell {
             \}
           '';
           vam.knownPlugins = baseVimConfig.vam.knownPlugins;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [
             {
               names = [
                 "LanguageClient-neovim"

shells/ledger.nix

@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
 in
 pkgs.mkShell {
@@ -9,7 +9,7 @@ pkgs.mkShell {
         configure = {
           customRC = baseVimConfig.customRC;
           vam.knownPlugins = baseVimConfig.vam.knownPlugins;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ];
+          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [{ name = "vim-ledger"; }];
         };
       }
     )

shells/nix.nix

@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
 in
 pkgs.mkShell {
   buildInputs = with pkgs; [