From 1676fad5fe49f661b13bced7fd09101e70fc684e Mon Sep 17 00:00:00 2001 From: iFargle Date: Wed, 13 Dec 2023 14:30:17 +0900 Subject: [PATCH] Add compose2nix --- flake.nix | 3 +++ nixos/hosts/framework-server/docker.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2f084b9b..b6b23f26 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,9 @@ # deploy-rs, declarative NixOS deployments deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; + # compose2nix - Convert docker-compose.yml files to nix syntax + compose2nix.url = "github:aksiksi/compose2nix"; + compose2nix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, ... } @inputs: let diff --git a/nixos/hosts/framework-server/docker.nix b/nixos/hosts/framework-server/docker.nix index a9f2b1e4..42b45fbb 100644 --- a/nixos/hosts/framework-server/docker.nix +++ b/nixos/hosts/framework-server/docker.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ inputs, pkgs, ... }: { boot.kernel.sysctl = { "fs.inotify.max_user_watches" = 10485760; "fs.inotify.max_user_instances" = 1024; @@ -16,6 +16,7 @@ environment.systemPackages = with pkgs; [ docker-compose ctop + inputs.compose2nix.packages.x86_64-linux.default ]; networking.firewall.allowedUDPPorts = [