home

commit 79fbc590fe3bbe5cf6fd2117c7d76d8b43e6092e
parent 52c6a956ac52426f721d6eaf47fabffffc1c5c28
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon,  7 Sep 2020 14:25:29 +0100

nixpkgsfmt weirdness ?

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
pkgs/default.nix
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
pkgs/tkn/default.nix
 | 
7
++++---
M
systems/wakasu.nix
 | 
4
++--
M
users/vincent/default.nix
 | 
14
+++++++-------

4 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -1,5 +1,5 @@
 { sources ? import ../nix
-, pkgs ? sources.pkgs {}
+, pkgs ? sources.pkgs { }
 }:
 let
   emacs27 = (pkgs.emacs.override { srcRepo = true; }).overrideAttrs (
@@ -32,44 +32,44 @@ let
 in
 rec {
   # pre nur-packages import
-  scripts = pkgs.callPackage ./scripts {};
-  tmux-tpm = pkgs.callPackage ./tmux-tpm {};
-  vrsync = pkgs.callPackage ./vrsync {};
-  vde-thinkpad = pkgs.callPackage ./vde-thinkpad {};
-  bus = pkgs.callPackage ../tools/bus {};
+  scripts = pkgs.callPackage ./scripts { };
+  tmux-tpm = pkgs.callPackage ./tmux-tpm { };
+  vrsync = pkgs.callPackage ./vrsync { };
+  vde-thinkpad = pkgs.callPackage ./vde-thinkpad { };
+  bus = pkgs.callPackage ../tools/bus { };
 
   # Mine
-  ape = pkgs.callPackage ./ape {};
-  fhs-std = pkgs.callPackage ./fhs/std.nix {};
-  nr = pkgs.callPackage ./nr {};
-  ram = pkgs.callPackage ./ram {};
-  sec = pkgs.callPackage ./sec {};
-  systemd-email = pkgs.callPackage ./systemd-email {};
-  yak = pkgs.callPackage ./yak {};
+  ape = pkgs.callPackage ./ape { };
+  fhs-std = pkgs.callPackage ./fhs/std.nix { };
+  nr = pkgs.callPackage ./nr { };
+  ram = pkgs.callPackage ./ram { };
+  sec = pkgs.callPackage ./sec { };
+  systemd-email = pkgs.callPackage ./systemd-email { };
+  yak = pkgs.callPackage ./yak { };
 
   # emacs
   emacs = emacs27.override { inherit (pkgs) imagemagick; withXwidgets = true; };
 
   # Maybe upstream
-  athens = pkgs.callPackage ./athens {};
-  envbox = pkgs.callPackage ./envbox {};
-  esc = pkgs.callPackage ./esc {};
-  gogo-protobuf = pkgs.callPackage ./gogo-protobuf {};
-  gorun = pkgs.callPackage ./gorun {};
-  govanityurl = pkgs.callPackage ./govanityurl {};
-  ko = pkgs.callPackage ./ko {};
-  kss = pkgs.callPackage ./kss {};
-  batzconverter = pkgs.callPackage ./batzconverter {};
-  kubernix = pkgs.callPackage ./kubernix {};
-  krew = pkgs.callPackage ./krew {};
-  prm = pkgs.callPackage ./prm {};
-  protobuild = pkgs.callPackage ./protobuild {};
-  rmapi = pkgs.callPackage ./rmapi {};
-  toolbox = pkgs.callPackage ./toolbox {};
-  yaspell = pkgs.callPackage ./yaspell {};
+  athens = pkgs.callPackage ./athens { };
+  envbox = pkgs.callPackage ./envbox { };
+  esc = pkgs.callPackage ./esc { };
+  gogo-protobuf = pkgs.callPackage ./gogo-protobuf { };
+  gorun = pkgs.callPackage ./gorun { };
+  govanityurl = pkgs.callPackage ./govanityurl { };
+  ko = pkgs.callPackage ./ko { };
+  kss = pkgs.callPackage ./kss { };
+  batzconverter = pkgs.callPackage ./batzconverter { };
+  kubernix = pkgs.callPackage ./kubernix { };
+  krew = pkgs.callPackage ./krew { };
+  prm = pkgs.callPackage ./prm { };
+  protobuild = pkgs.callPackage ./protobuild { };
+  rmapi = pkgs.callPackage ./rmapi { };
+  toolbox = pkgs.callPackage ./toolbox { };
+  yaspell = pkgs.callPackage ./yaspell { };
 
   # OpenShift
-  inherit (pkgs.callPackage ./oc {})
+  inherit (pkgs.callPackage ./oc { })
     oc_4_1
     oc_4_2
     oc_4_3
@@ -77,7 +77,7 @@ rec {
     oc_4_5
     ;
   oc = oc_4_5;
-  inherit (pkgs.callPackage ./openshift-install {})
+  inherit (pkgs.callPackage ./openshift-install { })
     openshift-install_4_3
     openshift-install_4_4
     openshift-install_4_5
@@ -94,7 +94,7 @@ rec {
   crc = crc_1_10;
 
   # Operator SDK
-  inherit (pkgs.callPackage ./operator-sdk {})
+  inherit (pkgs.callPackage ./operator-sdk { })
     operator-sdk_0_16
     operator-sdk_0_17
     operator-sdk_0_18
@@ -103,7 +103,7 @@ rec {
   operator-sdk = operator-sdk_0_19;
 
   # Tekton
-  inherit (pkgs.callPackage ./tkn {})
+  inherit (pkgs.callPackage ./tkn { })
     tkn_0_9
     tkn_0_10
     tkn_0_11
@@ -112,13 +112,13 @@ rec {
   tkn = tkn_0_12;
 
   # Upstream
-  buildkit = pkgs.callPackage ./buildkit {};
-  inherit (pkgs.callPackage ./containerd {})
+  buildkit = pkgs.callPackage ./buildkit { };
+  inherit (pkgs.callPackage ./containerd { })
     containerd_1_2
     containerd_1_3
     containerd_1_4
     ;
   containerd = containerd_1_3;
 
-  gnome-shell-extension-shell = pkgs.callPackage ./gnome/extensions/shell {};
+  gnome-shell-extension-shell = pkgs.callPackage ./gnome/extensions/shell { };
 }
diff --git a/pkgs/tkn/default.nix b/pkgs/tkn/default.nix
@@ -9,9 +9,10 @@ rec {
 
       goPackagePath = "github.com/tektoncd/cli";
       subPackages = [ "cmd/tkn" ];
-      buildFlagsArray = let
-        t = "${goPackagePath}/pkg/cmd/version";
-      in
+      buildFlagsArray =
+        let
+          t = "${goPackagePath}/pkg/cmd/version";
+        in
         ''
           -ldflags=
             -X ${t}.clientVersion=${version}
diff --git a/systems/wakasu.nix b/systems/wakasu.nix
@@ -55,7 +55,7 @@ in
     fsType = "vfat";
   };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/720200fc-8f27-49a7-85bb-a406b6119d31"; } ];
+  swapDevices = [{ device = "/dev/disk/by-uuid/720200fc-8f27-49a7-85bb-a406b6119d31"; }];
 
   profiles = {
     home = true;
@@ -101,7 +101,7 @@ in
     syncthing.guiAddress = "0.0.0.0:8384";
     smartd = {
       enable = true;
-      devices = [ { device = "/dev/nvme0n1"; } ];
+      devices = [{ device = "/dev/nvme0n1"; }];
     };
     wireguard = {
       enable = true;
diff --git a/users/vincent/default.nix b/users/vincent/default.nix
@@ -20,19 +20,19 @@ in
     uid = 1000;
     description = "Vincent Demeester";
     extraGroups = [ "wheel" "input" ]
-    ++ optionals config.profiles.desktop.enable [ "audio" "video" "lp" "scanner" "networkmanager" ]
-    ++ optionals config.networking.networkmanager.enable [ "networkmanager" ]
-    ++ optionals config.profiles.docker.enable [ "docker" ]
-    ++ optionals config.profiles.buildkit.enable [ "buildkit" ]
-    ++ optionals config.profiles.virtualization.enable [ "libvirtd" ];
+      ++ optionals config.profiles.desktop.enable [ "audio" "video" "lp" "scanner" "networkmanager" ]
+      ++ optionals config.networking.networkmanager.enable [ "networkmanager" ]
+      ++ optionals config.profiles.docker.enable [ "docker" ]
+      ++ optionals config.profiles.buildkit.enable [ "buildkit" ]
+      ++ optionals config.profiles.virtualization.enable [ "libvirtd" ];
     shell = mkIf config.programs.zsh.enable pkgs.zsh;
     isNormalUser = true;
     openssh.authorizedKeys.keys = authorizedKeys;
     # FIXME change this ?
     initialPassword = "changeMe";
     # FIXME This might be handled differently by programs.podman, …
-    subUidRanges = [ { startUid = 100000; count = 65536; } ];
-    subGidRanges = [ { startGid = 100000; count = 65536; } ];
+    subUidRanges = [{ startUid = 100000; count = 65536; }];
+    subGidRanges = [{ startGid = 100000; count = 65536; }];
   };
 
   /*