use new standard nix formater from nix rfc-166 NixOS/rfcs#166

bddap · Nov 26, 2024 · c06b9d7 · c06b9d7
1 parent 720b38c
commit c06b9d7
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 100 deletions.
diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix
@@ -1,7 +1,9 @@
 let
   pkgs = import ../nix { };
   nixpkgs-unstable = pkgs.nixpkgs-unstable;
-in { config, ... }: {
+in
+{ config, ... }:
+{
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "a";

diff --git a/nix/nix/default.nix b/nix/nix/default.nix
@@ -8,4 +8,8 @@ let
       craneLib = final.craneLib;
     };
   };
-in { pkgs ? import sources.nixos-stable { } }: pkgs.appendOverlays [ overlay ]
+in
+{
+  pkgs ? import sources.nixos-stable { },
+}:
+pkgs.appendOverlays [ overlay ]
diff --git a/nix/nix/refac.nix b/nix/nix/refac.nix
@@ -1,6 +1,11 @@
 { craneLib, pkgs }:
-let sources = import ./sources.nix;
-in craneLib.buildPackage {
+let
+  sources = import ./sources.nix;
+in
+craneLib.buildPackage {
   src = sources.refac;
-  buildInputs = [ pkgs.pkg-config pkgs.openssl ];
+  buildInputs = [
+    pkgs.pkg-config
+    pkgs.openssl
+  ];
 }
diff --git a/nix/nix/sources.nix b/nix/nix/sources.nix
@@ -6,9 +6,12 @@ let
   # The fetchers. fetch_<type> fetches specs of type <type>.
   #
 
-  fetch_file = pkgs: name: spec:
-    let name' = sanitizeName name + "-src";
-    in if spec.builtin or true then
+  fetch_file =
+    pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+    if spec.builtin or true then
       builtins_fetchurl {
         inherit (spec) url sha256;
         name = name';
@@ -19,9 +22,12 @@ let
         name = name';
       };
 
-  fetch_tarball = pkgs: name: spec:
-    let name' = sanitizeName name + "-src";
-    in if spec.builtin or true then
+  fetch_tarball =
+    pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+    if spec.builtin or true then
       builtins_fetchTarball {
         name = name';
         inherit (spec) url sha256;
@@ -32,43 +38,53 @@ let
         inherit (spec) url sha256;
       };
 
-  fetch_git = name: spec:
+  fetch_git =
+    name: spec:
     let
-      ref = spec.ref or (if spec ? branch then
-        "refs/heads/${spec.branch}"
-      else if spec ? tag then
-        "refs/tags/${spec.tag}"
-      else
-        abort
-        "In git source '${name}': Please specify `ref`, `tag` or `branch`!");
+      ref =
+        spec.ref or (
+          if spec ? branch then
+            "refs/heads/${spec.branch}"
+          else if spec ? tag then
+            "refs/tags/${spec.tag}"
+          else
+            abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+        );
       submodules = spec.submodules or false;
-      submoduleArg = let
-        nixSupportsSubmodules =
-          builtins.compareVersions builtins.nixVersion "2.4" >= 0;
-        emptyArgWithWarning = if submodules then
-          builtins.trace (''The niv input "${name}" uses submodules ''
-            + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
-            + "does not support them") { }
-        else
-          { };
-      in if nixSupportsSubmodules then {
-        inherit submodules;
-      } else
-        emptyArgWithWarning;
-    in builtins.fetchGit ({
-      url = spec.repo;
-      inherit (spec) rev;
-      inherit ref;
-    } // submoduleArg);
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules then
+              builtins.trace (
+                ''The niv input "${name}" uses submodules ''
+                + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                + "does not support them"
+              ) { }
+            else
+              { };
+        in
+        if nixSupportsSubmodules then { inherit submodules; } else emptyArgWithWarning;
+    in
+    builtins.fetchGit (
+      {
+        url = spec.repo;
+        inherit (spec) rev;
+        inherit ref;
+      }
+      // submoduleArg
+    );
 
   fetch_local = spec: spec.path;
 
-  fetch_builtin-tarball = name:
+  fetch_builtin-tarball =
+    name:
     throw ''
       [${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
               $ niv modify ${name} -a type=tarball -a builtin=true'';
 
-  fetch_builtin-url = name:
+  fetch_builtin-url =
+    name:
     throw ''
       [${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
               $ niv modify ${name} -a type=file -a builtin=true'';
@@ -78,21 +94,23 @@ let
   #
 
   # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
-  sanitizeName = name:
-    (concatMapStrings (s: if builtins.isList s then "-" else s)
-      (builtins.split "[^[:alnum:]+._?=-]+"
-        ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)));
+  sanitizeName =
+    name:
+    (concatMapStrings (s: if builtins.isList s then "-" else s) (
+      builtins.split "[^[:alnum:]+._?=-]+" ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+    ));
 
   # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources: system:
+  mkPkgs =
+    sources: system:
     let
-      sourcesNixpkgs = import
-        (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {
-          inherit system;
-        };
+      sourcesNixpkgs = import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {
+        inherit system;
+      };
       hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
       hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in if builtins.hasAttr "nixpkgs" sources then
+    in
+    if builtins.hasAttr "nixpkgs" sources then
       sourcesNixpkgs
     else if hasNixpkgsPath && !hasThisAsNixpkgsPath then
       import <nixpkgs> { }
@@ -103,7 +121,8 @@ let
       '';
 
   # The actual fetching function.
-  fetch = pkgs: name: spec:
+  fetch =
+    pkgs: name: spec:
 
     if !builtins.hasAttr "type" spec then
       abort "ERROR: niv spec ${name} does not have a 'type' attribute"
@@ -120,17 +139,17 @@ let
     else if spec.type == "builtin-url" then
       fetch_builtin-url name
     else
-      abort
-      "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
 
   # If the environment variable NIV_OVERRIDE_${name} is set, then use
   # the path directly as opposed to the fetched source.
-  replace = name: drv:
+  replace =
+    name: drv:
     let
-      saneName = stringAsChars
-        (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
+      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
       ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
-    in if ersatz == "" then
+    in
+    if ersatz == "" then
       drv
     else
     # this turns the string into an actual Nix path (for both absolute and
@@ -143,23 +162,24 @@ let
   # Ports of functions for older nix versions
 
   # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (f: set:
-    with builtins;
-    listToAttrs (map (attr: {
-      name = attr;
-      value = f attr set.${attr};
-    }) (attrNames set)));
+  mapAttrs =
+    builtins.mapAttrs or (
+      f: set:
+      with builtins;
+      listToAttrs (
+        map (attr: {
+          name = attr;
+          value = f attr set.${attr};
+        }) (attrNames set)
+      )
+    );
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last:
-    if first > last then
-      [ ]
-    else
-      builtins.genList (n: first + n) (last - first + 1);
+  range =
+    first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
-  stringToCharacters = s:
-    map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
+  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
   stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
@@ -170,48 +190,61 @@ let
   optionalAttrs = cond: as: if cond then as else { };
 
   # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
-    let inherit (builtins) lessThan nixVersion fetchTarball;
-    in if lessThan nixVersion "1.12" then
-      fetchTarball
-      ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+  builtins_fetchTarball =
+    {
+      url,
+      name ? null,
+      sha256,
+    }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+    if lessThan nixVersion "1.12" then
+      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
     else
       fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
-    let inherit (builtins) lessThan nixVersion fetchurl;
-    in if lessThan nixVersion "1.12" then
-      fetchurl
-      ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+  builtins_fetchurl =
+    {
+      url,
+      name ? null,
+      sha256,
+    }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+    if lessThan nixVersion "1.12" then
+      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
     else
       fetchurl attrs;
 
   # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (name: spec:
+  mkSources =
+    config:
+    mapAttrs (
+      name: spec:
       if builtins.hasAttr "outPath" spec then
-        abort
-        "The values in sources.json should not have an 'outPath' attribute"
+        abort "The values in sources.json should not have an 'outPath' attribute"
       else
-        spec // { outPath = replace name (fetch config.pkgs name spec); })
-    config.sources;
+        spec // { outPath = replace name (fetch config.pkgs name spec); }
+    ) config.sources;
 
   # The "config" used by the fetchers
-  mkConfig = { sourcesFile ?
-      if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if sourcesFile == null then
-      { }
-    else
-      builtins.fromJSON (builtins.readFile sourcesFile)
-    , system ? builtins.currentSystem, pkgs ? mkPkgs sources system }: rec {
+  mkConfig =
+    {
+      sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null,
+      sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile),
+      system ? builtins.currentSystem,
+      pkgs ? mkPkgs sources system,
+    }:
+    rec {
       # The sources, i.e. the attribute set of spec name to spec
       inherit sources;
 
       # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
       inherit pkgs;
     };
 
-in mkSources (mkConfig { }) // {
-  __functor = _: settings: mkSources (mkConfig settings);
-}
+in
+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/nix/nixos/configuration.nix b/nix/nixos/configuration.nix
@@ -1,15 +1,16 @@
 { ... }:
-let pkgs = import ../nix { };
-in {
+let
+  pkgs = import ../nix { };
+in
+{
   imports = [ ./hardware-configuration.nix ];
 
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
 
     # how did this get here? Shouldn't this be in hardware-configuration.nix?
-    initrd.luks.devices."luks-f78f0095-dcc0-4b51-b602-c0689384506f".device =
-      "/dev/disk/by-uuid/f78f0095-dcc0-4b51-b602-c0689384506f";
+    initrd.luks.devices."luks-f78f0095-dcc0-4b51-b602-c0689384506f".device = "/dev/disk/by-uuid/f78f0095-dcc0-4b51-b602-c0689384506f";
 
     # disable tmpfs for /tmp, its limited size causes pain
     tmp.useTmpfs = false;
@@ -84,7 +85,10 @@ in {
   users.users.a = {
     isNormalUser = true;
     description = "a";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
     packages = [ pkgs.home-manager ];
     shell = pkgs.fish;
   };