From a027cdd28224f19f7f0c7867806a8c6a7632e9ff Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 10 Jul 2024 13:06:28 -0500 Subject: [PATCH] add oizys to iso image --- hosts/algiz/system.nix | 2 +- lib/generators.nix | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hosts/algiz/system.nix b/hosts/algiz/system.nix index 0d2496a..6e32393 100644 --- a/hosts/algiz/system.nix +++ b/hosts/algiz/system.nix @@ -3,7 +3,7 @@ services.resolved = enabled; services.fail2ban = { - package = pkgs.callPackage ../../pkgs/fail2ban {}; + package = pkgs.callPackage ../../pkgs/fail2ban { }; enable = true; maxretry = 5; bantime = "24h"; diff --git a/lib/generators.nix b/lib/generators.nix index 64a72ee..10e879e 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -22,10 +22,15 @@ let self.nixosModules.nix self.nixosModules.essentials ( - { pkgs, modulesPath, ... }: + { + self, + pkgs, + modulesPath, + ... + }: { imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ]; - environment.systemPackages = with pkgs; [ neovim ]; + environment.systemPackages = (with pkgs; [ neovim ]) ++ [ self.packages.${pkgs.system}.default ]; } ) ]; @@ -38,6 +43,7 @@ let ; }; }; + mkSystem = hostName: nixosSystem {