|
100 | 100 | inherit attrs cheznix nixpkgs-follows; |
101 | 101 | }; |
102 | 102 |
|
103 | | - mkHomeConfig = id: {system, username, hostname, pkgs, ...}@attrs: |
| 103 | + mkHomeConfig = id: { system, username, hostname, pkgs, ... }@attrs: |
104 | 104 | mkConfigWithAliases id attrs { |
105 | 105 | name = "${username}@${hostname}"; |
106 | 106 | value = pkgs.home-manager.flake.lib.homeManagerConfiguration { |
|
114 | 114 | }; |
115 | 115 | }; |
116 | 116 |
|
117 | | - mkSystemConfig = id: {pkgs, ...}@attrs: |
| 117 | + mkSystemConfig = id: { pkgs, ... }@attrs: |
118 | 118 | mkConfigWithAliases id attrs { |
119 | 119 | name = "${attrs.hostname}"; |
120 | 120 | value = system-manager.lib.makeSystemConfig { |
|
128 | 128 | }; |
129 | 129 | }; |
130 | 130 |
|
131 | | - mkDarwinConfig = id: {hostname, pkgs, ...}@attrs: |
| 131 | + mkDarwinConfig = id: { hostname, pkgs, ... }@attrs: |
132 | 132 | mkConfigWithAliases id attrs { |
133 | 133 | name = "${hostname}"; |
134 | 134 | value = nix-darwin.lib.darwinSystem { |
|
152 | 152 | systemConfigs = forMyLinux mkSystemConfig; |
153 | 153 | darwinConfigurations = forMyDarwin mkDarwinConfig; |
154 | 154 | legacyPackages = forMySystems mkSystemPkgs; |
155 | | - packages = forMySystems (system: |
| 155 | + packages = forMySystems (system: |
156 | 156 | let |
157 | 157 | pkgs = self.legacyPackages.${system}; |
158 | 158 | nixDarwinPackages = nix-darwin.packages.${system}; |
159 | 159 |
|
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 | + }; |
168 | 172 | }; |
169 | | - }; |
170 | 173 | in packages // { |
171 | 174 | default = |
172 | 175 | let |
|
0 commit comments