diff options
| -rw-r--r-- | flake.lock | 2 | ||||
| -rw-r--r-- | flake.nix | 51 |
2 files changed, 28 insertions, 25 deletions
diff --git a/flake.lock b/flake.lock index 0d68fbc..b7bf6e7 100644 --- a/flake.lock +++ b/flake.lock @@ -984,7 +984,7 @@ "flake": false, "locked": { "lastModified": 1, - "narHash": "sha256-y6J+GW+J+m7D4IZKqQpJbTouzTolxKZgifGHA+qmXLM=", + "narHash": "sha256-+N0PFsXEcGKKNf9f9bcysSVBMPnjM+C+JPL63ajpJbA=", "path": "./flake/systems.nix", "type": "path" }, diff --git a/flake.nix b/flake.nix index ce2ce0a..1ad7ecb 100644 --- a/flake.nix +++ b/flake.nix @@ -125,8 +125,10 @@ impermanence, wl-togglescreens, sops-nix, + flake-utils, ... } @ attrs: let + utils = flake-utils.lib; system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; @@ -147,36 +149,37 @@ }; } ]; - in { - nixosConfigurations = { - thinklappi = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = attrs; - modules = - [ - ./hosts/thinklappi - ] - ++ defaultModules; - }; - thinklappi-bootstrap = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = attrs; - modules = [ - ./hosts/thinklappi-bootstrap - lanzaboote.nixosModules.lanzaboote - ]; + in + { + nixosConfigurations = { + thinklappi = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = attrs; + modules = + [ + ./hosts/thinklappi + ] + ++ defaultModules; + }; + thinklappi-bootstrap = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = attrs; + modules = [ + ./hosts/thinklappi-bootstrap + lanzaboote.nixosModules.lanzaboote + ]; + }; }; - }; - devShells."${system}" = { - default = pkgs.mkShell { + } + // utils.eachDefaultSystem (system: { + devShell = pkgs.mkShell { packages = with pkgs; [ nil statix alejandra ]; }; - }; - formatter."${system}" = pkgs.alejandra; - }; + formatter = pkgs.alejandra; + }); } |