From 4f1c138a012de558d48ffc7825efb5e4f9be18a2 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Mon, 22 Jan 2024 14:32:05 +0800
Subject: [PATCH] refactor: container & kubernetes

---
 home/base/desktop/cloud/default.nix                |  1 -
 home/base/desktop/container/container.nix          | 14 --------------
 home/base/desktop/container/default.nix            |  3 ---
 .../kubernetes.nix => server/container.nix}        |  7 +++++++
 home/base/server/core.nix                          |  1 -
 5 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 home/base/desktop/container/container.nix
 delete mode 100644 home/base/desktop/container/default.nix
 rename home/base/{desktop/container/kubernetes.nix => server/container.nix} (85%)

diff --git a/home/base/desktop/cloud/default.nix b/home/base/desktop/cloud/default.nix
index d516a536..ad6aa7db 100644
--- a/home/base/desktop/cloud/default.nix
+++ b/home/base/desktop/cloud/default.nix
@@ -11,7 +11,6 @@
       ssm-session-manager-plugin # Amazon SSM Session Manager Plugin
       aws-iam-authenticator
       eksctl
-      istioctl
 
       # aliyun
       aliyun-cli
diff --git a/home/base/desktop/container/container.nix b/home/base/desktop/container/container.nix
deleted file mode 100644
index 3a808db4..00000000
--- a/home/base/desktop/container/container.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  pkgs,
-  pkgs-unstable,
-  ...
-}: {
-  home.packages = with pkgs; [
-    skopeo
-    docker-compose
-    dive # explore docker layers
-  ];
-
-  programs = {
-  };
-}
diff --git a/home/base/desktop/container/default.nix b/home/base/desktop/container/default.nix
deleted file mode 100644
index eeb48a40..00000000
--- a/home/base/desktop/container/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{mylib, ...}: {
-  imports = mylib.scanPaths ./.;
-}
diff --git a/home/base/desktop/container/kubernetes.nix b/home/base/server/container.nix
similarity index 85%
rename from home/base/desktop/container/kubernetes.nix
rename to home/base/server/container.nix
index c41a48b3..f03b2149 100644
--- a/home/base/desktop/container/kubernetes.nix
+++ b/home/base/server/container.nix
@@ -1,10 +1,17 @@
 {
   pkgs,
+  pkgs-unstable,
   nur-ryan4yin,
   ...
 }: {
   home.packages = with pkgs; [
+    skopeo
+    docker-compose
+    dive # explore docker layers
+    lazydocker # Docker terminal UI.
+
     kubectl
+    istioctl
     kubernetes-helm
   ];
 
diff --git a/home/base/server/core.nix b/home/base/server/core.nix
index aa462a27..98513e10 100644
--- a/home/base/server/core.nix
+++ b/home/base/server/core.nix
@@ -34,7 +34,6 @@
 
     sad # CLI search and replace, with diff preview, really useful!!!
     lazygit # Git terminal UI.
-    lazydocker # Docker terminal UI.
 
     # misc
     tldr