Revert "rm -fr vm; add hm to checks"

This reverts commit dd5cde36a6.
This commit is contained in:
Motiejus Jakštys 2024-02-04 15:31:33 +02:00
parent 3e4e043cd1
commit c86f3b00a9
2 changed files with 62 additions and 2 deletions

View File

@ -106,12 +106,23 @@
]; ];
in in
{ {
#nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux";
# modules = [
# ./hosts/vm/configuration.nix
# ./modules
# ];
# specialArgs = {inherit myData;} // inputs;
#};
nixosConfigurations = { nixosConfigurations = {
vno1-oh2 = nixpkgs.lib.nixosSystem rec { vno1-oh2 = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
./hosts/vno1-oh2/configuration.nix ./hosts/vno1-oh2/configuration.nix
./modules ./modules
agenix.nixosModules.default agenix.nixosModules.default
@ -146,6 +157,7 @@
modules = [ modules = [
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
./hosts/fwminex/configuration.nix ./hosts/fwminex/configuration.nix
./modules ./modules
./modules/profiles/desktop ./modules/profiles/desktop
@ -172,6 +184,7 @@
modules = [ modules = [
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
./hosts/vno3-rp3b/configuration.nix ./hosts/vno3-rp3b/configuration.nix
./modules ./modules
agenix.nixosModules.default agenix.nixosModules.default
@ -272,8 +285,9 @@
builtins.mapAttrs ( builtins.mapAttrs (
system: deployLib: system: deployLib:
deployLib.deployChecks self.deploy deployLib.deployChecks self.deploy
#// self.homeConfigurations.${system}.motiejusja.activationPackage
// { // {
pre-commit-check = pre-commit-hooks.lib.${system}.run { pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
src = ./.; src = ./.;
hooks = { hooks = {
alejandra.enable = true; alejandra.enable = true;
@ -281,7 +295,6 @@
statix.enable = true; statix.enable = true;
}; };
}; };
hm-module = self.homeConfigurations.${system}.motiejusja.activationPackage;
} }
) )
deploy-rs.lib; deploy-rs.lib;

View File

@ -0,0 +1,47 @@
{
pkgs,
myData,
...
}: {
mj = {
stateVersion = "23.05";
timeZone = "UTC";
base.users.passwd = {
root.initialPassword = "live";
};
};
environment = {
systemPackages = with pkgs; [
tmux
htop
];
};
services = {
nsd = {
enable = true;
interfaces = ["0.0.0.0" "::"];
zones = {
"jakstys.lt.".data = myData.jakstysLTZone;
};
};
};
networking = {
hostName = "vm";
domain = "jakstys.lt";
firewall = {
allowedTCPPorts = [53];
allowedUDPPorts = [53];
};
};
nix = {
extraOptions = ''
experimental-features = nix-command flakes
trusted-users = vm
'';
};
}