diff --git a/home/apps/cli.nix b/home/apps/cli.nix index d35d701..4fe7562 100644 --- a/home/apps/cli.nix +++ b/home/apps/cli.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let srcs = pkgs.callPackage ../../_sources/generated.nix { }; + inherit (pkgs.stdenv) isLinux; in { home = { @@ -14,8 +15,8 @@ in switch_yubikeys = ''gpg-connect-agent "scd serialno" "learn --force" "/bye"''; # podman - docker = "podman"; - docker-compose = "podman-compose"; + docker = lib.mkIf isLinux "podman"; + docker-compose = lib.mkIf isLinux "podman-compose"; }; }; diff --git a/machines/sashimi/brew.nix b/machines/sashimi/brew.nix index 3b6fa56..bd538e5 100644 --- a/machines/sashimi/brew.nix +++ b/machines/sashimi/brew.nix @@ -36,6 +36,7 @@ in "macfuse" "mullvad-browser" "mullvadvpn" + "orbstack" "orion" "rustdesk" "signal" diff --git a/machines/sashimi/default.nix b/machines/sashimi/default.nix index 315b1ed..88d6fd4 100644 --- a/machines/sashimi/default.nix +++ b/machines/sashimi/default.nix @@ -1,4 +1,3 @@ -{ pkgs, ... }: { imports = [ ./brew.nix ]; @@ -11,14 +10,4 @@ latitude = 48.210033; longitude = 16.363449; }; - - environment = { - systemPackages = with pkgs; [ - podman - podman-compose - podman-tui - qemu - ]; - pathsToLink = [ "/share/qemu" ]; - }; } diff --git a/machines/sashimi/podman.nix b/machines/sashimi/podman.nix new file mode 100644 index 0000000..a93ccfa --- /dev/null +++ b/machines/sashimi/podman.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + environment = { + systemPackages = with pkgs; [ + podman + podman-compose + podman-tui + qemu + ]; + pathsToLink = [ "/share/qemu" ]; + }; +}