Commit 71dfb72c1bfd

Vincent Demeester <vincent@sbr.pm>
2018-11-02 11:30:10
profiles.containers: fix podman module
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 0a91b33
Changed files (4)
machines
modules
overlays
machines/wakasu.nix
@@ -17,7 +17,6 @@
   profiles.containers = {
     enable = true;
     docker = true;
-    podman = true;
     kubernetes = { enable = true; minikube.enable = true; };
     openshift = { enable = true; package = pkgs.openshift-edge; minishift.enable = true; };
   };
@@ -25,6 +24,7 @@
   programs = {
     vscode.enable = true;
     google-chrome.enable = true;
+    podman.enable = true;
   };
   home.packages = with pkgs; [
     obs-studio
modules/profiles/containers.nix
@@ -13,7 +13,7 @@ in
         type = types.bool;
       };
       podman = mkOption {
-        default = podman;
+        default = true;
         description = "Enable podman tools";
         type = types.bool;
       };
@@ -25,7 +25,7 @@ in
     };
     config = mkIf cfg.enable {
       profiles.docker.enable = cfg.docker;
-      profiles.podman.enalbe = cfg.podman || !cfg.docker;
+      programs.podman.enable = cfg.podman;
       home.packages = with pkgs; [
         go-containerregistry
         skopeo
modules/programs/podman.nix
@@ -9,7 +9,7 @@ in
     programs.podman = {
       enable = mkOption {
         default = false;
-        description = "Enable VS Code profile";
+        description = "Enable podman profile";
         type = types.bool;
       };
     };
overlays/sbr.nix
@@ -39,7 +39,7 @@ self: super:
   s2i= import ../pkgs/s2i {
     inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  slirp4netns = import ./pkgs/slirp4netns {
+  slirp4netns = import ../pkgs/slirp4netns {
     inherit (self) stdenv lib fetchFromGitHub automake autoconf gcc;
   };
   skaffold = import ../pkgs/skaffold {