mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-11-22 15:28:25 -06:00
move nvim config to here to use stow
This commit is contained in:
1 parent
5d3cffceff
commit
b247e6f8ed
5 files changed
+288
No files matched your search
@@ -0,0 +1,96 @@
|
||||
(module my_vim.core
|
||||
{autoload
|
||||
{a aniseed.core}
|
||||
require
|
||||
{nvim aniseed.nvim}})
|
||||
|
||||
|
||||
(nvim.ex.set "shortmess+=c") ; don't give |ins-completion-menu| messages.
|
||||
(nvim.ex.set "path+=**")
|
||||
(nvim.ex.set "wildignore+=*.o,*.obj,.git,*.rbc,*.class,.svn,vendor/gems/*")
|
||||
|
||||
(defn- safe-source
|
||||
[filename]
|
||||
(let [glob (nvim.fn.glob filename)]
|
||||
(if (not (a.empty? glob))
|
||||
(nvim.ex.source filename))))
|
||||
|
||||
(a.map safe-source ["~/.vimrc" "~/.vimrc.local"])
|
||||
|
||||
|
||||
(def- backup-dir "$HOME/.vim/backup")
|
||||
(def- undo-dir "$HOME.vim/undo")
|
||||
|
||||
(def- on-opts [
|
||||
:autoindent
|
||||
:autoread
|
||||
:expandtab
|
||||
:exrc ; allow project level (neo)vim files
|
||||
:hlsearch
|
||||
:ignorecase
|
||||
:incsearch
|
||||
:number
|
||||
:ruler
|
||||
:secure
|
||||
:shiftround ; When at 3 spaces and I hit >>, go to 4, not 5.
|
||||
:showcmd ; shows (parital) command in the status line
|
||||
:showmatch
|
||||
:smartcase
|
||||
:splitbelow
|
||||
:splitright
|
||||
:termguicolors
|
||||
:title
|
||||
:undofile
|
||||
:wildmenu
|
||||
])
|
||||
|
||||
|
||||
(def- val-based-opts
|
||||
{
|
||||
:t_Co 256
|
||||
:laststatus 2
|
||||
:encoding "utf-8"
|
||||
:history 500
|
||||
:redrawtime 5000
|
||||
:scrolloff 3
|
||||
:guifont "Hasklig"
|
||||
:background "dark"
|
||||
:backupdir backup-dir
|
||||
:directory backup-dir ;Don't clutter my dirs up with swp and tmp files
|
||||
:grepprg "ag" ; Use Silver Searcher instead of grep
|
||||
:tags "tags"
|
||||
:updatetime 300 ; per coc.vim for diagnostic messages
|
||||
:signcolumn "auto:1-3"
|
||||
:cmdheight 2 ; Better display for messages
|
||||
:undodir undo-dir
|
||||
:undolevels 1000
|
||||
:undoreload 10000
|
||||
:foldmethod "expr"
|
||||
:foldexpr "nvim_treesitter#foldexpr()"
|
||||
:foldlevelstart 99
|
||||
:foldlevel 99
|
||||
:tabstop 2
|
||||
:shiftwidth 2
|
||||
:softtabstop 2
|
||||
:list "listchars=tab:➥\\ ,trail:·"
|
||||
:backspace "indent,eol,start" ;allow backspacing over everything in insert mode
|
||||
:wildmode "list:longest,list:full"
|
||||
:wrap "off"
|
||||
})
|
||||
|
||||
(defn- set-opt
|
||||
[[opt val]]
|
||||
(tset vim.opt (a.str opt) val))
|
||||
|
||||
(defn- set-opt-on
|
||||
[opt]
|
||||
(set-opt [opt true]))
|
||||
|
||||
(a.map set-opt-on on-opts)
|
||||
|
||||
(a.map set-opt val-based-opts)
|
||||
|
||||
(nvim.ex.syntax "on")
|
||||
(nvim.ex.colorscheme "solarized8")
|
||||
|
||||
(nvim.fn.glob "~/.vimrc.local")
|
||||
@@ -0,0 +1,10 @@
|
||||
(module my_vim.init
|
||||
{autoload
|
||||
{a aniseed.core}
|
||||
require
|
||||
{nvim aniseed.nvim}})
|
||||
|
||||
(nvim.ex.source "~/.vimrc")
|
||||
|
||||
(require :my_nvim.core)
|
||||
(require :my_nvim.mapping)
|
||||
@@ -0,0 +1,59 @@
|
||||
(module my_nvim.mapping
|
||||
{autoload {nvim aniseed.nvim
|
||||
nu aniseed.nvim.util
|
||||
core aniseed.core}})
|
||||
|
||||
(defn- noremap [mode from to]
|
||||
"Sets a mapping with {:noremap true}."
|
||||
(nvim.set_keymap mode from to {:noremap true}))
|
||||
|
||||
; (set nvim.g.mapleader "\\")
|
||||
|
||||
(noremap :n "<leader>`" ":source ~/.config/nvim/init.lua<CR>")
|
||||
|
||||
(noremap :n :<Enter> ":nohlsearch<Enter>/<BS>")
|
||||
|
||||
;; Correct to first spelling suggestion.
|
||||
(noremap :n :<leader>zz ":normal! 1z=<cr>")
|
||||
|
||||
|
||||
;; nice paste from clipboard in insert mode
|
||||
(noremap :i :<C-V><C-O> ":set paste<CR><C-R><C-R>+<C-O>:set nopaste<CR>")
|
||||
|
||||
|
||||
; Insert Date
|
||||
(noremap :n :<F5> "\"=strftime(\"%F\")<CR>p")
|
||||
(noremap :i :<F5> "<C-R>=strftime(\"%F\")<CR>")
|
||||
|
||||
; Make markdown link with empty url
|
||||
;map <Leader>ah S<a href="" target="_blank" rel="noopener noreferrer"><CR>
|
||||
(noremap :v :<leader>ah "S<a href=\"\" target=\"_blank\" rel=\"nopener noreferrer\"><CR>")
|
||||
(noremap :v :<leader>ml "xi[<c-r>\"]()<esc>")
|
||||
|
||||
|
||||
(noremap :n :<C-e> "3<C-e>")
|
||||
(noremap :n :<C-y> "3<C-y>")
|
||||
|
||||
; Unimpaired configuration
|
||||
; Bubble single lines
|
||||
(noremap :n :<C-k> "[e")
|
||||
(noremap :n :<C-j> "]e")
|
||||
; Bubble multiple lines
|
||||
(noremap :v :<C-k> "[egv")
|
||||
(noremap :v :<C-j> "]egv")
|
||||
|
||||
; Format JSON
|
||||
(noremap :n :<leader>jpp ":%!python -m json.tool --indent=2<CR>")
|
||||
|
||||
; Map w!! to write readonly files
|
||||
(noremap :c :w!! "w !sudo tee % >/dev/null")
|
||||
|
||||
(noremap :n :gnh ":GitGutterNextHunk<CR>")
|
||||
(noremap :n :gph ":GitGutterPrevHunk<CR>")
|
||||
(noremap :n :gsh ":GitGutterStageHunk<CR>")
|
||||
|
||||
(noremap :n :<leader>li "<Cmd>LspInfo<CR>")
|
||||
;vim.api.nvim_set_keymap('n', '<leader>li', '<Cmd>LspInfo<CR>', { noremap=true, silent=true })
|
||||
|
||||
; Open file in Marked 2 (markdown viewer)
|
||||
(noremap :n :<leader>mv ":AsyncRun -mode=bang open -a Marked\\ 2.app \'%:p\'<cr>")
|
||||
Reference in new issue
Block a user