Apply nixfmt

default.nix

@@ -1,10 +1,9 @@
-(import
+(import (
-  (
+  let
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
   fetchTarball {
     url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
-  )
+) { src = ./.; }).defaultNix
-  { src = ./.; }
-).defaultNix

demo/default.nix

@@ -26,11 +26,13 @@
   };
 
   # Expose the vm's intake revproxy at host port 5234
-  virtualisation.forwardPorts = [{
+  virtualisation.forwardPorts = [
+    {
       from = "host";
       host.port = 5234;
       guest.port = 8080;
-  }];
+    }
+  ];
 
   # Mount the demo content for both users
   nixos-shell.mounts = {

flake.nix

@@ -13,28 +13,47 @@
     nixos-shell.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, flake-compat, nixos-shell }:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-compat,
+      nixos-shell,
+    }:
     let
       inherit (nixpkgs.lib) makeOverridable nixosSystem;
       system = "x86_64-linux";
-  in {
+    in
+    {
       formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
 
-    packages.${system} = let
+      packages.${system} =
-      pkgs = (import nixpkgs {
+        let
+          pkgs = (
+            import nixpkgs {
               inherit system;
               overlays = [ self.overlays.default ];
-      });
+            }
-    in {
+          );
+        in
+        {
           default = self.packages.${system}.intake;
           inherit (pkgs) intake;
         };
 
       devShells.${system} = {
-      default = let
+        default =
+          let
             pkgs = nixpkgs.legacyPackages.${system};
-        pythonEnv = pkgs.python3.withPackages (pypkgs: with pypkgs; [ flask black pytest ]);
+            pythonEnv = pkgs.python3.withPackages (
-      in pkgs.mkShell {
+              pypkgs: with pypkgs; [
+                flask
+                black
+                pytest
+              ]
+            );
+          in
+          pkgs.mkShell {
             packages = [
               pythonEnv
               pkgs.nixos-shell
@@ -50,14 +69,23 @@
       overlays.default = final: prev: {
         intake = final.python3Packages.buildPythonPackage {
           name = "intake";
-        src = builtins.path { path = ./.; name = "intake"; };
+          src = builtins.path {
+            path = ./.;
+            name = "intake";
+          };
           format = "pyproject";
-        propagatedBuildInputs = with final.python3Packages; [ flask setuptools ];
+          propagatedBuildInputs = with final.python3Packages; [
+            flask
+            setuptools
+          ];
         };
       };
 
       templates.source = {
-      path = builtins.path { path = ./template; name = "source"; };
+        path = builtins.path {
+          path = ./template;
+          name = "source";
+        };
         description = "A basic intake source config";
       };
 

module.nix

@@ -1,23 +1,39 @@
-flake: { config, lib, pkgs, ... }:
+flake:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
-  inherit (lib) filterAttrs foldl imap1 mapAttrsToList mkEnableOption mkIf mkMerge mkOption mkPackageOption types;
+  inherit (lib)
+    filterAttrs
+    foldl
+    imap1
+    mapAttrsToList
+    mkEnableOption
+    mkIf
+    mkMerge
+    mkOption
+    mkPackageOption
+    types
+    ;
   intakeCfg = config.services.intake;
-in {
+in
+{
   options = {
     services.intake = {
       listen.addr = mkOption {
         type = types.str;
         default = "0.0.0.0";
-        description = "The listen address for the entry point to intake services. This endpoint will redirect to a "
+        description = "The listen address for the entry point to intake services. This endpoint will redirect to a local port based on the request's HTTP Basic Auth credentials.";
-        "local port based on the request's HTTP Basic Auth credentials.";
       };
 
       listen.port = mkOption {
         type = types.port;
         default = 80;
-        description = "The listen port for the entry point to intake services. This endpoint will redirect to a local "
+        description = "The listen port for the entry point to intake services. This endpoint will redirect to a local port based on the request's HTTP Basic Auth credentials.";
-        "port based on the request's HTTP Basic Auth credentials.";
       };
 
       package = mkPackageOption pkgs "intake" { };
@@ -25,8 +41,7 @@ in {
       internalPortStart = mkOption {
         type = types.port;
         default = 24130;
-        description = "The first port to use for internal service endpoints. A number of ports will be continguously "
+        description = "The first port to use for internal service endpoints. A number of ports will be continguously allocated equal to the number of users with enabled intake services.";
-        "allocated equal to the number of users with enabled intake services.";
       };
 
       extraPackages = mkOption {
@@ -38,7 +53,8 @@ in {
       users = mkOption {
         description = "User intake service definitions.";
         default = { };
-        type = types.attrsOf (types.submodule {
+        type = types.attrsOf (
+          types.submodule {
             options = {
               enable = mkEnableOption "intake, a personal feed aggregator.";
 
@@ -48,7 +64,8 @@ in {
                 description = "Extra packages available to this user and their intake service.";
               };
             };
-        });
+          }
+        );
       };
     };
   };
@@ -62,7 +79,9 @@ in {
       # Assign each user an internal port for their personal intake instance
       enabledUsers = filterAttrs (userName: userCfg: userCfg.enable) intakeCfg.users;
       enabledUserNames = mapAttrsToList (userName: userCfg: userName) enabledUsers;
-    userPortList = imap1 (i: userName: { ${userName} = i + intakeCfg.internalPortStart; }) enabledUserNames;
+      userPortList = imap1 (i: userName: {
+        ${userName} = i + intakeCfg.internalPortStart;
+      }) enabledUserNames;
       userPort = foldl (acc: val: acc // val) { } userPortList;
 
       # To avoid polluting PATH with httpd programs, define an htpasswd wrapper
@@ -73,7 +92,8 @@ in {
       # File locations
       intakeDir = "/etc/intake";
       intakePwd = "${intakeDir}/htpasswd";
-  in {
+    in
+    {
       # Apply the overlay so intake is included in pkgs.
       nixpkgs.overlays = [ flake.overlays.default ];
 
@@ -98,12 +118,13 @@ in {
       users.users =
         let
           addPackagesToUser = userName: {
-        ${userName}.packages =
+            ${userName}.packages = [
-          [ htpasswdWrapper intake ]
+              htpasswdWrapper
-          ++ intakeCfg.extraPackages
+              intake
-          ++ intakeCfg.users.${userName}.extraPackages;
+            ] ++ intakeCfg.extraPackages ++ intakeCfg.users.${userName}.extraPackages;
           };
-    in mkMerge (map addPackagesToUser enabledUserNames);
+        in
+        mkMerge (map addPackagesToUser enabledUserNames);
 
       # Enable cron
       services.cron.enable = true;
@@ -111,7 +132,9 @@ in {
       # Define a user service for each configured user
       systemd.services =
         let
-      runScript = userName: pkgs.writeShellScript "intake-run.sh" ''
+          runScript =
+            userName:
+            pkgs.writeShellScript "intake-run.sh" ''
               # Add the setuid wrapper directory so `crontab` is accessible
               export PATH="${config.security.wrapperDir}:$PATH"
               ${pythonEnv}/bin/intake run -d /home/${userName}/.local/share/intake --port ${toString userPort.${userName}}
@@ -131,7 +154,8 @@ in {
               enable = userCfg.enable;
             };
           };
-    in mkMerge (mapAttrsToList userServiceConfig intakeCfg.users);
+        in
+        mkMerge (mapAttrsToList userServiceConfig intakeCfg.users);
 
       # Define an nginx reverse proxy to request auth
       services.nginx = mkIf (enabledUsers != { }) {
@@ -142,11 +166,13 @@ in {
             proxyPass = "http://127.0.0.1:$target_port";
             basicAuthFile = intakePwd;
           };
-        extraConfig = foldl (acc: val: acc + val) "" (mapAttrsToList (userName: port: ''
+          extraConfig = foldl (acc: val: acc + val) "" (
+            mapAttrsToList (userName: port: ''
               if ($remote_user = "${userName}") {
                 set $target_port ${toString port};
               }
-        '') userPort);
+            '') userPort
+          );
         };
       };
     };

shell.nix

@@ -1,10 +1,9 @@
-(import
+(import (
-  (
+  let
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
   fetchTarball {
     url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
-  )
+) { src = ./.; }).shellNix
-  { src = ./.; }
-).shellNix