pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

format with nixpkgs#nixpkgs-fmt

Browse source
This commit is contained in:
Timothy DeHerrera 2019-12-15 01:08:22 -07:00
parent ddb256725e
commit da6e3fee94
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
4 changed files with 46 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configurations/default.nix
View file

@ -15,16 +15,12 @@ let
global = { global = {
_module.args.utils = utils; _module.args.utils = utils;
system.configurationRevision = flake.rev;
networking.hostName = self; networking.hostName = self;
nix.package = nix.defaultPackage."${system}"; nix.package = nix.defaultPackage."${system}";
system.configurationRevision = flake.rev;
}; };
local = vimport ./. "${self}.nix"; local = vimport ./. "${self}.nix";
in in
[ [
core core
@ -34,4 +30,4 @@ let
}; };
in in
reqImport { dir = ./.; _import = config; } reqImport { dir = ./.; _import = config; }

6
lib/utils.nix
View file

@ -26,9 +26,9 @@ rec {
vimport = path: name: import (path + "/${name}"); vimport = path: name: import (path + "/${name}");
reqImport = { reqImport =
dir, { dir
_import ? base: vimport dir (base + ".nix") , _import ? base: vimport dir (base + ".nix")
}: }:
mapFilterAttrs mapFilterAttrs
(_: v: v != null) (_: v: v != null)

3
profiles/develop/zsh/default.nix
View file

@ -89,8 +89,7 @@ in
( (
[ [
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin" "${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
] ++ ] ++ source
source
); );