From aa122cbae78ce97d60c0c98ba14df753d97e40b1 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 30 Jan 2022 19:06:58 +0300
Subject: style: format entire depot with nixpkgs-fmt

This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>
---
 users/grfn/gws.fyi/default.nix       | 12 +++++++-----
 users/grfn/gws.fyi/orgExportHTML.nix | 13 +++++++------
 users/grfn/gws.fyi/site.nix          |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'users/grfn/gws.fyi')

diff --git a/users/grfn/gws.fyi/default.nix b/users/grfn/gws.fyi/default.nix
index 5b7d8fc0e19a..5ab3614d7902 100644
--- a/users/grfn/gws.fyi/default.nix
+++ b/users/grfn/gws.fyi/default.nix
@@ -6,13 +6,14 @@ let
   bucket = "s3://gws.fyi";
   distributionID = "E2ST43JNBH8C64";
 
-  css = runCommand "main.css" {
-    buildInputs = [ pkgs.minify ];
-  } ''
+  css = runCommand "main.css"
+    {
+      buildInputs = [ pkgs.minify ];
+    } ''
     minify --type css < ${./main.css} > $out
   '';
 
-  keys = runCommand "ssh-keys" {} ''
+  keys = runCommand "ssh-keys" { } ''
     touch $out
     echo "${depot.users.grfn.keys.main}" >> $out
   '';
@@ -27,7 +28,8 @@ let
       cp ${keys} $out/keys
     '';
 
-in (writeShellScript "deploy.sh" ''
+in
+(writeShellScript "deploy.sh" ''
   ${awscli2}/bin/aws --profile personal s3 sync ${website}/ ${bucket}
   echo "Deployed to http://gws.fyi"
 '') // {
diff --git a/users/grfn/gws.fyi/orgExportHTML.nix b/users/grfn/gws.fyi/orgExportHTML.nix
index ac28580a5926..f9cb8d38fb77 100644
--- a/users/grfn/gws.fyi/orgExportHTML.nix
+++ b/users/grfn/gws.fyi/orgExportHTML.nix
@@ -25,15 +25,16 @@ let
   outName =
     if isNull headline
     then
-      let bn = builtins.baseNameOf src;
-          filename = elemAt (splitString "." bn) 0;
+      let
+        bn = builtins.baseNameOf src;
+        filename = elemAt (splitString "." bn) 0;
       in
-        if depot.nix.utils.isDirectory src
-        then filename
-        else filename + ".html"
+      if depot.nix.utils.isDirectory src
+      then filename
+      else filename + ".html"
     else "${filename}-${replaceStrings [" "] ["-"] filename}.html";
 
-  escapeDoubleQuotes = replaceStrings ["\""] ["\\\""];
+  escapeDoubleQuotes = replaceStrings [ "\"" ] [ "\\\"" ];
 
   navToHeadline = optionalString (! isNull headline) ''
     (search-forward "${escapeDoubleQuotes headline}")
diff --git a/users/grfn/gws.fyi/site.nix b/users/grfn/gws.fyi/site.nix
index 33d4a71e7b1f..057c4d3ee698 100644
--- a/users/grfn/gws.fyi/site.nix
+++ b/users/grfn/gws.fyi/site.nix
@@ -1,4 +1,4 @@
-args@{ pkgs ? import <nixpkgs> {}, ... }:
+args@{ pkgs ? import <nixpkgs> { }, ... }:
 
 let
 
-- 
cgit 1.4.1