Skip to content

Commit b023f27

Browse files
committed
chore(fmt): nixpkgs-fmt w/ a few tweaks
1 parent d9833fc commit b023f27

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

flake.nix

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
inherit attrs cheznix nixpkgs-follows;
101101
};
102102

103-
mkHomeConfig = id: {system, username, hostname, pkgs, ...}@attrs:
103+
mkHomeConfig = id: { system, username, hostname, pkgs, ... }@attrs:
104104
mkConfigWithAliases id attrs {
105105
name = "${username}@${hostname}";
106106
value = pkgs.home-manager.flake.lib.homeManagerConfiguration {
@@ -114,7 +114,7 @@
114114
};
115115
};
116116

117-
mkSystemConfig = id: {pkgs, ...}@attrs:
117+
mkSystemConfig = id: { pkgs, ... }@attrs:
118118
mkConfigWithAliases id attrs {
119119
name = "${attrs.hostname}";
120120
value = system-manager.lib.makeSystemConfig {
@@ -128,7 +128,7 @@
128128
};
129129
};
130130

131-
mkDarwinConfig = id: {hostname, pkgs, ...}@attrs:
131+
mkDarwinConfig = id: { hostname, pkgs, ... }@attrs:
132132
mkConfigWithAliases id attrs {
133133
name = "${hostname}";
134134
value = nix-darwin.lib.darwinSystem {
@@ -152,21 +152,24 @@
152152
systemConfigs = forMyLinux mkSystemConfig;
153153
darwinConfigurations = forMyDarwin mkDarwinConfig;
154154
legacyPackages = forMySystems mkSystemPkgs;
155-
packages = forMySystems (system:
155+
packages = forMySystems (system:
156156
let
157157
pkgs = self.legacyPackages.${system};
158158
nixDarwinPackages = nix-darwin.packages.${system};
159159

160-
packages = lib.optionalAttrs (nixDarwinPackages ? darwin-rebuild) {
161-
darwin-rebuild = nixDarwinPackages.darwin-rebuild // {
162-
flake = nix-darwin;
163-
packages = nixDarwinPackages;
164-
};
165-
} // rec {
166-
home-manager = pkgs.home-manager // {
167-
packages = home-manager.flake.packages.${system};
160+
packages =
161+
lib.optionalAttrs (nixDarwinPackages ? darwin-rebuild)
162+
{
163+
darwin-rebuild = nixDarwinPackages.darwin-rebuild // {
164+
flake = nix-darwin;
165+
packages = nixDarwinPackages;
166+
};
167+
}
168+
// rec {
169+
home-manager = pkgs.home-manager // {
170+
packages = home-manager.flake.packages.${system};
171+
};
168172
};
169-
};
170173
in packages // {
171174
default =
172175
let

0 commit comments

Comments
 (0)