mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-11-22 15:08:25 -06:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9a29dd8433 | ||
|
|
1e32c6293a | ||
|
|
6fd4baa9fe |
No files matched your search
+17
-7
@@ -1,25 +1,37 @@
|
|||||||
# This is Git's per-user configuration file.
|
|
||||||
[user]
|
[user]
|
||||||
email = steven.proctor@gmail.com
|
|
||||||
name = Proctor
|
name = Proctor
|
||||||
|
email = steven.proctor@gmail.com
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
excludesFile = ~/.gitignore.global
|
excludesFile = ~/.gitignore.global
|
||||||
|
[color]
|
||||||
|
ui = true
|
||||||
|
[pull]
|
||||||
|
ff = only
|
||||||
|
[filter "media"]
|
||||||
|
clean = git-media-clean %f
|
||||||
|
smudge = git-media-smudge %f
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
|
|
||||||
[alias] ; Command aliases for the git[1] command wrapper
|
[alias] ; Command aliases for the git[1] command wrapper
|
||||||
last = cat-file commit HEAD
|
last = cat-file commit HEAD
|
||||||
[branch]
|
[branch]
|
||||||
autoSetupRebase = always
|
autoSetupRebase = always
|
||||||
[checkout]
|
[checkout]
|
||||||
defaultRemote = origin
|
defaultRemote = origin
|
||||||
|
[gpg]
|
||||||
|
format = ssh
|
||||||
|
[commit]
|
||||||
|
gpgsign = true
|
||||||
|
[tag]
|
||||||
|
gpgsign = true
|
||||||
|
[gpg "ssh"]
|
||||||
|
allowedSignersFile = ~/.ssh/allowed_signers
|
||||||
[merge]
|
[merge]
|
||||||
ff = only
|
ff = only
|
||||||
[push]
|
[push]
|
||||||
|
default = current
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
default = upstream
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
[remote]
|
[remote]
|
||||||
@@ -28,5 +40,3 @@
|
|||||||
;; This is last, take in any other local file overrides
|
;; This is last, take in any other local file overrides
|
||||||
[include]
|
[include]
|
||||||
path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory
|
path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory
|
||||||
[pull]
|
|
||||||
ff = only
|
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
(import-macros {: tx} :config.macros)
|
||||||
|
|
||||||
(local u (require :dotfiles.util))
|
(local u (require :dotfiles.util))
|
||||||
|
|
||||||
(var unzoom! nil)
|
(var unzoom! nil)
|
||||||
@@ -9,10 +11,18 @@
|
|||||||
(set unzoom! nil))
|
(set unzoom! nil))
|
||||||
(do
|
(do
|
||||||
(set unzoom! (vim.fn.winrestcmd))
|
(set unzoom! (vim.fn.winrestcmd))
|
||||||
(vim.fn.resize)
|
(vim.cmd.resize)
|
||||||
(vim.fn.vertical :resize))))
|
(vim.cmd.resize {:mods {:vertical true}}))))
|
||||||
|
|
||||||
|
|
||||||
(vim.api.nvim_create_user_command :ZoomToggle zoom-toggle {})
|
(vim.api.nvim_create_user_command :ZoomToggle zoom-toggle {})
|
||||||
|
|
||||||
(u.nnoremap :<M-z> ":call ZoomToggle()<CR>")
|
;; (u.nnoremap :<M-z> ":call ZoomToggle()<CR>")
|
||||||
(u.tnoremap :<M-z> "<c-\\><c-n>:call ZoomToggle()<CR>")
|
;; (u.tnoremap :<M-z> "<c-\\><c-n>:call ZoomToggle()<CR>")
|
||||||
|
|
||||||
|
(let [wk (require :which-key)]
|
||||||
|
(wk.add [[(tx :<M-z> zoom-toggle
|
||||||
|
{:desc "Toggle zoom of buffer window"})]
|
||||||
|
[(tx :<M-z> zoom-toggle
|
||||||
|
{:desc "Toggle zoom of buffer window"
|
||||||
|
:mode [:n :t] })]] ))
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
(import-macros {: tx} :config.macros)
|
||||||
|
|
||||||
|
(tx :folke/todo-comments.nvim
|
||||||
|
{:dependencies [:nvim-lua/plenary.nvim] :opts {:lazy false}})
|
||||||
@@ -1,47 +1,182 @@
|
|||||||
{
|
{
|
||||||
"asyncrun.vim": { "branch": "master", "commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce" },
|
"asyncrun.vim": {
|
||||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
"branch": "master",
|
||||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
"commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce"
|
||||||
"cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" },
|
},
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
"cmp-buffer": {
|
||||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
"branch": "main",
|
||||||
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
|
"commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657"
|
||||||
"conjure": { "branch": "main", "commit": "f66b3e7f45d325bd556cd785502761e583971920" },
|
},
|
||||||
"fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" },
|
"cmp-cmdline": {
|
||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"branch": "main",
|
||||||
"lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
|
"commit": "d126061b624e0af6c3a556428712dd4d4194ec6d"
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
},
|
||||||
"mason-update-all": { "branch": "main", "commit": "332aa2586295f93a32643eb2b580f899458215a1" },
|
"cmp-conjure": {
|
||||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
"branch": "master",
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
|
"commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6"
|
||||||
"nfnl": { "branch": "main", "commit": "ac0177c5549df7abba7a19554c18a7765386c894" },
|
},
|
||||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
"cmp-nvim-lsp": {
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
|
"branch": "main",
|
||||||
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
|
"commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef"
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" },
|
},
|
||||||
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
|
"cmp-path": {
|
||||||
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
|
"branch": "main",
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
|
"commit": "c642487086dbd9a93160e1679a1327be111cbc25"
|
||||||
"paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" },
|
},
|
||||||
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
|
"conform.nvim": {
|
||||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
"branch": "master",
|
||||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2" },
|
"commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395"
|
||||||
"telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
|
},
|
||||||
"toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
|
"conjure": {
|
||||||
"vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
|
"branch": "main",
|
||||||
"vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
|
"commit": "f66b3e7f45d325bd556cd785502761e583971920"
|
||||||
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
|
},
|
||||||
"vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" },
|
"fennel.vim": {
|
||||||
"vim-gitgutter": { "branch": "main", "commit": "21c977e8597c468c7dc76001389b0b430d46a4b0" },
|
"branch": "main",
|
||||||
"vim-pathogen": { "branch": "master", "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" },
|
"commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e"
|
||||||
"vim-rails": { "branch": "master", "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" },
|
},
|
||||||
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
|
"lazy.nvim": {
|
||||||
"vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" },
|
"branch": "main",
|
||||||
"vim-solarized8": { "branch": "neovim", "commit": "1d05915cc9050ce1a8a6b94d8c2e48ead197c756" },
|
"commit": "306a05526ada86a7b30af95c5cc81ffba93fef97"
|
||||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
},
|
||||||
"vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" },
|
"lsp-colors.nvim": {
|
||||||
"vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
|
"branch": "main",
|
||||||
"vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" },
|
"commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5"
|
||||||
"vim-vsnip-integ": { "branch": "master", "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" },
|
},
|
||||||
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
|
"mason-lspconfig.nvim": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245"
|
||||||
|
},
|
||||||
|
"mason-update-all": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "332aa2586295f93a32643eb2b580f899458215a1"
|
||||||
|
},
|
||||||
|
"mason.nvim": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "fc98833b6da5de5a9c5b1446ac541577059555be"
|
||||||
|
},
|
||||||
|
"neo-tree.nvim": {
|
||||||
|
"branch": "v3.x",
|
||||||
|
"commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e"
|
||||||
|
},
|
||||||
|
"nfnl": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "ac0177c5549df7abba7a19554c18a7765386c894"
|
||||||
|
},
|
||||||
|
"nui.nvim": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "de740991c12411b663994b2860f1a4fd0937c130"
|
||||||
|
},
|
||||||
|
"nvim-autopairs": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5"
|
||||||
|
},
|
||||||
|
"nvim-cmp": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca"
|
||||||
|
},
|
||||||
|
"nvim-lspconfig": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "8a9378a822719346a0288fa004dab302ca3c0a8f"
|
||||||
|
},
|
||||||
|
"nvim-notify": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "8701bece920b38ea289b457f902e2ad184131a5d"
|
||||||
|
},
|
||||||
|
"nvim-treesitter": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "4916d6592ede8c07973490d9322f187e07dfefac"
|
||||||
|
},
|
||||||
|
"nvim-web-devicons": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6"
|
||||||
|
},
|
||||||
|
"paredit": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5"
|
||||||
|
},
|
||||||
|
"plenary.nvim": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "74b06c6c75e4eeb3108ec01852001636d85a932b"
|
||||||
|
},
|
||||||
|
"popup.nvim": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac"
|
||||||
|
},
|
||||||
|
"rainbow-delimiters.nvim": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2"
|
||||||
|
},
|
||||||
|
"telescope.nvim": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "5255aa27c422de944791318024167ad5d40aad20"
|
||||||
|
},
|
||||||
|
"toggleterm.nvim": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "9a88eae817ef395952e08650b3283726786fb5fb"
|
||||||
|
},
|
||||||
|
"vim-dadbod": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770"
|
||||||
|
},
|
||||||
|
"vim-dispatch": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f"
|
||||||
|
},
|
||||||
|
"vim-fugitive": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0"
|
||||||
|
},
|
||||||
|
"vim-git": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "485e38f29494e46a9998100e707c755d114155f1"
|
||||||
|
},
|
||||||
|
"vim-gitgutter": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "21c977e8597c468c7dc76001389b0b430d46a4b0"
|
||||||
|
},
|
||||||
|
"vim-pathogen": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4"
|
||||||
|
},
|
||||||
|
"vim-rails": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67"
|
||||||
|
},
|
||||||
|
"vim-repeat": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "65846025c15494983dafe5e3b46c8f88ab2e9635"
|
||||||
|
},
|
||||||
|
"vim-rhubarb": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "5496d7c94581c4c9ad7430357449bb57fc59f501"
|
||||||
|
},
|
||||||
|
"vim-solarized8": {
|
||||||
|
"branch": "neovim",
|
||||||
|
"commit": "1d05915cc9050ce1a8a6b94d8c2e48ead197c756"
|
||||||
|
},
|
||||||
|
"vim-surround": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "3d188ed2113431cf8dac77be61b842acb64433d9"
|
||||||
|
},
|
||||||
|
"vim-unimpaired": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "db65482581a28e4ccf355be297f1864a4e66985c"
|
||||||
|
},
|
||||||
|
"vim-vinegar": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6"
|
||||||
|
},
|
||||||
|
"vim-vsnip": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "9bcfabea653abdcdac584283b5097c3f8760abaa"
|
||||||
|
},
|
||||||
|
"vim-vsnip-integ": {
|
||||||
|
"branch": "master",
|
||||||
|
"commit": "c7c93934dece8315db3649bdc6898b76358a8b8d"
|
||||||
|
},
|
||||||
|
"which-key.nvim": {
|
||||||
|
"branch": "main",
|
||||||
|
"commit": "3aab2147e74890957785941f0c1ad87d0a44c15a"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -8,10 +8,10 @@ local function zoom_toggle()
|
|||||||
return nil
|
return nil
|
||||||
else
|
else
|
||||||
unzoom_21 = vim.fn.winrestcmd()
|
unzoom_21 = vim.fn.winrestcmd()
|
||||||
vim.fn.resize()
|
vim.cmd.resize()
|
||||||
return vim.fn.vertical("resize")
|
return vim.cmd.resize({mods = {vertical = true}})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
vim.api.nvim_create_user_command("ZoomToggle", zoom_toggle, {})
|
vim.api.nvim_create_user_command("ZoomToggle", zoom_toggle, {})
|
||||||
u.nnoremap("<M-z>", ":call ZoomToggle()<CR>")
|
local wk = require("which-key")
|
||||||
return u.tnoremap("<M-z>", "<c-\\><c-n>:call ZoomToggle()<CR>")
|
return wk.add({{{"<M-z>", zoom_toggle, desc = "Toggle zoom of buffer window"}}, {{"<M-z>", zoom_toggle, desc = "Toggle zoom of buffer window", mode = {"n", "t"}}}})
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
-- [nfnl] fnl/plugins/todo-comments.fnl
|
||||||
|
return {"folke/todo-comments.nvim", dependencies = {"nvim-lua/plenary.nvim"}, opts = {lazy = false}}
|
||||||
Reference in new issue
Block a user