fix conflict

2 files changed, 2 insertions, 40 deletions

diff --git a/nix/profiles/home-manager/work.nix b/nix/profiles/home-manager/work.nix
deleted file mode 100644
index f60c8fc..0000000
--- a/nix/profiles/home-manager/work.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ pkgs, ... }: {
-
-  home.stateVersion = "23.05";
-
-  imports = [ ./mac.nix ];
-
-  programs.git = { userEmail = "fcuny@roblox.com"; };
-
-  home.packages = with pkgs; [
-    gh # github cli tool
-    kind # k8s in docker
-
-    kubebuilder # generate controller
-    kubectl
-    kubernetes-helm # deploy applications
-    kubie # kubeconfig browser https://github.com/sbstp/kubie
-    kubelogin-oidc # OIDC plugin
-    k9s # object explorer
-
-    boundary
-    nomad-pack
-  ];
-
-  programs.fish.shellAliases = {
-    k = "kubectl";
-    kctx = "kubie ctx";
-  };
-
-  home.file.kubie = {
-    target = ".kube/kubie.yaml";
-    text = ''
-      shell: fish
-      configs:
-        include:
-          - ~/.kube/rksconfig # https://raw.github.rbx.com/Roblox/cell-lifecycle/master/rks/kubeconfig
-      prompt:
-        fish_use_rprompt: true
-    '';
-  };
-}
diff --git a/nix/users/fcuny/home-manager.nix b/nix/users/fcuny/home-manager.nix
index f18be40..adb3adc 100644
--- a/nix/users/fcuny/home-manager.nix
+++ b/nix/users/fcuny/home-manager.nix
@@ -129,6 +129,8 @@ in {
       la = "eza -la --git --color=always --group-directories-first";
       ll = "eza -la -L=1 --git --color=always --group-directories-first";
       lt = "eza -aT -L=2 --git --color=always --group-directories-first";
+      k = "kubectl";
+      kctx = "kubie ctx";
     };
   };