From 2a1f0398e29fb9f359d4867bb8e45880b8516e07 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 24 Sep 2024 10:23:50 +0200 Subject: [PATCH] Remove docker/podman-compose --- common/nix.nix | 2 +- common/podman.nix | 5 ----- flake.lock | 20 ++++++++++---------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/common/nix.nix b/common/nix.nix index c03e5e2..17c8f5d 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -20,7 +20,7 @@ # Workaround for https://github.com/NixOS/nix/issues/9574 nix-path = config.nix.nixPath; substituters = [ - "https://cache-nixos-org.aarn.shelman.io" + # "https://cache-nixos-org.aarn.shelman.io" "https://cache.nixos.org/" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; diff --git a/common/podman.nix b/common/podman.nix index 5997bd6..717facf 100644 --- a/common/podman.nix +++ b/common/podman.nix @@ -19,11 +19,6 @@ in fi ''; - environment.systemPackages = with pkgs; [ - docker-compose - podman-compose - ]; - virtualisation = { containers = { enable = true; diff --git a/flake.lock b/flake.lock index 91e038d..c4a8a08 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1726894861, - "narHash": "sha256-bmPOdKSvE6d3ZaFi4zt6GAfr0z1BherseiS6IRQ6oF0=", + "lastModified": 1727413615, + "narHash": "sha256-pa9GcL2RJvHLJ/mOsyNjMZZCf+vAcPATzlybGfT9KT4=", "ref": "refs/heads/main", - "rev": "c6bbdfb7bfec3d5f08eef999fa86510b01e18c07", - "revCount": 7389, + "rev": "6d70ee7e2a4230d281cf231bc38560c33b1b0336", + "revCount": 7479, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": {