From 713ac8a396886a23647ed52d3023bc4f27e1a4ee Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 26 Mar 2025 11:35:42 -0500 Subject: [PATCH] feat: podman on foxtrot, some cleanup --- flake.nix | 10 ++-------- lib/default.nix | 7 +++++++ packages/hosts/foxtrot.nix | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 5e3f869..e0166c1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,7 @@ inputs: let flakeLib = import ./lib inputs; - uGenPkgs = flakeLib.genPkgs inputs.nixpkgs-unstable; - - deployChecks = ( - builtins.mapAttrs ( - system: deployLib: deployLib.deployChecks inputs.self.deploy - ) inputs.deploy-rs.lib - ); + inherit (flakeLib) uGenPkgs; in { inherit flakeLib; @@ -21,7 +15,7 @@ templates = import ./lib/templates; diskoConfigurations = import ./lib/disko inputs; - checks = deployChecks // (uGenPkgs (import ./packages/checks inputs)); + checks = flakeLib.deployChecks // (uGenPkgs (import ./packages/checks inputs)); devShells = uGenPkgs (import ./packages/shells inputs); nixosModules = import ./lib/modules/nixos inputs; diff --git a/lib/default.nix b/lib/default.nix index 44b8ac5..a59aba7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -31,4 +31,11 @@ rec { steamdeckHost baseHost ; + + uGenPkgs = genPkgs inputs.nixpkgs-unstable; + + deployChecks = builtins.mapAttrs ( + system: deployLib: deployLib.deployChecks self.deploy + ) inputs.deploy-rs.lib; + } diff --git a/packages/hosts/foxtrot.nix b/packages/hosts/foxtrot.nix index b0c6a36..d6db416 100644 --- a/packages/hosts/foxtrot.nix +++ b/packages/hosts/foxtrot.nix @@ -73,6 +73,7 @@ networking.wifi.enable = true; lyte.desktop.enable = true; family-account.enable = true; + podman.enable = true; home-manager.users.daniel = { lyte.shell = { enable = true;