ran linted

This commit is contained in:
Leyla Becker 2024-10-03 22:52:53 +02:00
parent 8f4e70c0d0
commit cb1f8665e5
3 changed files with 14 additions and 14 deletions

View file

@ -68,7 +68,7 @@
]; ];
forEachPkgs = lambda: forEachSystem (system: lambda nixpkgs.legacyPackages.${system}); forEachPkgs = lambda: forEachSystem (system: lambda nixpkgs.legacyPackages.${system});
callPackage = nixpkgs.lib.callPackageWith (nixpkgs // { lib = lib; }); callPackage = nixpkgs.lib.callPackageWith (nixpkgs // {lib = lib;});
lib = callPackage ./util {} // nixpkgs.lib; lib = callPackage ./util {} // nixpkgs.lib;
in { in {
nixosConfigurations = { nixosConfigurations = {
@ -76,7 +76,8 @@
horizon = nixpkgs.lib.nixosSystem { horizon = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs lib;}; specialArgs = {inherit inputs lib;};
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager-config home-manager.nixosModules.home-manager
home-manager-config
./hosts/horizon/configuration.nix ./hosts/horizon/configuration.nix
nixos-hardware.nixosModules.framework-11th-gen-intel nixos-hardware.nixosModules.framework-11th-gen-intel
]; ];
@ -85,7 +86,8 @@
twilight = nixpkgs.lib.nixosSystem { twilight = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs lib;}; specialArgs = {inherit inputs lib;};
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager-config home-manager.nixosModules.home-manager
home-manager-config
./hosts/twilight/configuration.nix ./hosts/twilight/configuration.nix
]; ];
}; };
@ -94,7 +96,8 @@
specialArgs = {inherit inputs lib;}; specialArgs = {inherit inputs lib;};
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
home-manager.nixosModules.home-manager home-manager-config home-manager.nixosModules.home-manager
home-manager-config
./hosts/defiant/disko-config.nix ./hosts/defiant/disko-config.nix
./hosts/defiant/configuration.nix ./hosts/defiant/configuration.nix
]; ];

View file

@ -74,4 +74,4 @@
]); ]);
}; };
}; };
} }

View file

@ -1,11 +1,8 @@
{ {lib, ...}: {
lib,
...
}:
{
mkUnless = condition: yes: (lib.mkIf (!condition) yes); mkUnless = condition: yes: (lib.mkIf (!condition) yes);
mkIfElse = condition: yes: no: lib.mkMerge [ mkIfElse = condition: yes: no:
(lib.mkIf condition yes) lib.mkMerge [
(lib.mkUnless condition no) (lib.mkIf condition yes)
]; (lib.mkUnless condition no)
];
} }