fzf pilled

11 files changed, 130 insertions, 52 deletions

diff --git a/modules/fzf.nix b/modules/fzf.nix
index 13487e0..b407a22 100644
--- a/modules/fzf.nix
+++ b/modules/fzf.nix
@@ -18,16 +18,19 @@ in
       enableZshIntegration = true;
       colors = {
         bg = scheme.base00;
-        # "bg+" = scheme.base00;
-        "bg+" = scheme.base01; # "#151515";
+        "bg+" = scheme.base01;
+        # "bg+" = scheme.base01; # "#151515";
+        query = scheme.base05 + ":regular";
         spinner = scheme.base0C;
         hl = scheme.base0D;
+        "hl+" = scheme.base0D;
         header = scheme.base0D;
         info = scheme.base0A;
-        pointer = scheme.base0C;
-        marker = "red";
+        pointer = scheme.base01;
+        marker = scheme.base0D;
         fg = scheme.base05;
-        "fg+" = scheme.base0B;
+        "fg+" = scheme.base0B + ":regular";
+        prompt = scheme.base0C;
       };
       tmux = {
         enableShellIntegration = true;
@@ -36,6 +39,7 @@ in
       defaultOptions = [
         "--style minimal"
         "--bind ctrl-n:down,ctrl-e:up"
+        # "--no-bold"
         # "--style full"
       ];
       fileWidgetOptions = [
diff --git a/modules/neovide.nix b/modules/neovide.nix
index fe297d7..9059115 100644
--- a/modules/neovide.nix
+++ b/modules/neovide.nix
@@ -20,7 +20,7 @@ in
           features = {
             "BerkeleyMonoPatched Nerd Font" = ["+ss01" "+ss07" "+ss11" "-calt" "+ss09" "+ss02" "+ss14"];
           };
-          size = 11.0;
+          size = 12.0;
         };
       };
     };
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 0b0c72e..678d773 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -66,6 +66,7 @@ in
         base16-nvim
         telescope-nvim
         telescope-fzf-native-nvim
+        fzf-lua
         vim-obsession
       ];
       # extraLuaPackages = ps: with ps; [
diff --git a/modules/neovim/nvim/after/ftplugin/lua.lua b/modules/neovim/nvim/after/ftplugin/lua.lua
index 00ba373..f927fe5 100644
--- a/modules/neovim/nvim/after/ftplugin/lua.lua
+++ b/modules/neovim/nvim/after/ftplugin/lua.lua
@@ -1,3 +1,3 @@
 vim.o.tabstop=2
 vim.o.shiftwidth=2
-vim.treesitter.stop() -- newer versions of nvim force this for some reason
+-- vim.treesitter.stop() -- newer versions of nvim force this for some reason
diff --git a/modules/neovim/nvim/init.lua b/modules/neovim/nvim/init.lua
index aeb5f2f..2fc7ba3 100644
--- a/modules/neovim/nvim/init.lua
+++ b/modules/neovim/nvim/init.lua
@@ -1,7 +1,8 @@
 require("config.settings")
 require("config.keybinds")
--- require("config.colorscheme")
+require("config.colorscheme")
 require("config.lsp")
 require("config.treesitter")
 require("config.icons")
+require("config.fzf")
 require("config.oil")
diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua
index 9b5cf0e..25a6737 100644
--- a/modules/neovim/nvim/lua/config/colorscheme.lua
+++ b/modules/neovim/nvim/lua/config/colorscheme.lua
@@ -1,35 +1,6 @@
--- vim.cmd[[
---   colorscheme base16-mountain
---   "  colorscheme base16-selenized-black
---   hi LineNr guifg=#ceb188
---   hi LineNrAbove guifg=#262626
---   hi LineNrBelow guifg=#262626
---   hi CursorLineNr guifg=#ceb188 guibg=#191919 gui=bold
---   hi FloatBorder guifg=#4c4c4c
---   hi Pmenu guibg=#0d0d0d
---   hi BlinkCmpMenuBorder guifg=#4c4c4c 
---   hi BlinkCmpDocBorder guifg=#4c4c4c 
---   hi PmenuSel guibg=#191919 guifg=#cacaca
---   hi WinBar guifg=#4c4c4c
---   hi WinSeparator guifg=#191919
---   "
---   "" status line
---   hi StatusLine guibg=#191919 guifg=#4c4c4c
---   hi StatuslineInactive guibg=#191919 guifg=#4c4c4c gui=NONE
---   hi StatuslineAccent guifg=#0f0f0f guibg=#aca98a gui=bold
---   hi StatuslineInsertAccent guifg=#0f0f0f guibg=#8aabac gui=bold
---   hi StatuslineVisualAccent guifg=#0f0f0f guibg=#8f8aac gui=bold
---   hi StatuslineReplaceAccent guifg=#0f0f0f guibg=#ac8a8c gui=bold
---   hi StatuslineTerminalAccent guifg=#0f0f0f guibg=#ac8a8c gui=bold
---   hi StatuslineCommandAccent guifg=#0f0f0f guibg=#8aac8b gui=bold
---   hi StatuslineFileIcon guibg=#191919 guifg=#8f8aac
---   hi StatuslineInfo guibg=#191919 guifg=#4c4c4c 
---   hi LspError guibg=#191919 guifg=#c49ea0
---   hi LspWarn guibg=#191919 guifg=#8f8aac
---   hi LspInfo guibg=#191919 guifg=#8f8aac
---   hi LspHint guibg=#191919 guifg=#8aabac
--- ]]
+vim.cmd[[hi link FzfLuaBorder FloatBorder]]
 vim.cmd[[
-"hi StatusLineNC guibg=none guifg=#4c4c4c
-"hi StatusLine guibg=none guifg=#8f8aac
+  hi TabLineFill guibg=bg
+  hi TabLineSel guibg=bg
+  hi TabLine guibg=bg
 ]]
