diff --git a/flake.nix b/flake.nix index bfd7292..efffbd2 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,7 @@ ]; 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; in { nixosConfigurations = { @@ -76,7 +76,8 @@ horizon = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib;}; modules = [ - home-manager.nixosModules.home-manager home-manager-config + home-manager.nixosModules.home-manager + home-manager-config ./hosts/horizon/configuration.nix nixos-hardware.nixosModules.framework-11th-gen-intel ]; @@ -85,7 +86,8 @@ twilight = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib;}; modules = [ - home-manager.nixosModules.home-manager home-manager-config + home-manager.nixosModules.home-manager + home-manager-config ./hosts/twilight/configuration.nix ]; }; @@ -94,7 +96,8 @@ specialArgs = {inherit inputs lib;}; modules = [ 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/configuration.nix ]; diff --git a/users/leyla/vscode.nix b/users/leyla/vscode.nix index ffe84b6..37fc4be 100644 --- a/users/leyla/vscode.nix +++ b/users/leyla/vscode.nix @@ -74,4 +74,4 @@ ]); }; }; -} \ No newline at end of file +} diff --git a/util/default.nix b/util/default.nix index 3d16bf3..a06ac29 100644 --- a/util/default.nix +++ b/util/default.nix @@ -1,11 +1,8 @@ -{ - lib, - ... -}: -{ +{lib, ...}: { mkUnless = condition: yes: (lib.mkIf (!condition) yes); - mkIfElse = condition: yes: no: lib.mkMerge [ - (lib.mkIf condition yes) - (lib.mkUnless condition no) - ]; + mkIfElse = condition: yes: no: + lib.mkMerge [ + (lib.mkIf condition yes) + (lib.mkUnless condition no) + ]; }