From 18e33135b2f4729286ccfaf491faa84f24fcf8f8 Mon Sep 17 00:00:00 2001
From: Sebastian Wendel <s.wendel@sourceindex.de>
Date: Mon, 27 Jun 2022 00:47:53 +0200
Subject: [PATCH] updated nix shell config

---
 .envrc     |  1 -
 Chart.lock | 11 +++++++----
 Chart.yaml | 16 +++++++++++----
 shell.nix  | 57 +++++++++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/.envrc b/.envrc
index c1d8584..3550a30 100644
--- a/.envrc
+++ b/.envrc
@@ -1,2 +1 @@
-
 use flake
diff --git a/Chart.lock b/Chart.lock
index ab7cf63..7942ca5 100644
--- a/Chart.lock
+++ b/Chart.lock
@@ -1,9 +1,12 @@
 dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 1.16.0
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.16.2
+  version: 11.6.7
 - name: meilisearch
   repository: https://meilisearch.github.io/meilisearch-kubernetes
-  version: 0.1.30
-digest: sha256:4545c43db957edf4457e6f6787ffd335b4cd8e22739d37d2f74e85318d07d9ea
-generated: "2022-06-08T16:35:52.03279555+02:00"
+  version: 0.1.35
+digest: sha256:70e320755869e63e382e3f1398f99aadba81d9bd538fe04092f24fb64eea984e
+generated: "2022-06-22T00:09:39.352294916+02:00"
diff --git a/Chart.yaml b/Chart.yaml
index cee65db..778611d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,9 +1,11 @@
-name: fcos-core
+---
+name: fcoscore
 description: Fab City OS Core Chart using Kubernetes Helm
 version: 0.0.1
 type: application
 appVersion: 0.1.0-beta.280
 home: https://gitlab.fabcity.hamburg/software/fabcity-os-core-chart
+icon: https://www.fabcity.hamburg/wp-content/uploads/2021/04/cropped-Fab_City_Hamburg@4x-192x192.png
 sources:
   - https://github.com/dyne/reflow-os
   - https://www.interfacerproject.eu/
@@ -23,11 +25,17 @@ apiVersion: v2
 annotations:
   category: ERP
 dependencies:
-  - name: postgresql
+  - name: common
     repository: https://charts.bitnami.com/bitnami
-    version: 10.x.x
+    tags:
+      - bitnami-common
+    version: 1.x.x
+  - condition: postgresql.enabled
+    name: postgresql
+    repository: https://charts.bitnami.com/bitnami
+    version: 11.x.x
   - name: meilisearch
-    version: 0.1.30
+    version: 0.1.35
     repository: https://meilisearch.github.io/meilisearch-kubernetes
     tags:
       - meilisearch
diff --git a/shell.nix b/shell.nix
index c69cb24..750dde5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,39 +2,77 @@
 
 with pkgs; mkShell {
 
-  name = "fcos-core-chart";
+  name = "fcoscore-chart";
   nativeBuildInputs = with pkgs; [
     # tooling
     libcap
     typos
+    grpcurl
+    httpie
+    jq
 
-    # development
+    pre-commit
+    python310Packages.pip
+
+    bazel_5
     git
     git-lfs
     gitlint
-    pre-commit
-    vscodium
+    gnumake
 
-    # markup
+    go
+    go-outline
+    go-tools
+    gocode
+    gocode-gomod
+    delve
+
+    godef
+    golangci-lint
+    gopkgs
+    gopls
+    ansible-lint
+    dotenv-linter
+    editorconfig-checker
+
+    hadolint
+    mdl
+    mdsh
+    pre-commit
+    shellcheck
+    shfmt
     yaml-language-server
     yamllint
 
-    # nix
     rnix-lsp
     nix-build-uncached
     nix-linter
     nixpkgs-fmt
 
-    # container
     docker
-
-    # k8sm
     k9s
     kube3d
     kubectl
     kubectx
     kubernetes-helm
     kustomize
+    kubebuilder
+    kubeval
+    kubeval-schema
+    kubeconform
+    chart-testing
+    skaffold
+    dgoss
+    goss
+    grype
+    trivy
+    yamale
+    chart-testing
+    ansible
+    glab
+    vscodium-fhs
+
+    # vscodium.fhsWithPackages (pkgs: with pkgs; [] )
   ];
 
   postInstall = ''
@@ -43,5 +81,6 @@ with pkgs; mkShell {
     . <(k9s completion $(basename $SHELL))
     . <(kubectl completion $(basename $SHELL))
     . <(kustomize completion $(basename $SHELL))
+    . <(golangci-lint completion $(basename $SHELL))
   '';
 }