From 36bec51e58c092a7bacb26ce4a0105f1470805bc Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Fri, 13 Oct 2023 15:34:18 +0000 Subject: fixup --- flake.nix | 1 + profiles/core/configuration.nix | 2 ++ profiles/station/k8s.nix | 7 +++++++ profiles/station/packages.nix | 5 ----- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 profiles/station/k8s.nix diff --git a/flake.nix b/flake.nix index 4d08bf8..6c9cd09 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ (import ./overlays/vimPlugins.nix {inherit pkgs;}) ])]; }) + ./profiles/station/k8s.nix ] ++ (attrValues (attrsets.mergeAttrsList (map modulesIn [ ./profiles/core diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index 545d7fa..55ce7cb 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -23,6 +23,8 @@ vim wget git + jq + yq-go curl pinentry-curses gnused diff --git a/profiles/station/k8s.nix b/profiles/station/k8s.nix new file mode 100644 index 0000000..bc2b8c3 --- /dev/null +++ b/profiles/station/k8s.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + kubernetes-helm + kubectl + kind + ]; +} diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix index 2912f22..deea797 100644 --- a/profiles/station/packages.nix +++ b/profiles/station/packages.nix @@ -6,9 +6,6 @@ }: let core-packages = with pkgs; [ - kubernetes-helm - kubectl - kind krew dasel initool @@ -23,8 +20,6 @@ calcurse profanity file - jq - yq-go lf ueberzug mypaint -- cgit v1.2.3