diff --git a/plugins/nvim-window-picker/default.nix b/plugins/nvim-window-picker/default.nix
new file mode 100644
index 0000000..7694b54
--- /dev/null
+++ b/plugins/nvim-window-picker/default.nix
@@ -0,0 +1,46 @@
+{lib, pkgs, ...}:{
+  extra = {
+    packages = [
+      (import ./package.nix { inherit lib pkgs; })
+    ];
+
+    config = /*Lua*/ ''
+      require('window-picker').setup({
+        hint = 'statusline-winbar', --alternative: 'floating-big-letter',
+        picker_config = {
+          statusline_winbar_picker = {
+            selection_display = function(char, windowid)
+              return table.concat({'%=', '=== ', char, ' ===', '%='})
+            end
+          },
+        },
+        highlights = {
+          statusline = {
+            focused = {
+              fg = '#E67e80',
+              bg = '#2e383c',
+              bold = true,
+            },
+            unfocused = {
+              fg = '#a7c080',
+              bg = '#2e383c',
+              bold = true,
+            },
+          },
+          winbar = {
+            focused = {
+              fg = '#E67e80',
+              bg = '#2e383c',
+              bold = true,
+            },
+            unfocused = {
+              fg = '#a7c080',
+              bg = '#2e383c',
+              bold = true,
+            },
+          },
+        }
+      })
+    '';
+  };
+}
diff --git a/plugins/nvim-window-picker/package.nix b/plugins/nvim-window-picker/package.nix
new file mode 100644
index 0000000..44d3ff0
--- /dev/null
+++ b/plugins/nvim-window-picker/package.nix
@@ -0,0 +1,23 @@
+{ pkgs, ...}:
+let
+  version = "v2.0.3";
+  owner = "s1n7ax";
+  repo = "nvim-window-picker";
+in
+pkgs.vimUtils.buildVimPlugin {
+  name = "nvim-window-picker";
+  inherit version;
+  
+  # NOTE: for my work PC, fetchFromGithub fails, due to an SSL error
+  src = builtins.fetchTarball {
+    url = "http://github.com/${owner}/${repo}/archive/${version}.tar.gz";
+    sha256 = "sha256:1bcjsx5qgvj1gi6zdi3fwc44x7afh35xbyrjik0dzl3hj6ds960g";
+  };
+
+  # src = pkgs.fetchFromGitHub {
+  #   owner = "s1n7ax";
+  #   repo = "nvim-window-picker";
+  #   rev = version;
+  #   hash = "sha256:1bcjsx5qgvj1gi6zdi3fwc44x7afh35xbyrjik0dzl3hj6ds960g";
+  # }
+}
diff --git a/plugins/zoxide.vim/package.nix b/plugins/zoxide.vim/package.nix
index 08767da..eb2f05d 100644
--- a/plugins/zoxide.vim/package.nix
+++ b/plugins/zoxide.vim/package.nix
@@ -8,6 +8,7 @@ pkgs.vimUtils.buildVimPlugin {
   name = "zoxide.vim";
   inherit version;
   
+  # NOTE: for my work PC, fetchFromGithub fails, due to an SSL error
   src = builtins.fetchTarball {
     url = "http://github.com/${owner}/${repo}/archive/${version}.tar.gz";
     sha256 = "sha256:025rqfs0n2ryi7xwzpq5h2r7jhvxbrb2gjp6fqa072hapgqr0igb";