diff --git a/fnl/init.fnl b/fnl/init.fnl index 11081d1..27f3b76 100644 --- a/fnl/init.fnl +++ b/fnl/init.fnl @@ -12,6 +12,8 @@ {:url "https://github.com/nvim-treesitter/nvim-treesitter" :build ":TSUpdate"} ;TODO "https://github.com/julienvincent/nvim-paredit" + "https://github.com/guns/vim-sexp" + "https://github.com/ludovicchabant/vim-gutentags" "https://github.com/preservim/vim-markdown" "https://github.com/richardbizik/nvim-toc" "https://github.com/nvim-lua/plenary.nvim" @@ -36,7 +38,8 @@ :dependencies [{:url "https://github.com/nvim-telescope/telescope-fzf-native.nvim" :build (.. "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release" " && cmake --build build --config Release" - " && cmake --install build --prefix build")}]} + " && cmake --install build --prefix build")} + "https://github.com/xiyaowong/telescope-emoji.nvim"]} "https://github.com/sainnhe/everforest" "https://github.com/tamton-aquib/duck.nvim"])) @@ -47,7 +50,8 @@ (set vim.g.vim_markdown_folding_disabled 1) (let [telescope (require :telescope)] - (pcall (telescope.load_extension :fzf))) + (pcall (telescope.load_extension :fzf)) + (pcall (telescope.load_extension :emoji))) (require :setup-treesitter) ;TODO (require :setup-paredit) diff --git a/fnl/personalize.fnl b/fnl/personalize.fnl index c8105ae..c8c7496 100644 --- a/fnl/personalize.fnl +++ b/fnl/personalize.fnl @@ -2,12 +2,12 @@ luasnip (require :luasnip)] {:options (fn [] (set vim.g.mapleader " ") + (set vim.g.maplocalleader "\\") (set vim.o.termguicolors true) (set vim.o.clipboard :unnamedplus) (set vim.o.wrap false) (set vim.opt.colorcolumn "80,120") (vim.cmd.colorscheme :everforest) - ;; http://neovim.io/doc/user/change.html#fo-table (set vim.o.formatoptions :tncro) (set vim.o.conceallevel 2) (set vim.o.splitbelow true) @@ -15,7 +15,7 @@ :keymap (fn [] (let [nmap #(vim.keymap.set :n $1 $2 {:desc $3}) tmap #(vim.keymap.set :t $1 $2)] - (nmap :l ":ls:b" "List buffers and open") + (nmap : : "Toggle alternate-file") (nmap : ":bn|bd!#" "Delete a buffer without removing the split") (nmap :w :80|) ;; unified split navigation via C-hjkl @@ -27,10 +27,13 @@ (tmap : :j) (tmap : :k) (tmap : :l) + (tmap : "") + ;(tmap :v ":vnew term://bash") + ;(tmap :s ":new term://bash") ;; terminal (nmap :to ":new term://bash|resize 8") - (nmap :tt ":vnew term://tut") - (nmap :tg ":new term://gomuks") + (nmap :tt ":term tuti") + (nmap :tg ":term gomuksi") (vim.api.nvim_create_autocmd [:BufWinEnter :WinEnter] {:pattern "term://*" @@ -42,8 +45,10 @@ ".gmi" "|resize 8|$") "Open today's diary")) - (nmap : ":Telescope find_files" "Telescope find_files") - (nmap : ":Telescope buffers" "Telescope buffers") + (nmap :p ":Telescope find_files" "Telescope find_files") + (nmap :o ":Telescope buffers" "Telescope buffers") + (nmap :f ":Telescope live_grep" "Telescope live_grep") + (nmap :e ":Telescope emoji" "Telescope emoji") (let [duck (require :duck)] (nmap : #(duck.hatch) "hatch a duck") (nmap :dk #(duck.cook) "cook a duck")) diff --git a/lazy-lock.json b/lazy-lock.json index 57667aa..030212a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -19,7 +19,10 @@ "nvim-toc": { "branch": "main", "commit": "8ae6c9171198103e8aa603055b899b6a29e9a09a" }, "nvim-treesitter": { "branch": "master", "commit": "4c4d586a05e236d8199ab6faab8cb733a9b5bd24" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, - "vim-markdown": { "branch": "master", "commit": "cc82d88e2a791f54d2b6e2b26e41f743351ac947" } + "vim-gutentags": { "branch": "master", "commit": "1337b1891b9d98d6f4881982f27aa22b02c80084" }, + "vim-markdown": { "branch": "master", "commit": "cc82d88e2a791f54d2b6e2b26e41f743351ac947" }, + "vim-sexp": { "branch": "master", "commit": "14464d4580af43424ed8f2614d94e62bfa40bb4d" } } \ No newline at end of file