diff --git a/hosts/common/configs/system/kubernetes/default.nix b/hosts/common/configs/system/kubernetes/default.nix new file mode 100644 index 0000000..daabd08 --- /dev/null +++ b/hosts/common/configs/system/kubernetes/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + kubectl + kubernetes-helm + kind + ]; +} diff --git a/hosts/common/configs/user/console/docker/default.nix b/hosts/common/configs/user/console/docker/default.nix index 6ad7460..5f5f110 100644 --- a/hosts/common/configs/user/console/docker/default.nix +++ b/hosts/common/configs/user/console/docker/default.nix @@ -4,8 +4,7 @@ }: { config, - inputs, - utils, + lib, pkgs, ... }: @@ -28,6 +27,9 @@ }; }; + home-manager.users.${user}.home.packages = with pkgs; [ docker-compose ]; +} +// lib.mkIf config.virtualisation.docker.rootless.enable { environment.persistence."/persist"."${home}/.local/share/docker" = { }; systemd.user = { @@ -38,6 +40,7 @@ config.environment.persistence."/persist"."${home}/.local/share/docker".mount ]; }; - - home-manager.users.${user}.home.packages = with pkgs; [ docker-compose ]; +} +// lib.mkIf (!config.virtualisation.docker.rootless.enable) { + users.users.${user}.extraGroups = [ "docker" ]; } diff --git a/hosts/common/configs/user/console/kubernetes/default.nix b/hosts/common/configs/user/console/kubernetes/default.nix index 89f1ea5..0f7d2a4 100644 --- a/hosts/common/configs/user/console/kubernetes/default.nix +++ b/hosts/common/configs/user/console/kubernetes/default.nix @@ -6,8 +6,9 @@ { home-manager.users.${user} = { home.packages = with pkgs; [ - kubernetes-helm kubectl + kubernetes-helm + kind ]; programs.zsh.p10k.extraRightPromptElements = [ "kubecontext" ]; diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix index 07acf61..5ec7d88 100644 --- a/hosts/elara/default.nix +++ b/hosts/elara/default.nix @@ -24,6 +24,7 @@ ../common/configs/system/git ../common/configs/system/gpg-agent ../common/configs/system/impermanence + ../common/configs/system/kubernetes ../common/configs/system/lsof ../common/configs/system/ncdu ../common/configs/system/neovim diff --git a/hosts/elara/users/nikara/configs/console/docker/default.nix b/hosts/elara/users/nikara/configs/console/docker/default.nix new file mode 100644 index 0000000..902018e --- /dev/null +++ b/hosts/elara/users/nikara/configs/console/docker/default.nix @@ -0,0 +1,8 @@ +{ + user ? throw "user argument is required", + home ? throw "home argument is required", +}: +{ lib, ... }: +{ + virtualisation.docker.rootless.enable = lib.mkForce false; +} diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index edce378..0c9ca16 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/hosts/elara/users/nikara/default.nix @@ -67,6 +67,7 @@ in (import ../../../common/configs/user/gui/x11 { inherit user home; }) (import ../../../common/configs/user/gui/xdg { inherit user home; }) + (import ./configs/console/docker { inherit user home; }) (import ./configs/console/git { inherit user home; }) (import ./configs/console/go { inherit user home; }) (import ./configs/console/java { inherit user home; })