Skip to content

Commit

Permalink
feat: podman -> orbstack
Browse files Browse the repository at this point in the history
  • Loading branch information
nekowinston committed Aug 26, 2024
1 parent 6b77e12 commit ded6d60
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
7 changes: 4 additions & 3 deletions home/apps/cli.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
srcs = pkgs.callPackage ../../_sources/generated.nix { };
inherit (pkgs.stdenv) isLinux;
in
{
home = {
Expand All @@ -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";
};
};

Expand Down
1 change: 1 addition & 0 deletions machines/sashimi/brew.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ in
"macfuse"
"mullvad-browser"
"mullvadvpn"
"orbstack"
"orion"
"rustdesk"
"signal"
Expand Down
11 changes: 0 additions & 11 deletions machines/sashimi/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{ pkgs, ... }:
{
imports = [ ./brew.nix ];

Expand All @@ -11,14 +10,4 @@
latitude = 48.210033;
longitude = 16.363449;
};

environment = {
systemPackages = with pkgs; [
podman
podman-compose
podman-tui
qemu
];
pathsToLink = [ "/share/qemu" ];
};
}
12 changes: 12 additions & 0 deletions machines/sashimi/podman.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{ pkgs, ... }:
{
environment = {
systemPackages = with pkgs; [
podman
podman-compose
podman-tui
qemu
];
pathsToLink = [ "/share/qemu" ];
};
}

0 comments on commit ded6d60

Please sign in to comment.