From bce211d1ee112e32f149176694161cbee6f04c36 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sun, 16 Oct 2022 02:44:59 +0200 Subject: Remove comments --- fnl/settings/keymaps.fnl | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'fnl/settings') diff --git a/fnl/settings/keymaps.fnl b/fnl/settings/keymaps.fnl index 8c3f046..85e5a76 100644 --- a/fnl/settings/keymaps.fnl +++ b/fnl/settings/keymaps.fnl @@ -9,14 +9,6 @@ (set nvim.g.mapleader " ") (set nvim.g.maplocalleader " ") -;; Modes -;; normal_mode = "n" -;; insert_mode = "i" -;; visual_mode = "v" -;; visual_block_mode = "x" -;; term_mode = "t" -;; command_mode = "c" - ;; Normal ;; ;; Better window navigation (map :n : :h opts) @@ -30,10 +22,6 @@ (map :n : ":vertical resize -2" opts) (map :n : ":vertical resize +2" opts) -;; Navigate buffers -;; (map :n : ":bnext" opts) -;; (map :n : ":bprevious" opts) - ;; Visual ;; ;; Stay in indent mode (map :v "<" : Date: Sun, 16 Oct 2022 14:06:08 +0200 Subject: Add undotree and remove lir --- fnl/config/autocmd.fnl | 9 --------- fnl/config/lir.fnl | 44 -------------------------------------------- fnl/config/which-key.fnl | 1 + fnl/plugins.fnl | 7 ++----- fnl/settings/keymaps.fnl | 1 + fnl/settings/options.fnl | 3 +++ 6 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 fnl/config/lir.fnl (limited to 'fnl/settings') 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 - : actions.split - :v actions.vsplit - : 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 - ":lua require(\"lir.mark.actions\").toggle_mark(\"v\")" - {: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()" - {: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 [:UndotreeToggle "Undotree"] :s [switch-window "Switch window"] :t [:ToggleTerm :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 : :nohlsearch opts) (map :n :Q ":q" opts) +(map :n "-" ":Explore" 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) -- cgit v1.2.3-70-g09d2