Add knsc to clear ns

Use kubectx instead of custom function
Fix git root detection of snacks
2025-12-05 22:26:21 +00:00 · 2025-09-22 11:31:03 +02:00 · 2025-09-22 10:33:07 +02:00 · 2025-09-22 10:32:57 +02:00 · 2025-09-22 09:59:11 +02:00 · 2025-09-22 09:35:26 +02:00
6 changed files with 43 additions and 32 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -100,11 +100,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757974173,
-        "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=",
+        "lastModified": 1758108966,
+        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "302af509428169db34f268324162712d10559f74",
+        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
        "type": "github"
      },
      "original": {
@@ -164,11 +164,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758085625,
-        "narHash": "sha256-D0KVKNgWSDVjYFgPLEtSQvSKchTBT0YqSbNlH7OQ+bo=",
+        "lastModified": 1758291837,
+        "narHash": "sha256-D7G8RluVWzNlM/ZaH3vtKaXMYKcl9FgYclT5YzGq5+U=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fb928abb67bd4df99040721ed48c3b42e24b1d08",
+        "rev": "efcba687d355f4e46cb7754c385720ae454fe543",
        "type": "github"
      },
      "original": {
@@ -205,11 +205,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1758067563,
-        "narHash": "sha256-g9UMPKyBtIfCI21zdseTfe5I5P4RyjpaQXgtO1txoWM=",
+        "lastModified": 1758240313,
+        "narHash": "sha256-4RBUV0gc2kii4MTsECxSMTf+UGt6JR229JQcbL4L3zs=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "958af4628a9e463582e3cf16c963fdb510dc85f3",
+        "rev": "928308a20559523bb3898861a6f28e9589ab3a0e",
        "type": "github"
      },
      "original": {
@@ -221,11 +221,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1758047314,
-        "narHash": "sha256-HzyJpt8TsVQmF+tkZgVaubzCA8H9syQhZvwrwXj7frc=",
+        "lastModified": 1758238812,
+        "narHash": "sha256-7LJ8a/wyN8Rb0dD8d9x33GLP2CfNmAKB+DwjDO2bbk4=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "cbfa7f0d7b55c5329e6ffd36451b41b7f41b645c",
+        "rev": "c9f62674028d764f8a6faa433baa7ab209956fc8",
        "type": "github"
      },
      "original": {
@@ -241,11 +241,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757430124,
-        "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=",
+        "lastModified": 1758102940,
+        "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196",
+        "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd",
        "type": "github"
      },
      "original": {
@@ -316,11 +316,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757937573,
-        "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=",
+        "lastModified": 1758123407,
+        "narHash": "sha256-4qwMlR0Q4Zr2rjUFauYIldfjzffYt3G5tZ1uPFPPYGU=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454",
+        "rev": "ba2b3b6c0bc42442559a3b090f032bc8d501f5e3",
        "type": "github"
      },
      "original": {
@@ -347,11 +347,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1758198701,
+        "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
        "type": "github"
      },
      "original": {
@@ -399,11 +399,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756662192,
-        "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=",
+        "lastModified": 1758206697,
+        "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4",
+        "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa",
        "type": "github"
      },
      "original": {
--- a/modules/cli/zsh/default.nix
+++ b/modules/cli/zsh/default.nix
@@ -26,7 +26,6 @@
      bat = "bat -p";

      # git stuff
-      s = "git status";
      gs = "git status";
      gl = "git log";
      gu = "git pull";
@@ -49,8 +48,9 @@
      # k8s
      k = "kubectl";
      kubectl = "kubecolor";
-      kctx = "kubectl config use-context $(kubectl config get-contexts -o name | fzf --height=10)";
-      kns = "kubectl config set-context --current --namespace=$(kubectl get ns -o custom-columns=':metadata.name' --no-headers | fzf --height=10)";
+      kctx = "FZF_DEFAULT_OPTS='--height 10' kubectx";
+      kns = "kubens";
+      knsc = "kubectl config set-context --current --namespace ''";
      kg = "k get";
      kga = "kg $(k api-resources --verbs=list --namespaced -o name | paste -sd ,)";
      # use custom function to decode secrets data instead of a simple alias for kgy
@@ -357,8 +357,10 @@
      lsof
      kubectl
      kubecolor
+      kubectx
      usql
      rsync
+      moreutils
      # bitwarden-cli
    ]
    ++ lib.optionals pkgs.stdenv.isLinux [
--- a/modules/cli/zsh/init.zsh
+++ b/modules/cli/zsh/init.zsh
@@ -89,6 +89,13 @@ proxy() {
 	ssh -NR "5000:localhost:$1" zoriya@ssh.sdg.moe
 }

+s() {
+	git status 2>/dev/null
+	if [[ $? -ne 0 ]]; then
+		gfold
+	fi
+}
+
 # keep yq's output in yaml & colorizes it
 yq() {
 	# if `-r` is in the arguments, do not add the -Y flag because it breaks yq.
--- a/modules/cli/zsh/prompt.zsh
+++ b/modules/cli/zsh/prompt.zsh
@@ -1,6 +1,7 @@
 setopt promptsubst
 zmodload zsh/datetime
 zmodload zsh/mathfunc
+zmodload zsh/stat

 timer_preexec() {
 	timer=$EPOCHREALTIME
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -18,7 +18,7 @@ vim.lsp.enable({
 	"jsonls",
 	"biome",
 	"sqls",
-	"roslyn_ls"
+	-- "roslyn_ls", we use roslyn.nvim plugin instead.
 })

 vim.lsp.on_type_formatting.enable()
--- a/nvim/lua/plugins/snacks.lua
+++ b/nvim/lua/plugins/snacks.lua
@@ -6,6 +6,7 @@ local function git_show(ref)
 			{
 				cmd = "git",
 				args = { "show", "--name-status", "--pretty=tformat:", ref },
+				cwd = Snacks.git.get_root(),
 				transform = function(item)
 					item.cwd = git_root
 					item.file = string.sub(item.text, 3)
@@ -262,19 +263,19 @@ return {
 			end, { desc = "Grep" })

 			vim.keymap.set("n", "<leader>gl", function()
-				Snacks.picker.git_log()
+				Snacks.picker.git_log({cwd = Snacks.git.get_root() })
 			end, { desc = "Git log" })

 			vim.keymap.set("n", "<leader>gh", function()
-				Snacks.picker.git_log_file()
+				Snacks.picker.git_log_file({cwd = Snacks.git.get_root() })
 			end, { desc = "Git logs buffer" })

 			vim.keymap.set("n", "<leader>gB", function()
-				Snacks.picker.git_branches()
+				Snacks.picker.git_branches({cwd = Snacks.git.get_root() })
 			end, { desc = "Git branches" })

 			vim.keymap.set("n", "<leader>gs", function()
-				Snacks.picker.git_status()
+				Snacks.picker.git_status({cwd = Snacks.git.get_root() })
 			end, { desc = "Git status" })
 		end,
 	},
Author	SHA1	Message	Date
Zoe Roux	9c41fb1677	Add knsc to clear ns	2025-09-22 11:31:03 +02:00
Zoe Roux	ec9f4a73ed	Use kubectx instead of custom function	2025-09-22 10:33:07 +02:00
Zoe Roux	55ae0dfb59	Fix git root detection of snacks	2025-09-22 10:32:57 +02:00
Zoe Roux	b63074795a	Run `gfold` when `s` is not in a git repo	2025-09-22 09:59:11 +02:00
Zoe Roux	3d8f12419e	Update stuff & fix stat deps	2025-09-22 09:35:26 +02:00