diff --git a/modules/neovim/nvim/lua/config/fzf.lua b/modules/neovim/nvim/lua/config/fzf.lua
new file mode 100644
index 0000000..5697591
--- /dev/null
+++ b/modules/neovim/nvim/lua/config/fzf.lua
@@ -0,0 +1,89 @@
+require("fzf-lua").setup({
+  defaults = {
+    file_icons = false,
+    -- hidden = true,
+  },
+  previewers = {
+    builtin = {
+      -- syntax = false,
+      -- treesitter = false,
+      -- toggle_behavior = "extend",
+    },
+  },
+  keymap = {
+    builtin = {
+      ["<C-p>"] = "toggle-preview",
+    },
+  },
+  files = {
+    previewer = "builtin",
+    cwd_prompt = false,
+    prompt = "  ",
+  },
+  winopts = {
+    -- fullscreen = true,
+    row = 1,
+    col = 0,
+    width = 1,
+    height = 0.4,
+    title_pos = "left",
+    backdrop = 70,
+    -- border = "rounded",
+    -- border = "none",
+    -- treesitter = {
+    --   enabled = false,
+    --   fzf_colors = false,
+    -- },
+    border = { "", "─", "", "", "", "", "", "" },
+    preview = {
+      layout = "horizontal",
+      title_pos = "right",
+      -- title = false,
+      -- hidden = true,
+      scrollbar = false,
+      -- border = "none",
+      -- border = "rounded",
+      winopts = {
+        number = false,
+      },
+      border = function(_, m)
+        if m.type == "fzf" then
+          return "single"
+        else
+          assert(m.type == "nvim" and m.name == "prev" and type(m.layout) == "string")
+          local b = { "┌", "─", "┐", "│", "┘", "─", "└", "│" }
+          if m.layout == "down" then
+            b[1] = "├" --top right
+            b[3] = "┤" -- top left
+          elseif m.layout == "up" then
+            b[7] = "├" -- bottom left
+            b[6] = "" -- remove bottom
+            b[5] = "┤" -- bottom right
+          elseif m.layout == "left" then
+            b[3] = "┬" -- top right
+            b[5] = "┴" -- bottom right
+            b[6] = "" -- remove bottom
+          else -- right
+            b[1] = "┬" -- top left
+            b[7] = "┴" -- bottom left
+            b[6] = "" -- remove bottom
+          end
+          return b
+        end
+      end,
+    },
+    on_create = function()
+      vim.keymap.set('t', '<C-e>', '<Up>', { silent = true, buffer = true })
+    end,
+  },
+  fzf_opts = {
+    -- ["--tmux"] = "",
+    ["--style"] = "minimal",
+    ["--ansi"] = true,
+    -- ["--no-bold"] = "",
+  },
+  hls = {
+    border = "FloatBorder",
+  },
+})
+
diff --git a/modules/neovim/nvim/lua/config/keybinds.lua b/modules/neovim/nvim/lua/config/keybinds.lua
index 690a4d8..043f921 100644
--- a/modules/neovim/nvim/lua/config/keybinds.lua
+++ b/modules/neovim/nvim/lua/config/keybinds.lua
@@ -38,7 +38,12 @@ nmap('<leader>wn', '<C-w><C-j>', { desc = "Focus window below the current one" }
 nmap('<leader>we', '<C-w><C-k>', { desc = "Focus window above the current one" })
 nmap('<leader>wi', '<C-w><C-l>', { desc = "Focus window right of the current one" })
 
-nmap('<leader>fo', '<cmd>Telescope find_files<CR>', { silent = true })
+-- nmap('<leader>fo', '<cmd>Telescope find_files<CR>', { silent = true })
+nmap('<leader>fo', '<cmd>FzfLua files<CR>', { silent = true })
+-- nmap('<leader>fe', '<cmd>lua require("oil").open(nil, { preview = { split = "aboveleft" } })<CR>', { silent = true })
+nmap('<leader>fe', '<cmd>lua require("oil").toggle_float()<CR>', { silent = true })
+
 nmap('<leader>?', '<cmd>Telescope live_grep<CR>', { silent = true })
 
 nmap('<leader>to', '<cmd>te<CR>', { silent = true; desc = "Open a terminal buffer in the current window." })
+
diff --git a/modules/neovim/nvim/lua/config/oil.lua b/modules/neovim/nvim/lua/config/oil.lua
index bfa67a9..492d4eb 100644
--- a/modules/neovim/nvim/lua/config/oil.lua
+++ b/modules/neovim/nvim/lua/config/oil.lua
@@ -3,15 +3,20 @@ require("oil").setup({
   columns = {
     "icon"
   },
+  constrain_cursor = "editable",
+  skip_confirm_for_simple_edits = true,
   win_options = {
-    wrap = false,
-    signcolumn = "no",
-    cursorcolumn = false,
-    foldcolumn = "0",
-    spell = false,
-    list = false,
-    conceallevel = 3,
-    concealcursor = "nvic",
+    number = false,
+    relativenumber = false,
+    cursorline = true,
+  },
+  view_options = {
+    show_hidden = true,
+  },
+  float = {
+    max_width = .7,
+    max_height = .5,
+    win_options = {
+    },
   },
-  constrain_cursor = "editable",
 })
diff --git a/modules/neovim/nvim/lua/config/treesitter.lua b/modules/neovim/nvim/lua/config/treesitter.lua
index c92397e..d1ded32 100644
--- a/modules/neovim/nvim/lua/config/treesitter.lua
+++ b/modules/neovim/nvim/lua/config/treesitter.lua
@@ -1,5 +1,6 @@
 require("nvim-treesitter.configs").setup {
-  highlight = { enable = false },
+  -- highlight = { enable = false },
+  highlight = { enable = true },
   indent = { enable = false },
   incremental_selection = {
     enable = true,
diff --git a/void/home.nix b/void/home.nix
index aa2771e..73076a2 100644
--- a/void/home.nix
+++ b/void/home.nix
@@ -23,6 +23,7 @@
     # colors.google-dark.enable = true;
     # colors.grayscale-dark.enable = true;
     # colors.grayscale-light.enable = true;
+    fzf.enable = true;
     gpg.enable = true;
     qutebrowser.enable = true;