small changes

This commit is contained in:
Wyatt J. Miller 2024-12-15 22:37:43 -05:00
parent adabefd821
commit ea8607eb41
5 changed files with 21 additions and 35 deletions

View File

@ -3,9 +3,7 @@
pkgs, pkgs,
userName, userName,
... ...
}: let }: {
timeZone = null;
in {
imports = [ imports = [
../../apps/flatpak.nix ../../apps/flatpak.nix
../../pwrMgmt ../../pwrMgmt
@ -27,7 +25,7 @@ in {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
# Set your timezone # Set your timezone
time.timeZone = timeZone ? "America/Detroit"; time.timeZone = "America/Detroit";
# Enable touchpad # Enable touchpad
services.libinput.enable = true; services.libinput.enable = true;

View File

@ -1,6 +0,0 @@
{...}: {
imports = [
./configuration.nix
./hardware-configuration.nix
];
}

View File

@ -171,7 +171,6 @@
enable = true; enable = true;
dockerCompat = false; dockerCompat = false;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
podman-tui
docker-credential-helpers docker-credential-helpers
cosign cosign
crane crane

View File

@ -1,6 +0,0 @@
{...}: {
imports = [
./apps.nix
./configuration.nix
];
}

View File

@ -18,22 +18,23 @@ in {
}; };
}; };
config = lib.mkIf cfg.podman.enable { config = lib.mkIf cfg.enable (lib.attrsets.optionalAttrs (config.nixpkgs.hostPlatform.isLinux) {
virtualisation.podman = { virtualisation.podman = {
enable = true; enable = true;
dockerCompat = cfg.podman.dockerCompat; dockerCompat = cfg.dockerCompat;
enableOnBoot = true; enableOnBoot = true;
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
}
environment.systemPackages = // {
[ environment.systemPackages =
pkgs.podman-compose [
pkgs.buildah pkgs.podman-compose
pkgs.skopeo pkgs.buildah
pkgs.dive pkgs.skopeo
pkgs.container-diff pkgs.dive
] pkgs.container-diff
++ cfg.podman.extraPackages; ]
}; ++ cfg.extraPackages;
});
} }