diff options
| -rw-r--r-- | fnl/config/autocmd.fnl | 9 | ||||
| -rw-r--r-- | fnl/config/lir.fnl | 44 | ||||
| -rw-r--r-- | fnl/config/which-key.fnl | 1 | ||||
| -rw-r--r-- | fnl/plugins.fnl | 7 | ||||
| -rw-r--r-- | fnl/settings/keymaps.fnl | 1 | ||||
| -rw-r--r-- | fnl/settings/options.fnl | 3 |
6 files changed, 7 insertions, 58 deletions
diff --git a/fnl/config/autocmd.fnl b/fnl/config/autocmd.fnl index 84d9e66..9bd59cc 100644 --- a/fnl/config/autocmd.fnl +++ b/fnl/config/autocmd.fnl @@ -18,18 +18,9 @@ (create-autocmd :FileType {:pattern :qf :command "set nobuflisted"}) -(create-autocmd :FileType {:pattern :lir - :callback (fn [] - (tset vim.opt_local :number false) - (tset vim.opt_local :relativenumber - false))}) - (create-autocmd :FileType {:pattern [:gitcommit :markdown] :command "setlocal wrap"}) -(create-autocmd :FileType {:pattern [:gitcommit :markdown :org :plaintex] - :command "setlocal spell"}) - (create-autocmd :VimResized {:command "tabdo wincmd ="}) (create-autocmd :BufWritePost diff --git a/fnl/config/lir.fnl b/fnl/config/lir.fnl deleted file mode 100644 index 45fb052..0000000 --- a/fnl/config/lir.fnl +++ /dev/null @@ -1,44 +0,0 @@ -;; Simple file manager. -(module config.lir {autoload {util config.util nvim aniseed.nvim}}) - -(defn- opts [actions mark-actions clipboard-actions] - {:show_hidden_files false - :devicons_enable true - :mappings {:l actions.edit - :<C-s> actions.split - :v actions.vsplit - :<C-t> actions.tabedit - :h actions.up - :q actions.quit - :A actions.mkdir - :a actions.newfile - :r actions.rename - "@" actions.cd - :Y actions.yank_path - :i actions.toggle_show_hidden - :d actions.delete - :J (fn [] - (mark-actions.toggle_mark) - (vim.cmd "normal! j")) - :c clipboard-actions.copy - :x clipboard-actions.cut - :p clipboard-actions.paste} - :float {:winblend 0 - :curdir_window {:enable false :highlight_dirname true} - :win_opts (fn [] - (let [width (math.floor (* vim.o.columns 0.7)) - height (math.floor (* vim.o.lines 0.7))] - {:border :rounded : width : height}))} - :hide_cursor false - :on_init (fn [] - (nvim.buf_set_keymap 0 :x :J - ":<C-u>lua require(\"lir.mark.actions\").toggle_mark(\"v\")<CR>" - {:noremap true :silent true}))}) - -(let [lir (util.prequire :lir)] - (let [actions (require :lir.actions) - mark-actions (require :lir.mark.actions) - clipboard-actions (require :lir.clipboard.actions)] - (lir.setup (opts actions mark-actions clipboard-actions)) - (nvim.set_keymap :n "-" ":lua require'lir.float'.toggle()<cr>" - {:noremap true :silent true}))) diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl index 2b5ea9d..477c23b 100644 --- a/fnl/config/which-key.fnl +++ b/fnl/config/which-key.fnl @@ -158,6 +158,7 @@ :o org :p packer :r replace + :u [:<cmd>UndotreeToggle<cr> "Undotree"] :s [switch-window "Switch window"] :t [:<cmd>ToggleTerm<cr> :Terminal] :T treesitter diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 3696598..4c972a2 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -109,10 +109,6 @@ {1 :ahmedkhalf/project.nvim :config (fn [] (require :config.project))} - {1 :tamago324/lir.nvim - :config (fn [] - (require :config.lir)) - :requires [:kyazdani42/nvim-web-devicons]} {1 :ThePrimeagen/harpoon :config (fn [] (require :config.harpoon))}]) @@ -156,7 +152,8 @@ {1 :windwp/nvim-spectre :config (fn [] (require :config.spectre)) - :event :BufWinEnter}]) + :event :BufWinEnter} + {1 :mbbill/undotree :event :BufWinEnter}]) (def ui [{1 :nvim-lualine/lualine.nvim :event :BufWinEnter diff --git a/fnl/settings/keymaps.fnl b/fnl/settings/keymaps.fnl index 85e5a76..83b9917 100644 --- a/fnl/settings/keymaps.fnl +++ b/fnl/settings/keymaps.fnl @@ -47,3 +47,4 @@ (map :n :<m-n> :<cmd>nohlsearch<CR> opts) (map :n :Q "<cmd>:q<CR>" opts) +(map :n "-" "<cmd>:Explore<cr>" opts) diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl index 0a1a254..bc82be7 100644 --- a/fnl/settings/options.fnl +++ b/fnl/settings/options.fnl @@ -88,3 +88,6 @@ (nvim.ex.set :formatoptions-=cro) (nvim.ex.set :colorcolumn=80) (nvim.ex.set :shortmess+=c) +(set vim.g.netrw_browse_split 0) +(set vim.g.netrw_banner 0) +(set vim.g.netrw_winsize 25) |