From a4d8132843c1570ba7cff53f27e5879cf429e281 Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 1 May 2024 20:59:54 +0200 Subject: [PATCH] feat: move darwin podman to brew --- machines/common/linux/default.nix | 1 + machines/common/linux/podman.nix | 9 +++++++++ machines/common/shared/default.nix | 1 - machines/common/shared/podman.nix | 26 -------------------------- machines/sashimi/brew.nix | 4 ++++ 5 files changed, 14 insertions(+), 27 deletions(-) create mode 100644 machines/common/linux/podman.nix delete mode 100644 machines/common/shared/podman.nix diff --git a/machines/common/linux/default.nix b/machines/common/linux/default.nix index 18e468a..6c0f1f8 100644 --- a/machines/common/linux/default.nix +++ b/machines/common/linux/default.nix @@ -5,6 +5,7 @@ ./greeter.nix ./input.nix ./network.nix + ./podman.nix ./sound.nix ./sway.nix ]; diff --git a/machines/common/linux/podman.nix b/machines/common/linux/podman.nix new file mode 100644 index 0000000..59790c1 --- /dev/null +++ b/machines/common/linux/podman.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + virtualisation.podman = { + enable = true; + extraPackages = with pkgs; [ + podman-compose + podman-tui + ]; + }; +} diff --git a/machines/common/shared/default.nix b/machines/common/shared/default.nix index 590c11c..3b3a200 100644 --- a/machines/common/shared/default.nix +++ b/machines/common/shared/default.nix @@ -1,7 +1,6 @@ { imports = [ ./nix.nix - ./podman.nix ./user.nix ]; } diff --git a/machines/common/shared/podman.nix b/machines/common/shared/podman.nix deleted file mode 100644 index 96e41bf..0000000 --- a/machines/common/shared/podman.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - pkgs, - ... -}: let - inherit (lib) mkIf; - inherit (pkgs.stdenv) isDarwin isLinux; -in { - environment = mkIf isDarwin { - systemPackages = with pkgs; [ - podman - podman-compose - podman-tui - qemu - ]; - pathsToLink = ["/share/qemu"]; - }; - - virtualisation.podman = mkIf isLinux { - enable = true; - extraPackages = with pkgs; [ - podman-compose - podman-tui - ]; - }; -} diff --git a/machines/sashimi/brew.nix b/machines/sashimi/brew.nix index 1cfc1ff..62da578 100644 --- a/machines/sashimi/brew.nix +++ b/machines/sashimi/brew.nix @@ -14,6 +14,10 @@ in { homebrew = { enable = true; caskArgs.require_sha = true; + brews = [ + "podman" + "podman-compose" + ]; casks = [ "1password" (skipSha "affinity-designer")