commit 47b57be1529ef9ae95b669248202a6ed40ecbd5f
parent 9652c5db17b6f2e1d0386a8743018aa1c160a780
Author: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 3 Sep 2021 11:00:18 +0200
users/vincent: profiles.kubernetes* is used differently…
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/systems/hosts/naruhodo.nix b/systems/hosts/naruhodo.nix
@@ -154,9 +154,6 @@ in
docker.enable = true;
redhat.enable = true;
scanning.enable = true;
- kubernetes.enable = true;
- openshift.enable = true;
- tekton.enable = true;
};
environment.systemPackages = with pkgs; [
virtmanager
diff --git a/users/vincent/default.nix b/users/vincent/default.nix
@@ -62,6 +62,9 @@ in
[
(import ./core)
(import ./mails { hostname = config.networking.hostName; pkgs = pkgs; })
+ (import ./containers/kubernetes.nix)
+ (import ./containers/openshift.nix)
+ (import ./containers/tekton.nix)
]
++ optionals config.profiles.dev.enable [ (import ./dev) ]
++ optionals config.profiles.desktop.enable [ (import ./desktop) ]
@@ -91,9 +94,6 @@ in
home.file.".config/Yubico/u2f_keys".source = pkgs.mkSecret ../../secrets/u2f_keys;
}]
++ optionals (isContainersEnabled && config.profiles.dev.enable) [ (import ./containers) ]
- ++ optionals config.profiles.kubernetes.enable [ (import ./containers/kubernetes.nix) ]
- ++ optionals config.profiles.openshift.enable [ (import ./containers/openshift.nix) ]
- ++ optionals config.profiles.tekton.enable [ (import ./containers/tekton.nix) ]
++ optionals config.profiles.redhat.enable [{
home.file.".local/share/applications/redhat-vpn.desktop".source = ./redhat/redhat-vpn.desktop;
home.packages = with pkgs; [ gnome3.zenity oathToolkit ];