Cleanup kubernetes, add kubectl-rook-ceph package, fix/add overlays

rodent1 · Sep 11, 2024 · b8c9219 · b8c9219
1 parent 2823016
commit b8c9219
Show file tree

Hide file tree

Showing 21 changed files with 215 additions and 208 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -42,6 +42,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Rust toolchain overlay
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+    };
+
     # sops-nix
     sops-nix = {
       url = "github:Mic92/sops-nix";

diff --git a/homes/_modules/kubernetes/default.nix b/homes/_modules/kubernetes/default.nix
@@ -1,15 +1,57 @@
-{ lib, ... }:
 {
-  imports = [
-    ./kubecm
-    ./kubecolor
-    ./kubectl
-    ./stern
-    ./talhelper
-    ./utilities
-  ];
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.modules.kubernetes;
+in
+{
   options.modules.kubernetes = {
     enable = lib.mkEnableOption "kubernetes";
   };
+
+  config = lib.mkIf cfg.enable {
+    home.packages =
+      (with pkgs; [
+        fluxcd
+        helmfile
+        krew
+        kubecm
+        kubeconform
+        kubernetes-helm
+        kubecolor
+        kubectl-rook-ceph
+        minio-client
+        talhelper
+      ])
+      ++ (with pkgs.unstable; [
+        kubectl
+        kubectl-cnpg
+        kubectl-node-shell
+        kubectl-view-secret
+        stern
+        talosctl
+      ]);
+
+    programs.fish = {
+      interactiveShellInit = ''
+        fish_add_path $HOME/.krew/bin
+        ${lib.getExe pkgs.unstable.kubecm} completion fish | source
+      '';
+
+      functions = {
+        k = {
+          description = "kubectl shorthand";
+          wraps = "kubectl";
+          body = builtins.readFile ./functions/k.fish;
+        };
+      };
+
+      shellAliases = {
+        kc = "kubecm";
+      };
+    };
+  };
 }
diff --git a/...dules/kubernetes/kubectl/functions/k.fish → homes/_modules/kubernetes/functions/k.fish b/...dules/kubernetes/kubectl/functions/k.fish → homes/_modules/kubernetes/functions/k.fish
diff --git a/homes/_modules/kubernetes/krewfile/default.nix b/homes/_modules/kubernetes/krewfile/default.nix
diff --git a/homes/_modules/kubernetes/kubecm/default.nix b/homes/_modules/kubernetes/kubecm/default.nix
diff --git a/homes/_modules/kubernetes/kubecolor/default.nix b/homes/_modules/kubernetes/kubecolor/default.nix
diff --git a/homes/_modules/kubernetes/kubectl/default.nix b/homes/_modules/kubernetes/kubectl/default.nix
diff --git a/homes/_modules/kubernetes/stern/default.nix b/homes/_modules/kubernetes/stern/default.nix
diff --git a/homes/_modules/kubernetes/talhelper/default.nix b/homes/_modules/kubernetes/talhelper/default.nix
diff --git a/homes/_modules/kubernetes/utilities/default.nix b/homes/_modules/kubernetes/utilities/default.nix
diff --git a/homes/_modules/shell/gh/default.nix b/homes/_modules/shell/gh/default.nix
@@ -1,12 +1,12 @@
-{ pkgs, flake-packages, ... }:
+{ pkgs, ... }:
 {
 
   config = {
     programs.gh = {
       enable = true;
-      extensions = [
-        flake-packages.${pkgs.system}.gh-copilot
-        flake-packages.${pkgs.system}.gh-tidy
+      extensions = with pkgs; [
+        gh-copilot
+        gh-tidy
       ];
     };
   };

diff --git a/homes/_modules/shell/utilities/default.nix b/homes/_modules/shell/utilities/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, flake-packages, ... }:
+{ pkgs, ... }:
 {
   config = {
     home.packages = with pkgs; [
@@ -16,7 +16,6 @@
       jo
       jq
       openssl
-      flake-packages.${pkgs.system}.shcopy
       tlrc
       wget
       yq-go

diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix
@@ -28,7 +28,6 @@
               inputs.nix-index-database.hmModules.nix-index
               inputs.nixvim.homeManagerModules.nixvim
               inputs.sops-nix.homeManagerModules.sops
-              inputs.krewfile.homeManagerModules.krewfile
             ];
             extraSpecialArgs = {
               inherit inputs hostname flake-packages;
@@ -74,7 +73,6 @@
               inputs.nix-index-database.hmModules.nix-index
               inputs.nixvim.homeManagerModules.nixvim
               inputs.sops-nix.homeManagerModules.sops
-              inputs.krewfile.homeManagerModules.krewfile
             ];
             extraSpecialArgs = {
               inherit inputs hostname flake-packages;
@@ -120,7 +118,6 @@
               inputs.nix-index-database.hmModules.nix-index
               inputs.nixvim.homeManagerModules.nixvim
               inputs.sops-nix.homeManagerModules.sops
-              inputs.krewfile.homeManagerModules.krewfile
             ];
             extraSpecialArgs = {
               inherit inputs hostname flake-packages;