wipneovim-rework

7 files changed, 26 insertions, 234 deletions

diff --git a/modules/neovim/nvim/lua/config/fzf.lua b/modules/neovim/nvim/lua/config/fzf.lua
deleted file mode 100644
index ce5d047..0000000
--- a/modules/neovim/nvim/lua/config/fzf.lua
+++ /dev/null
@@ -1,98 +0,0 @@
-require("fzf-lua").setup({
-  defaults = {
-    file_icons = false,
-    prompt = 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 = "  ",
-  },
-  grep = {
-    actions = {
-      ['<ctrl-g>'] = nil,
-    },
-    no_header = true,
-    no_header_i = true,
-  },
-  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"] = "",
-    ["--bind"] = "ctrl-n:down,ctrl-e:up",
-  },
-  hls = {
-    border = "FloatBorder",
-  },
-})
-
diff --git a/modules/neovim/nvim/lua/config/keybinds.lua b/modules/neovim/nvim/lua/config/keybinds.lua
index 4f8df1b..0de6b52 100644
--- a/modules/neovim/nvim/lua/config/keybinds.lua
+++ b/modules/neovim/nvim/lua/config/keybinds.lua
@@ -21,7 +21,7 @@ swapnv('i', 'l')
 
 swapnv('M', 'H')
 swapnv('N', 'J')
---swapnv('E', 'K')
+swapnv('E', 'K')
 swapnv('I', 'L')
 
 nmap('<leader>tn', ':tabnew<CR>', { desc = "Open a new tab" })
