project-wide: nixfmt -> nixpkgs-fmt, applied

modules/home/deploy-tf/default.nix

@@ -8,9 +8,10 @@ let
     name = "unmergedValues";
     merge = loc: defs: map (def: def.value) defs;
   };
-in {
+in
+{
 
-    options.deploy.tf = mkOption {
+  options.deploy.tf = mkOption {
     type = types.submodule {
       freeformType = types.attrsOf unmergedValues;
 
@@ -22,7 +23,7 @@ in {
         out.set = mkOption { type = types.unspecified; };
       };
     };
-  
+
   };
   config = {
     deploy.tf = {

modules/home/vim.nix

@@ -31,36 +31,43 @@ let
   };
 
   vimSettingsType = types.submodule {
-    options = let
-      opt = name: type:
-        mkOption {
-          type = types.nullOr type;
-          default = null;
-          visible = false;
-        };
-    in mapAttrs opt knownSettings;
+    options =
+      let
+        opt = name: type:
+          mkOption {
+            type = types.nullOr type;
+            default = null;
+            visible = false;
+          };
+      in
+      mapAttrs opt knownSettings;
   };
 
   setExpr = name: value:
     let
-      v = if isBool value then
-        (if value then "" else "no") + name
-      else
-        "${name}=${
+      v =
+        if isBool value then
+          (if value then "" else "no") + name
+        else
+          "${name}=${
           if isList value then concatStringsSep "," value else toString value
         }";
-    in optionalString (value != null) ("set " + v);
+    in
+    optionalString (value != null) ("set " + v);
 
-  plugins = let
-    vpkgs = pkgs.vimPlugins;
-    getPkg = p:
-      if isDerivation p then
-        [ p ]
-      else
-        optional (isString p && hasAttr p vpkgs) vpkgs.${p};
-  in concatMap getPkg cfg.plugins;
+  plugins =
+    let
+      vpkgs = pkgs.vimPlugins;
+      getPkg = p:
+        if isDerivation p then
+          [ p ]
+        else
+          optional (isString p && hasAttr p vpkgs) vpkgs.${p};
+    in
+    concatMap getPkg cfg.plugins;
 
-in {
+in
+{
   options = {
     programs.vim = {
       enable = mkEnableOption "Vim";
@@ -136,45 +143,52 @@ in {
     };
   };
 
-  config = (let
-    customRC = ''
-      ${concatStringsSep "\n" (filter (v: v != "") (mapAttrsToList setExpr
-        (builtins.intersectAttrs knownSettings cfg.settings)))}
+  config = (
+    let
+      customRC = ''
+        ${concatStringsSep "\n" (filter (v: v != "") (mapAttrsToList setExpr
+          (builtins.intersectAttrs knownSettings cfg.settings)))}
 
-      ${cfg.extraConfig}
-    '';
+        ${cfg.extraConfig}
+      '';
 
-    vim = cfg.package.customize {
-      name = "vim";
-      vimrcConfig = {
-        inherit customRC;
+      vim = cfg.package.customize {
+        name = "vim";
+        vimrcConfig = {
+          inherit customRC;
 
-        packages.home-manager.start = plugins;
+          packages.home-manager.start = plugins;
+        };
       };
-    };
-  in mkIf cfg.enable {
-    assertions = let
-      packagesNotFound =
-        filter (p: isString p && (!hasAttr p pkgs.vimPlugins)) cfg.plugins;
-    in [{
-      assertion = packagesNotFound == [ ];
-      message = "Following VIM plugin not found in pkgs.vimPlugins: ${
+    in
+    mkIf cfg.enable {
+      assertions =
+        let
+          packagesNotFound =
+            filter (p: isString p && (!hasAttr p pkgs.vimPlugins)) cfg.plugins;
+        in
+        [{
+          assertion = packagesNotFound == [ ];
+          message = "Following VIM plugin not found in pkgs.vimPlugins: ${
           concatMapStringsSep ", " (p: ''"${p}"'') packagesNotFound
         }";
-    }];
+        }];
 
-    warnings = let stringPlugins = filter isString cfg.plugins;
-    in optional (stringPlugins != [ ]) ''
-      Specifying VIM plugins using strings is deprecated, found ${
-        concatMapStringsSep ", " (p: ''"${p}"'') stringPlugins
-      } as strings.
-    '';
+      warnings =
+        let stringPlugins = filter isString cfg.plugins;
+        in
+        optional (stringPlugins != [ ]) ''
+          Specifying VIM plugins using strings is deprecated, found ${
+            concatMapStringsSep ", " (p: ''"${p}"'') stringPlugins
+          } as strings.
+        '';
 
-    home.packages = [ cfg.finalPackage ];
+      home.packages = [ cfg.finalPackage ];
 
-    programs.vim = {
-      finalPackage = vim;
-      plugins = defaultPlugins;
-    };
-  });
+      programs.vim = {
+        finalPackage = vim;
+        plugins = defaultPlugins;
+      };
+    }
+  );
 }

modules/nixos/default.nix

@@ -1,7 +1,8 @@
 { sources, lib, ... }:
 
 let hexchen = (import sources.nix-hexchen) { };
-in {
+in
+{
   imports = [
     ./katnet
     ./deploy-tf

modules/nixos/deploy-tf/default.nix

@@ -6,7 +6,8 @@ let
     name = "unmergedValues";
     merge = loc: defs: map (def: def.value) defs;
   };
-in {
+in
+{
   options.deploy.target = mkOption {
     type = with types; str;
     default = "";
@@ -27,39 +28,41 @@ in {
   };
 
   config = {
-    deploy.tf = mkMerge (singleton {
-      attrs = [ "out" "attrs" ];
-      out.set = removeAttrs cfg cfg.attrs;
-      deploy.systems.${config.networking.hostName} =
-        with tf.resources; {
-          isRemote =
-            (config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
-          nixosConfig = config;
-          connection = tf.resources.${config.networking.hostName}.connection.set;
-          triggers.copy.${config.networking.hostName} =
-            tf.resources.${config.networking.hostName}.refAttr "id";
-          triggers.secrets.${config.networking.hostName} =
-            tf.resources.${config.networking.hostName}.refAttr "id";
-        };
+    deploy.tf = mkMerge (singleton
+      {
+        attrs = [ "out" "attrs" ];
+        out.set = removeAttrs cfg cfg.attrs;
+        deploy.systems.${config.networking.hostName} =
+          with tf.resources; {
+            isRemote =
+              (config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
+            nixosConfig = config;
+            connection = tf.resources.${config.networking.hostName}.connection.set;
+            triggers.copy.${config.networking.hostName} =
+              tf.resources.${config.networking.hostName}.refAttr "id";
+            triggers.secrets.${config.networking.hostName} =
+              tf.resources.${config.networking.hostName}.refAttr "id";
+          };
 
-      dns.records."kittywitch_net_${config.networking.hostName}" =
-        mkIf (config.hexchen.network.enable) {
-          tld = "kittywit.ch.";
-          domain = "${config.networking.hostName}.net";
-          aaaa.address = config.hexchen.network.address;
-        };
+        dns.records."kittywitch_net_${config.networking.hostName}" =
+          mkIf (config.hexchen.network.enable) {
+            tld = "kittywit.ch.";
+            domain = "${config.networking.hostName}.net";
+            aaaa.address = config.hexchen.network.address;
+          };
 
-      } ++ mapAttrsToList (_: user:
-            mapAttrs (_: mkMerge) user.deploy.tf.out.set)
-            config.home-manager.users);
+      } ++ mapAttrsToList
+      (_: user:
+        mapAttrs (_: mkMerge) user.deploy.tf.out.set)
+      config.home-manager.users);
 
-      security.acme.certs."${config.networking.hostName}.net.kittywit.ch" =
-        mkIf (config.services.nginx.enable && config.hexchen.network.enable) {
-          domain = "${config.networking.hostName}.net.kittywit.ch";
-          dnsProvider = "rfc2136";
-          credentialsFile = config.secrets.files.dns_creds.path;
-          group = "nginx";
-        };
+    security.acme.certs."${config.networking.hostName}.net.kittywit.ch" =
+      mkIf (config.services.nginx.enable && config.hexchen.network.enable) {
+        domain = "${config.networking.hostName}.net.kittywit.ch";
+        dnsProvider = "rfc2136";
+        credentialsFile = config.secrets.files.dns_creds.path;
+        group = "nginx";
+      };
 
     _module.args.tf = target.${config.deploy.target};
   };

modules/nixos/katnet/default.nix

@@ -3,7 +3,8 @@
 with lib;
 
 let cfg = config.katnet;
-in {
+in
+{
   options.katnet = {
     public.tcp.ports = mkOption {
       type = types.listOf types.port;
@@ -52,23 +53,28 @@ in {
   };
 
   config = {
-    networking.firewall.interfaces = let
-      fwTypes = {
-        ports = "Ports";
-        ranges = "PortRanges";
-      };
+    networking.firewall.interfaces =
+      let
+        fwTypes = {
+          ports = "Ports";
+          ranges = "PortRanges";
+        };
 
-      interfaceDef = visibility:
-        listToAttrs (flatten (mapAttrsToList (type: typeString:
-          map (proto: {
-            name = "allowed${toUpper proto}${typeString}";
-            value = cfg.${visibility}.${proto}.${type};
-          }) [ "tcp" "udp" ]) fwTypes));
+        interfaceDef = visibility:
+          listToAttrs (flatten (mapAttrsToList
+            (type: typeString:
+              map
+                (proto: {
+                  name = "allowed${toUpper proto}${typeString}";
+                  value = cfg.${visibility}.${proto}.${type};
+                }) [ "tcp" "udp" ])
+            fwTypes));
 
-      interfaces = visibility:
-        listToAttrs
-        (map (interface: nameValuePair interface (interfaceDef visibility))
-          cfg.${visibility}.interfaces);
-    in mkMerge (map (visibility: interfaces visibility) [ "public" "private" ]);
+        interfaces = visibility:
+          listToAttrs
+            (map (interface: nameValuePair interface (interfaceDef visibility))
+              cfg.${visibility}.interfaces);
+      in
+      mkMerge (map (visibility: interfaces visibility) [ "public" "private" ]);
   };
 }