This commit is contained in:
secretspecter 2023-08-10 20:08:36 -06:00
parent 82a1fb7de1
commit 0087434445
3 changed files with 21 additions and 9 deletions

View file

@ -12,6 +12,8 @@
{:url "https://github.com/nvim-treesitter/nvim-treesitter" {:url "https://github.com/nvim-treesitter/nvim-treesitter"
:build ":TSUpdate"} :build ":TSUpdate"}
;TODO "https://github.com/julienvincent/nvim-paredit" ;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/preservim/vim-markdown"
"https://github.com/richardbizik/nvim-toc" "https://github.com/richardbizik/nvim-toc"
"https://github.com/nvim-lua/plenary.nvim" "https://github.com/nvim-lua/plenary.nvim"
@ -36,7 +38,8 @@
:dependencies [{:url "https://github.com/nvim-telescope/telescope-fzf-native.nvim" :dependencies [{:url "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
:build (.. "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release" :build (.. "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release"
" && cmake --build build --config 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/sainnhe/everforest"
"https://github.com/tamton-aquib/duck.nvim"])) "https://github.com/tamton-aquib/duck.nvim"]))
@ -47,7 +50,8 @@
(set vim.g.vim_markdown_folding_disabled 1) (set vim.g.vim_markdown_folding_disabled 1)
(let [telescope (require :telescope)] (let [telescope (require :telescope)]
(pcall (telescope.load_extension :fzf))) (pcall (telescope.load_extension :fzf))
(pcall (telescope.load_extension :emoji)))
(require :setup-treesitter) (require :setup-treesitter)
;TODO (require :setup-paredit) ;TODO (require :setup-paredit)

View file

@ -2,12 +2,12 @@
luasnip (require :luasnip)] luasnip (require :luasnip)]
{:options (fn [] {:options (fn []
(set vim.g.mapleader " ") (set vim.g.mapleader " ")
(set vim.g.maplocalleader "\\")
(set vim.o.termguicolors true) (set vim.o.termguicolors true)
(set vim.o.clipboard :unnamedplus) (set vim.o.clipboard :unnamedplus)
(set vim.o.wrap false) (set vim.o.wrap false)
(set vim.opt.colorcolumn "80,120") (set vim.opt.colorcolumn "80,120")
(vim.cmd.colorscheme :everforest) (vim.cmd.colorscheme :everforest)
;; http://neovim.io/doc/user/change.html#fo-table
(set vim.o.formatoptions :tncro) (set vim.o.formatoptions :tncro)
(set vim.o.conceallevel 2) (set vim.o.conceallevel 2)
(set vim.o.splitbelow true) (set vim.o.splitbelow true)
@ -15,7 +15,7 @@
:keymap (fn [] :keymap (fn []
(let [nmap #(vim.keymap.set :n $1 $2 {:desc $3}) (let [nmap #(vim.keymap.set :n $1 $2 {:desc $3})
tmap #(vim.keymap.set :t $1 $2)] tmap #(vim.keymap.set :t $1 $2)]
(nmap :<leader>l ":ls<cr>:b<space>" "List buffers and open") (nmap :<Tab> :<C-^> "Toggle alternate-file")
(nmap :<C-x> ":bn|bd!#<cr>" "Delete a buffer without removing the split") (nmap :<C-x> ":bn|bd!#<cr>" "Delete a buffer without removing the split")
(nmap :<leader>w :80<C-W>|) (nmap :<leader>w :80<C-W>|)
;; unified split navigation via C-hjkl ;; unified split navigation via C-hjkl
@ -27,10 +27,13 @@
(tmap :<C-j> :<C-\><C-n><C-w>j) (tmap :<C-j> :<C-\><C-n><C-w>j)
(tmap :<C-k> :<C-\><C-n><C-w>k) (tmap :<C-k> :<C-\><C-n><C-w>k)
(tmap :<C-l> :<C-\><C-n><C-w>l) (tmap :<C-l> :<C-\><C-n><C-w>l)
(tmap :<C-w> "<C-\\><C-n>")
;(tmap :<C-w>v "<C-\\><C-n>:vnew term://bash<cr>")
;(tmap :<C-w>s "<C-\\><C-n>:new term://bash<cr>")
;; terminal ;; terminal
(nmap :<leader>to ":new term://bash|resize 8<cr>") (nmap :<leader>to ":new term://bash|resize 8<cr>")
(nmap :<leader>tt ":vnew term://tut<cr>") (nmap :<leader>tt ":term tut<cr>i")
(nmap :<leader>tg ":new term://gomuks<cr>") (nmap :<leader>tg ":term gomuks<cr>i")
(vim.api.nvim_create_autocmd (vim.api.nvim_create_autocmd
[:BufWinEnter :WinEnter] [:BufWinEnter :WinEnter]
{:pattern "term://*" {:pattern "term://*"
@ -42,8 +45,10 @@
".gmi" ".gmi"
"|resize 8|$") "|resize 8|$")
"Open today's diary")) "Open today's diary"))
(nmap :<C-p> ":Telescope find_files<cr>" "Telescope find_files") (nmap :<leader>p ":Telescope find_files<cr>" "Telescope find_files")
(nmap :<C-b> ":Telescope buffers<cr>" "Telescope buffers") (nmap :<leader>o ":Telescope buffers<cr>" "Telescope buffers")
(nmap :<leader>f ":Telescope live_grep<cr>" "Telescope live_grep")
(nmap :<leader>e ":Telescope emoji<cr>" "Telescope emoji")
(let [duck (require :duck)] (let [duck (require :duck)]
(nmap :<leader><leader> #(duck.hatch) "hatch a duck") (nmap :<leader><leader> #(duck.hatch) "hatch a duck")
(nmap :<leader>dk #(duck.cook) "cook a duck")) (nmap :<leader>dk #(duck.cook) "cook a duck"))

View file

@ -19,7 +19,10 @@
"nvim-toc": { "branch": "main", "commit": "8ae6c9171198103e8aa603055b899b6a29e9a09a" }, "nvim-toc": { "branch": "main", "commit": "8ae6c9171198103e8aa603055b899b6a29e9a09a" },
"nvim-treesitter": { "branch": "master", "commit": "4c4d586a05e236d8199ab6faab8cb733a9b5bd24" }, "nvim-treesitter": { "branch": "master", "commit": "4c4d586a05e236d8199ab6faab8cb733a9b5bd24" },
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
"telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "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" }
} }