@@ -50,13 +50,12 @@ map({'n', 't', 'i'}, '<M-N>', function() require("tmux").resize_bottom() end, {
 map({'n', 't', 'i'}, '<M-E>', function() require("tmux").resize_top() end, { desc = "Resize top side of split" })
 map({'n', 't', 'i'}, '<M-I>', function() require("tmux").resize_right() end, { desc = "Resize right side of split" })
 
--- nmap('<leader>fo', '<cmd>Telescope find_files<CR>', { silent = true })
-nmap('<leader>fo', '<cmd>FzfLua 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>?', '<cmd>FzfLua live_grep_native<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/noice.lua b/modules/neovim/nvim/lua/config/noice.lua
deleted file mode 100644
index 29f7a1d..0000000
--- a/modules/neovim/nvim/lua/config/noice.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-require("noice").setup({
-  lsp = {
-    override = {
-      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-      [ "vim.lsp.util.sylize_markdown" ] = true,
-    },
-
-    presets = {
-      command_palette = true,
-      log_message_to_split = true,
-      lsp_doc_border = true,
-    },
-  },
-})
diff --git a/modules/neovim/nvim/lua/config/oil.lua b/modules/neovim/nvim/lua/config/oil.lua
deleted file mode 100644
index 592421b..0000000
--- a/modules/neovim/nvim/lua/config/oil.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-require("oil").setup({
-  default_file_explorer = true,
-  columns = {
-    -- "icon"
-  },
-  constrain_cursor = "editable",
-  skip_confirm_for_simple_edits = true,
-  win_options = {
-    number = false,
-    relativenumber = false,
-    cursorline = true,
-  },
-  view_options = {
-    show_hidden = true,
-  },
-  float = {
-    max_width = .7,
-    max_height = .5,
-    win_options = {
-    },
-  },
-})
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 2c24ee6..b8001cf 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -1,56 +1,30 @@
+vim.loader.enable({enable=true})
 vim.g.mapleader = ' '
-
--- vim.o.number = true
--- vim.o.relativenumber = true
-vim.o.number = false
-vim.o.tabstop = 2
-vim.o.shiftwidth = 2
-vim.o.relativenumber = false
-
+vim.o.number = true
+vim.o.relativenumber = true
+vim.o.shiftwidth = 4
 vim.o.splitright = true
 vim.o.splitbelow = true
-vim.o.scrolloff = 15
-vim.o.sidescrolloff = 12
+vim.o.scrolloff = 999
+vim.o.sidescrolloff = 999
 vim.o.wrap = false
-vim.o.lbr = true
-vim.o.shortmess = "tToOCFIsWcCi"
+vim.o.shortmess = "tToOFIsWcCi"
 vim.o.termguicolors = true
 vim.opt.fillchars = {eob = " "}
 vim.o.smd = false
---vim.opt.laststatus = 3
-vim.opt.laststatus=1
-vim.opt.cmdheight=0
---%-0{minwid}.{maxwid}{item
--- vim.opt.statusline="%=%f%=%r %p%% « %l, %c %y"
-vim.opt.statusline="%f%=%p%% « %l, %c "
-vim.cmd[[packadd! termdebug]]
--- vim.opt.winbar="%!nvim_treesitter#statusline()"
--- vim.cmd[[
--- hi StatusLineNC guibg=none
--- hi StatusLine guibg=none
--- ]]
--- vim.cmd[[
--- hi LineNr guifg=bg
--- hi LineNrAbove guifg=bg
--- hi LineNrBelow guifg=bg
--- ]]
+vim.o.cmdheight=0
+vim.opt.statusline="%=%f%=%r %p%% « %l, %c %y"
 vim.opt.pumheight = 6
 vim.opt.expandtab = true
 vim.o.mouse=""
--- vim.o.guicursor=""
 vim.o.swapfile=false
 vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 
---vim.opt.foldcolumn = "0"
 vim.opt.foldlevel = 99
 vim.opt.foldlevelstart = 99
 vim.opt.foldenable=true
--- vim.cmd[[syntax off]]
--- vim.o.winborder = 'rounded' breaks telescope
-
 vim.cmd[[set wildchar=<C-n>]]
 
-vim.g.loaded_matchparen = 1
+-- vim.g.loaded_matchparen = 1 # disable matchparen
 vim.cmd[[cnoreabbrev ts lua vim.treesitter.start()]]
 require('vim._extui').enable({})
diff --git a/modules/neovim/nvim/lua/config/statusline.lua b/modules/neovim/nvim/lua/config/statusline.lua
deleted file mode 100644
index 3f29aa2..0000000
--- a/modules/neovim/nvim/lua/config/statusline.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-local modes = {
-  ["n"] = "",
-  ["no"] = "",
-  ["nt"] = "",
-  ["v"] = "VISUAL",
-  ["V"] = "VISUAL-LINE",
-  [""] = "VISUAL-BLOCK",
-  ["s"] = "SELECT",
-  ["S"] = "SELECT-LINE",
-  [""] = "SELECT-BLOCK",
-  ["i"] = "INSERT",
-  ["ic"] = "INSERT",
-  ["R"] = "REPLACE",
-  ["Rv"] = "VISUAL-REPLACE",
-  ["c"] = "COMMAND",
-  ["cv"] = "VIM-EX",
-  ["ce"] = "EX",
-  ["r"] = "PROMPT",
-  ["rm"] = "MOAR",
-  ["r?"] = "CONFIRM",
-  ["!"] = "SHELL",
-  ["t"] = "TERMINAL",
-}
-
-local function mode()
-  local m = vim.api.nvim_get_mode().mode
-  local s = modes[m]
-  return s == "" and "" or string.format("%s » ", s)
-end
-
-M = {}
-
-M.statusline = function()
-  return table.concat {
-    " ",
-    mode(),
-    "%f%=%p%% « %l, %c "
-  }
-end
-
-M.termStatus = function()
-  return table.concat {
-    " ",
-    mode(),
-    "%{b:term_title}%=%p%% « %l, %c "
-  }
-end
-
-M.setup = function(config)
-  vim.api.nvim_exec([[
-    set statusline=%!v:lua.M.statusline()
-    augroup Statusline
-    au!
-    au TermOpen * setlocal statusline=%!v:lua.M.termStatus()
-    augroup END
-  ]], false)
-end
-
-M.setup()
diff --git a/modules/neovim/nvim/lua/config/telescope.lua b/modules/neovim/nvim/lua/config/telescope.lua
new file mode 100644
index 0000000..c769a00
--- /dev/null
+++ b/modules/neovim/nvim/lua/config/telescope.lua
@@ -0,0 +1,12 @@
+local lz = require("lz.n")
+local keymap = lz.keymap({
+  "telescope.nvim",
+  cmd = "Telescope",
+  after = function()
+    require("telescope").setup()
+  end,
+})
+
+keymap.set("n", "<leader>fo", function()
+  require("telescope.builtin").find_files(require('telescope.themes').get_dropdown({}))
+end)