fzf: popups in floating panes!
change kuszyrqwlulprmtpqvlqzssowqqnnvqx
commit e2862176f82ab89957cde2739994e0d8150f627d
author Alpha Chen <alpha@kejadlen.dev>
date
parent ompquxlx
diff --git a/.config/nvim/fnl/fzf.fnl b/.config/nvim/fnl/fzf.fnl
index 99c7330d..4074bf22 100644
--- a/.config/nvim/fnl/fzf.fnl
+++ b/.config/nvim/fnl/fzf.fnl
@@ -18,10 +18,15 @@
     (nvim-create-user-command :FzfSpell fzf-spell {})
     (vim.keymap.set :n :z= ":FzfSpell<cr>" {:noremap true})))
 
-(if (vim.fn.exists :TMUX)
-    (set vim.g.fzf_layout {:tmux "-p80%,60%"}))
+(set vim.g.fzf_layout
+     (if (vim.fn.exists :TMUX)
+         {:tmux "80%,60%"}
+         {:window {:width 0.8 :height 0.6}}))
 
-(when (vim.fn.isdirectory :/opt/homebrew/opt/fzf/plugin)
-  (vim.opt.rtp:append :/opt/homebrew/opt/fzf)
-  (init-keymaps)
-  (init-fzf-spell))
+(init-keymaps)
+(init-fzf-spell)
+
+; (when (vim.fn.isdirectory :/opt/homebrew/opt/fzf/plugin)
+;   (vim.opt.rtp:append :/opt/homebrew/opt/fzf)
+;   (init-keymaps)
+;   (init-fzf-spell))
diff --git a/.config/nvim/fnl/init.fnl b/.config/nvim/fnl/init.fnl
index c49eefaf..77fbd845 100644
--- a/.config/nvim/fnl/init.fnl
+++ b/.config/nvim/fnl/init.fnl
@@ -126,7 +126,7 @@
                "https://github.com/itchyny/lightline.vim.git"
                {:src "https://github.com/j-hui/fidget.nvim.git"
                 :version :v2.0.0}
-               "https://github.com/junegunn/fzf.git"
+               {:src "https://github.com/junegunn/fzf.git" :version :v0.74.0}
                "https://github.com/junegunn/fzf.vim.git"
                {:src "https://github.com/lukas-reineke/indent-blankline.nvim.git"
                 :version :v3.9.1}
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
index 9f6526b8..058b5c4e 100644
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -10,8 +10,9 @@
       "version": "'v2.0.0'"
     },
     "fzf": {
-      "rev": "90c4269d4e5d88ec3a04697a8714ee86a43b2474",
-      "src": "https://github.com/junegunn/fzf.git"
+      "rev": "6765f464a60e39afc20775f54f7ba40896bf1b81",
+      "src": "https://github.com/junegunn/fzf.git",
+      "version": "'v0.74.0'"
     },
     "fzf.vim": {
       "rev": "879db51",
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 55fdb95a..165e3233 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -19,7 +19,7 @@ set -g automatic-rename on
 ## mouse
 # It's nice to be able to resize using the mouse, but it turns out that I
 # like clicking on URLs even more, and this breaks that.
-# set -g mouse on
+set -g mouse on
 
 ## keyboard
 set -g mode-keys vi
diff --git a/.zshrc b/.zshrc
index 0bffc50a..37ac90be 100644
--- a/.zshrc
+++ b/.zshrc
@@ -133,8 +133,8 @@ if (( $+commands[fzf] )); then
 
   skip_dirs=.direnv,.git,.jj,node_modules,target
 
-  export FZF_DEFAULT_OPTS="--height 40% --layout=reverse --border"
-  export FZF_TMUX_OPTS="-p80%,60%"
+  export FZF_DEFAULT_OPTS="--height=40% --layout=reverse"
+  export FZF_TMUX_OPTS="--popup=80%,60%"
   export FZF_DEFAULT_COMMAND="fd --type f --strip-cwd-prefix --hidden --follow --exclude .git"
 
   # not sure why FZF_DEFAULT_COMMAND isn't being used here?