nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: format code

Browse source
This commit is contained in:
Tobias Happ 2022-10-26 12:28:02 +02:00
parent 0d984e4415
commit 4ab4767d50
5 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/environment/nix.nix
View file

@ -149,7 +149,7 @@ in
"nix/registry.json".text = builtins.toJSON { "nix/registry.json".text = builtins.toJSON {
version = 2; version = 2;
flakes = mapAttrsToList (n: v: { inherit (v) from to exact; }) cfg.registry; flakes = mapAttrsToList (_n: v: { inherit (v) from to exact; }) cfg.registry;
}; };
}; };

4
modules/nixpkgs/config.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
# Inspired by # Inspired by
# https://github.com/rycee/home-manager/blob/master/modules/misc/nixpkgs.nix # https://github.com/rycee/home-manager/blob/master/modules/misc/nixpkgs.nix
@ -15,7 +15,7 @@ with lib;
config = { config = {
_module.args.pkgs = import <nixpkgs> ( _module.args.pkgs = import <nixpkgs> (
filterAttrs (n: v: v != null) config.nixpkgs filterAttrs (_n: v: v != null) config.nixpkgs
); );
nixpkgs.overlays = import ../../overlays; nixpkgs.overlays = import ../../overlays;

4
modules/nixpkgs/options.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
# Inspired by # Inspired by
# https://github.com/rycee/home-manager/blob/master/modules/misc/nixpkgs.nix # https://github.com/rycee/home-manager/blob/master/modules/misc/nixpkgs.nix
@ -46,7 +46,7 @@ let
else lib.traceSeqN 1 x false; else lib.traceSeqN 1 x false;
in in
traceXIfNot isConfig; traceXIfNot isConfig;
merge = args: fold (def: mergeConfig def.value) { }; merge = _args: fold (def: mergeConfig def.value) { };
}; };
overlayType = mkOptionType { overlayType = mkOptionType {

4
modules/time.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
# Inspired by # Inspired by
# https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/config/locale.nix # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/config/locale.nix
@ -10,8 +10,6 @@
with lib; with lib;
let let
cfg = config.time;
tzdir = "${pkgs.tzdata}/share/zoneinfo"; tzdir = "${pkgs.tzdata}/share/zoneinfo";
nospace = str: filter (c: c == " ") (stringToCharacters str) == [ ]; nospace = str: filter (c: c == " ") (stringToCharacters str) == [ ];
timezoneType = types.nullOr (types.addCheck types.str nospace) timezoneType = types.nullOr (types.addCheck types.str nospace)

6
overlays/typespeed.nix
View file

@ -1,13 +1,13 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
self: super: _self: super:
let let
nixpkgs = import ./lib/nixpkgs.nix { inherit super; }; nixpkgs = import ./lib/nixpkgs.nix { inherit super; };
in in
{ {
typespeed = nixpkgs.typespeed.overrideAttrs (old: { typespeed = nixpkgs.typespeed.overrideAttrs (_old: {
patches = nixpkgs.typespeed.patches ++ [ patches = nixpkgs.typespeed.patches ++ [
./typespeed-no-drop-priv.patch ./typespeed-no-drop-priv.patch
]; ];