fix alias for ukctx

2 files changed, 12 insertions, 8 deletions

diff --git a/nix/users/fcuny/k8s.nix b/nix/users/fcuny/k8s.nix
index 5461142..88a7350 100644
--- a/nix/users/fcuny/k8s.nix
+++ b/nix/users/fcuny/k8s.nix
@@ -25,10 +25,14 @@
   };
 
   programs.fish = {
+    shellAbbrs = {
+      k = "kubectl";
+      kctx = "kubie ctx";
+      klogs = "kubectl logs";
+    };
     shellAliases = {
-      ukctx = ''
-        GH_HOST=github.rbx.com ${pkgs.gh}/bin/gh api "repos/Roblox/cell-lifecycle/contents/rks/kubeconfig" --jq '.content' | base64 -d > ~/.kube/rksconfig
-      '';
+      ukctx =
+        "${pkgs.gh}/bin/gh api --hostname github.rbx.com repos/Roblox/cell-lifecycle/contents/rks/kubeconfig --jq '.content' | base64 -d > ~/.kube/rksconfig";
     };
   };
 }
diff --git a/nix/users/fcuny/shell.nix b/nix/users/fcuny/shell.nix
index cdc393d..399a1df 100644
--- a/nix/users/fcuny/shell.nix
+++ b/nix/users/fcuny/shell.nix
@@ -30,6 +30,7 @@ in {
       aspellDicts.en-science
     ] ++ (lib.optionals (isLinux) [ htop ]);
 
+  # https://github.com/nix-community/home-manager/blob/master/modules/programs/fish.nix
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
@@ -44,15 +45,15 @@ in {
 
       set fish_greeting ""
     '';
-    shellAbbrs = { ncg = "nix-collect-garbage -d"; };
-    shellAliases = {
+    shellAbbrs = {
+      ncg = "nix-collect-garbage -d";
       c = "clear";
+    };
+    shellAliases = {
       ls = "eza -l -L=1 --git --color=always --group-directories-first";
       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";
     };
   };
 
@@ -80,7 +81,6 @@ in {
     enable = true;
     nix-direnv.enable = true;
     enableZshIntegration = true;
-    enableFishIntegration = true;
     config = {
       global.disable_stdin = true;
       global.strict_env = true;