Fix docker/kubernetes secret management

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/user/console/docker/default.nix

@@ -1,6 +1,7 @@
 {
   user ? throw "user argument is required",
   home ? throw "home argument is required",
+  rootless ? true,
 }:
 {
   config,
@@ -8,45 +9,49 @@
   pkgs,
   ...
 }:
-{
+lib.mkMerge (
-  virtualisation.docker.rootless = {
+  [
-    enable = true;
+    {
-    setSocketVariable = true;
+      virtualisation.docker.rootless = {
-    enableOnBoot = false;
+        enable = rootless;
-    storageDriver = "btrfs";
+        setSocketVariable = true;
+        enableOnBoot = false;
+        storageDriver = "btrfs";
 
-    daemon.settings = {
+        daemon.settings = {
-      experimental = true;
+          experimental = true;
-      ipv6 = true;
+          ipv6 = true;
-      fixed-cidr-v6 = "fd00::/80";
+          fixed-cidr-v6 = "fd00::/80";
+        };
+
+        autoPrune = {
+          enable = true;
+          flags = [ "--all" ];
+        };
+      };
+
+      home-manager.users.${user}.home = {
+        packages = with pkgs; [ docker-compose ];
+
+        sessionVariables = {
+          DOCKER_CONFIG = "${home}/.config/docker";
+        };
+      };
+    }
+  ]
+  ++ (lib.lists.optional rootless {
+    environment.persistence."/persist"."${home}/.local/share/docker" = { };
+
+    systemd.user = {
+      services.docker.after = [
+        config.environment.persistence."/persist"."${home}/.local/share/docker".mount
+      ];
+      sockets.docker.after = [
+        config.environment.persistence."/persist"."${home}/.local/share/docker".mount
+      ];
     };
-
+  })
-    autoPrune = {
+  ++ (lib.lists.optional (!rootless) {
-      enable = true;
+    users.users.${user}.extraGroups = [ "docker" ];
-      flags = [ "--all" ];
+  })
-    };
+)
-  };
-
-  home-manager.users.${user}.home = {
-    packages = with pkgs; [ docker-compose ];
-
-    sessionVariables = {
-      DOCKER_CONFIG = "${home}/.config/docker";
-    };
-  };
-}
-// lib.mkIf config.virtualisation.docker.rootless.enable {
-  environment.persistence."/persist"."${home}/.local/share/docker" = { };
-
-  systemd.user = {
-    services.docker.after = [
-      config.environment.persistence."/persist"."${home}/.local/share/docker".mount
-    ];
-    sockets.docker.after = [
-      config.environment.persistence."/persist"."${home}/.local/share/docker".mount
-    ];
-  };
-}
-// lib.mkIf (!config.virtualisation.docker.rootless.enable) {
-  users.users.${user}.extraGroups = [ "docker" ];
-}

hosts/common/configs/user/console/kubernetes/default.nix

@@ -12,12 +12,16 @@
     })
   ];
 
-  environment.persistence."/cache"."${home}/.kube/cache" = { };
+  environment.persistence = {
+    "/persist"."${home}/.kube" = { };
+    "/cache"."${home}/.kube/cache" = { };
+  };
 
   home-manager.users.${user} = {
     home.packages = with pkgs; [
       kubectl
       kubernetes-helm
+      kustomize
       kind
     ];
 

hosts/common/configs/user/console/zsh/default.nix

@@ -4,10 +4,7 @@
 }:
 { config, pkgs, ... }:
 {
-  environment = {
+  environment.persistence."/persist"."${home}/.local/share/zsh" = { };
-    sessionVariables.ZDOTDIR = "$HOME/.config/zsh";
-    persistence."/persist"."${home}/.local/share/zsh" = { };
-  };
 
   home-manager.users.${user} = {
     imports = [ ./options.nix ];
@@ -36,6 +33,9 @@
       '';
     };
 
-    home.file.".zshenv".enable = false;
+    home = {
+      file.".zshenv".enable = false;
+      sessionVariables.ZDOTDIR = "${home}/.config/zsh";
+    };
   };
 }

hosts/elara/users/nikara/configs/console/docker/default.nix

@@ -4,9 +4,7 @@
 }:
 { lib, ... }:
 {
-  virtualisation.docker.rootless.enable = lib.mkForce false;
+  home-manager.users.${user}.sops.secrets = {
-
-  sops.secrets = {
     "docker" = {
       sopsFile = ../../../../../../../secrets/sas/secrets.yaml;
       path = "${home}/.config/docker/config.json";

hosts/elara/users/nikara/configs/console/kubernetes/default.nix

@@ -14,30 +14,8 @@
     })
   ];
 
-  environment.persistence."/persist"."${home}/.kube" = { };
+  home-manager.users.${user}.home.packages = with pkgs; [
-
+    telepresence
-  home-manager.users.${user} = {
+    kubeval
-    home.packages = with pkgs; [
+  ];
-      telepresence
-      kubeval
-      kustomize
-    ];
-
-    sops.secrets = {
-      "kubeconfig/d90270" = {
-        sopsFile = ../../../../../../../secrets/sas/secrets.yaml;
-        path = "${home}/.kube/d90270";
-      };
-
-      "kubeconfig/d90271" = {
-        sopsFile = ../../../../../../../secrets/sas/secrets.yaml;
-        path = "${home}/.kube/d90271";
-      };
-
-      "kubeconfig/d90272" = {
-        sopsFile = ../../../../../../../secrets/sas/secrets.yaml;
-        path = "${home}/.kube/d90272";
-      };
-    };
-  };
 }

hosts/elara/users/nikara/default.nix

@@ -11,7 +11,10 @@ in
     (import ../../../common/configs/user/console/bashmount { inherit user home; })
     (import ../../../common/configs/user/console/brightnessctl { inherit user home; })
     (import ../../../common/configs/user/console/btop { inherit user home; })
-    (import ../../../common/configs/user/console/docker { inherit user home; })
+    (import ../../../common/configs/user/console/docker {
+      inherit user home;
+      rootless = false;
+    })
     (import ../../../common/configs/user/console/fastfetch { inherit user home; })
     (import ../../../common/configs/user/console/git { inherit user home; })
     (import ../../../common/configs/user/console/gpg-agent { inherit user home; })