home

commit 71dfb72c1bfd9e9b858266c22c68390be632c0d4
parent 0a91b33b6449c5e692dee2f6b94ecc9ca8e62ed9
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri,  2 Nov 2018 11:30:10 +0100

profiles.containers: fix podman module

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
machines/wakasu.nix
 | 
2
+-
M
modules/profiles/containers.nix
 | 
4
++--
M
modules/programs/podman.nix
 | 
2
+-
M
overlays/sbr.nix
 | 
2
+-

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/machines/wakasu.nix b/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
diff --git a/modules/profiles/containers.nix b/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
diff --git a/modules/programs/podman.nix b/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;
       };
     };
diff --git a/overlays/sbr.nix b/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 {