greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add flake checks and hopefully fix home-assitant

Browse Source
This commit is contained in:
Greg Hellings
2024-01-22 13:34:35 -06:00
parent b22dfd6f96
commit 7d53e68a36
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+28 -16
View File
@@ -60,32 +60,44 @@
]; ];
in { in {
checks = {
x86_64-linux = {
unstable = self.nixosConfigurations.jude.config.system.build.toplevel;
stable = self.nixosConfigurations.linode.config.system.build.toplevel;
};
};
nixosConfigurations = (import ./hosts { inherit inputs overlays; }); nixosConfigurations = (import ./hosts { inherit inputs overlays; });
darwinConfigurations = (import ./darwin { inherit inputs overlays; }); darwinConfigurations = (import ./darwin { inherit inputs overlays; });
homeConfigurations = (import ./home { inherit inputs overlays; }); homeConfigurations = (import ./home { inherit inputs overlays; });
devShell = (flake-utils.lib.eachSystemMap flake-utils.lib.allSystems (system: let devShells = (flake-utils.lib.eachSystemMap flake-utils.lib.allSystems (system: let
pkgs = import nixunstable { inherit system overlays; }; pkgs = import nixunstable { inherit system overlays; };
in pkgs.mkShell { in {
buildInputs = with pkgs; [ default = pkgs.mkShell {
bashInteractive buildInputs = with pkgs; [
curl bashInteractive
git curl
gnutar git
gzip gnutar
inject gzip
tmux inject
vim tmux
xonsh vim
]; xonsh
];
};
})); }));
overlays = { default = local_overlay; }; overlays = { default = local_overlay; };
packages = (import ./overlays/packages.nix { inherit nixunstable flake-utils; }); packages = {
defaultPackage = { x86_64-linux = rec {
x86_64-linux = self.nixosConfigurations.iso-beta.config.system.build.isoImage; default = iso;
iso = self.nixosConfigurations.iso.config.system.build.isoImage;
iso-beta = self.nixosConfigurations.iso.config.system.build.isoImage;
};
}; };
}; };
} }
garnix.yaml
+3 -2
View File
@@ -1,7 +1,8 @@
builds: builds:
include: include:
- darwinConfigurations.* - darwinConfigurations.*
- devShell.x86_64-linux - devShells.x86_64-linux.default
- devShell.aarch64-linux - devShells.aarch64-linux.default
- devShells.x86_64-darwin.default
- homeConfigurations.greghellings.activationPackage - homeConfigurations.greghellings.activationPackage
- nixosConfigurations.* - nixosConfigurations.*
overlays/default.nix
+5 -1
View File
@@ -26,7 +26,7 @@ let
buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon; buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon;
is2405 = prev.lib.versionAtLeast prev.lib.version "24.05"; is2405 = prev.lib.versionAtLeast prev.lib.version "24";
in rec { in rec {
gregpy = myPython; gregpy = myPython;
@@ -40,6 +40,10 @@ in rec {
xonsh-apipenv = cp ./xonsh-apipenv.nix {}; xonsh-apipenv = cp ./xonsh-apipenv.nix {};
xonsh-direnv = cp ./xonsh-direnv.nix {}; xonsh-direnv = cp ./xonsh-direnv.nix {};
xontrib-vox = cp ./xonsh-vox.nix {}; xontrib-vox = cp ./xonsh-vox.nix {};
home-assistant-chip-core = python-prev.home-assistant-chip-core.override {
openssl_1_1 = final.openssl;
};
}) })
]; ];