🌀

git/gitignore.symlink

@@ -1,3 +1,4 @@
 artifacts/
 cache/
 .env
+.DS_Store

nvim/autoload/test/solidity/forge.vim

@@ -0,0 +1,31 @@
+if !exists('g:test#solidity#forge#file_pattern')
+ let g:test#solidity#forge#file_pattern = '\v(\.t\.sol)$'
+endif
+
+function! test#solidity#forge#test_file(file) abort
+ return a:file =~ g:test#solidity#forge#file_pattern
+endfunction
+
+function! test#solidity#forge#build_position(type, position) abort
+ if a:type ==# 'nearest'
+ let nearest_test = test#base#nearest_test(a:position, g:test#solidity#patterns, {})
+
+ if !empty(nearest_test)
+ return ["test", "--match-path", a:position['file'], "--match-test", join(nearest_test['test'], ".")]
+ else
+ return ["test", "--match-path", a:position['file']]
+ endif
+ elseif a:type ==# 'file'
+ return ["test", "--match-path", a:position['file']]
+ else
+ return ["test"]
+ endif
+endfunction
+
+function! test#solidity#forge#build_args(args, color) abort
+ return a:args
+endfunction
+
+function! test#solidity#forge#executable() abort
+ return 'forge'
+endfunction

nvim/init.lua

@@ -12,7 +12,7 @@ require("lazy").setup({
  "LazyVim/LazyVim",
  import = "lazyvim.plugins",
  opts = {
- colorscheme = "zenwritten",
+ colorscheme = "zenbones",
  defaults = {
  options = false,
  keymaps = false,
@@ -22,12 +22,9 @@ require("lazy").setup({
  { import = "lazyvim.plugins.extras.lang.typescript" },
  { import = "plugins" },
 }, {
- install = { colorscheme = { "zenwritten" } },
  dev = {
  path = "~/dev",
  patterns = { "mikker" },
  fallback = true,
  },
 })
-
-require("plugin_config")

nvim/lazy-lock.json

@@ -1,71 +1,72 @@
 {
- "LazyVim": { "branch": "main", "commit": "befa6c67a4387b0db4f8421d463f5d03f91dc829" },
- "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" },
+ "LazyVim": { "branch": "main", "commit": "099fd48844c1d5ec49dc7f83162112ba70a26ad5" },
+ "LuaSnip": { "branch": "master", "commit": "58236e8b2f20de23ff35106dace9212b41d78860" },
  "alpha-nvim": { "branch": "main", "commit": "b6c7b5d9d6d2633722255abf2be3ecb8733e8d2d" },
- "catppuccin": { "branch": "main", "commit": "7c392fb5f27daa6addee050f7b7522718e8d9357" },
+ "catppuccin": { "branch": "main", "commit": "e406cf07a1573c77ab83e142cc0d8c9d798d5c81" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
  "diffconflicts": { "branch": "master", "commit": "05e8d2e935a235b8f8e6d308a46a5f028ea5bf97" },
  "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
  "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
- "friendly-snippets": { "branch": "main", "commit": "6fa50a94ba5378bb73013a6e163376d8e69bd8a5" },
- "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" },
- "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" },
+ "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" },
+ "gitsigns.nvim": { "branch": "main", "commit": "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be" },
+ "goyo.vim": { "branch": "master", "commit": "7f5d35a65510083ea5c2d0941797244b9963d4a9" },
+ "lazy.nvim": { "branch": "main", "commit": "8d18ef44e769e98a8dc974ca85275de1d8cc7c04" },
+ "limelight.vim": { "branch": "master", "commit": "86aaec1700b27618d33d6182f44691d84d2cb6e5" },
  "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
  "lush.nvim": { "branch": "main", "commit": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" },
- "mason.nvim": { "branch": "main", "commit": "5f38eca64b7ed9f8a1f997ce67f2ccc80ab80c91" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "e4badf7984f7a5f0ac7dc10657dbedbd99a82f94" },
+ "mason.nvim": { "branch": "main", "commit": "7175340eee0b1b4a86b38794d8c21fdcfa01376b" },
  "mini.ai": { "branch": "main", "commit": "ce822c6e6fe3aaf7cb29874e669b2d96febc97e5" },
  "mini.bracketed": { "branch": "main", "commit": "a27581204768d10e04ec6085243e58344141032b" },
  "mini.bufremove": { "branch": "main", "commit": "8464390c932556dbb298ccf8a7587d6ef765e94f" },
  "mini.comment": { "branch": "main", "commit": "5e8c7f75c48d958ef84ed75772b0263284c8621d" },
- "mini.pairs": { "branch": "main", "commit": "61811b4f3e29dc4926f8418dd64aebe0013914c2" },
- "neoconf.nvim": { "branch": "main", "commit": "54668cbc4c2f73151eadb361dd94b34ae61dde8e" },
- "neodev.nvim": { "branch": "main", "commit": "f081eb96d6a8dcc1835cdad1e5a46a254093cfc4" },
+ "mini.pairs": { "branch": "main", "commit": "0256717c9364ad6b5384c37b4f96fb4f7cc74867" },
+ "neoconf.nvim": { "branch": "main", "commit": "1ab01b1aa43180dcdb8bdc03e0967c1e91843bd0" },
+ "neodev.nvim": { "branch": "main", "commit": "c6b8ff8f0d261c8fb99a55ec7cc5dcf9cb928293" },
  "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" },
  "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" },
  "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" },
  "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
- "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" },
+ "nvim-lspconfig": { "branch": "master", "commit": "e0926b6abc84578f44fb8917d61cdee22188639e" },
  "nvim-notify": { "branch": "master", "commit": "9c987081390753b625e2d94e749e80e9b4a3e082" },
  "nvim-spectre": { "branch": "master", "commit": "b71b64afe9fedbfdd25a8abec897ff4af3bd553a" },
- "nvim-treesitter": { "branch": "master", "commit": "418caac89dab5a37ccaf403b3829e4eeb4124d67" },
+ "nvim-treesitter": { "branch": "master", "commit": "a0d6c28f893cbbc761cfa7fc7204ba6f3e2710cf" },
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "4b30081d2736e09f90c890a8a7adfe4df36f5b36" },
  "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" },
  "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" },
- "persistence.nvim": { "branch": "main", "commit": "d8a3eda0e19b4d5f3180fc832c25baab1709f2a1" },
+ "persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" },
  "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
  "sorbet.vim": { "branch": "master", "commit": "41fda1edd8d790aa23542f52bd18570cdf739ea3" },
  "splitjoin.vim": { "branch": "main", "commit": "e6af44293c55431d78cc2ddd4335ed68e6fcf6ed" },
  "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" },
  "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" },
- "tokyonight.nvim": { "branch": "main", "commit": "a0abe53df53616d13da327636cb0bcac3ea7f5af" },
- "trouble.nvim": { "branch": "main", "commit": "3b754285635a66a93aeb15fa71a23417d8997217" },
+ "tokyonight.nvim": { "branch": "main", "commit": "1bbba3609ef69b652184710383f47e4b66ed1d3f" },
+ "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" },
  "typescript.nvim": { "branch": "main", "commit": "f66d4472606cb24615dfb7dbc6557e779d177624" },
  "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
  "vim-abolish": { "branch": "master", "commit": "880a562ff9176773897930b5a26a496f68e5a985" },
  "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" },
  "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" },
- "vim-fugitive": { "branch": "master", "commit": "d507d00bd04794119beeb41da118774a96815b65" },
+ "vim-fugitive": { "branch": "master", "commit": "fa33145cc12003005b92d7e536025ed5833b9c4f" },
  "vim-jsx-pretty": { "branch": "master", "commit": "6989f1663cc03d7da72b5ef1c03f87e6ddb70b41" },
- "vim-projectionist": { "branch": "master", "commit": "3a088946adb24a2fac7b47f3dea97a3b99f52ddd" },
+ "vim-pencil": { "branch": "master", "commit": "5b4110dadebb756aae3d852caafbc963bb3c9a5e" },
+ "vim-projectionist": { "branch": "master", "commit": "b91a83aec446b1b13c8a2862b9778dd7b32e95da" },
  "vim-rails": { "branch": "master", "commit": "959e94b76e6ebdf984acef61649ba7d0f62bd425" },
  "vim-rake": { "branch": "master", "commit": "e08049f812d241bbc72127aeafa8afa2f6720886" },
  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
  "vim-rhubarb": { "branch": "master", "commit": "cad60fe382f3f501bbb28e113dfe8c0de6e77c75" },
  "vim-ruby": { "branch": "master", "commit": "d8ef4c3584d0403d26f69bfd0a8fc6bfe198aeee" },
- "vim-slash": { "branch": "master", "commit": "31aee09b7ea8893a18fa34f65e63e364fc998444" },
  "vim-slim": { "branch": "master", "commit": "f0758ea1c585d53b9c239177a8b891d8bbbb6fbb" },
  "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
  "vim-startuptime": { "branch": "master", "commit": "6580cf539c33a212f4f5542068a3b4dd2b3ad834" },
  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
  "vim-test": { "branch": "master", "commit": "c63b94c1e5089807f4532e05f087351ddb5a207c" },
  "vim-tmux-runner": { "branch": "master", "commit": "dc5224acd6e03f0544f10625b3e42aba37e66827" },
- "vim-togglebg": { "branch": "main", "commit": "455c2aa2885c44d9d502529e6fa63164acd647e6" },
  "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
  "vimwiki": { "branch": "dev", "commit": "fea8bee382b2051b0137fd2cacf0862823ee69b3" },
- "which-key.nvim": { "branch": "main", "commit": "6e190f4732a0f2fc517036f2fcf7727893bc5329" },
+ "which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" },
  "zenbones.nvim": { "branch": "main", "commit": "910b8c240c6aaf5263db038db81c538602c766c3" }
 }

nvim/lua/commands.lua

@@ -28,22 +28,4 @@ fun! <SID>StripTrailingWhitespaces()
  call cursor(l:l, l:c)
 endfun
 noremap <leader>S :call <SID>StripTrailingWhitespaces()<cr>
-
-" augroup vimrcEx
-" autocmd!
-"
-" " Auto-open quickfix window after grep cmds
-" autocmd QuickFixCmdPost *grep* cwindow
-"
-" " Resize windows when the terminal window size changes (from http:https://vimrcfu.com/snippet/186)
-" autocmd VimResized * wincmd =
-"
-" " Don't auto insert a comment when using O/o for a newline
-" autocmd VimEnter,BufRead,FileType * set formatoptions-=o
-"
-" " Automatically reload files when changed
-" autocmd FocusGained, BufEnter * :checktime
-" autocmd FocusGained,BufEnter,CursorHold,CursorHoldI *
-" \ if mode() == 'n' && getcmdwintype() == '' | checktime | endif
-" augroup END
 ]])

nvim/lua/config/keymaps.lua

@@ -72,27 +72,29 @@ if vim.fn.has("nvim-0.9.0") == 1 then
 end
 
 -- windows
-map("n", "<leader>ww", "<C-W>p", { desc = "Other window" })
-map("n", "<leader>wd", "<C-W>c", { desc = "Delete window" })
-map("n", "<leader>w-", "<C-W>s", { desc = "Split window below" })
-map("n", "<leader>w|", "<C-W>v", { desc = "Split window right" })
-map("n", "<leader>-", "<C-W>s", { desc = "Split window below" })
-map("n", "<leader>|", "<C-W>v", { desc = "Split window right" })
-map("n", "<leader><leader>", "<C-^>", { desc = "Previous buffer" })
+-- map("n", "<leader>ww", "<C-W>p", { desc = "Other window" })
+-- map("n", "<leader>wd", "<C-W>c", { desc = "Delete window" })
+-- map("n", "<leader>w-", "<C-W>s", { desc = "Split window below" })
+-- map("n", "<leader>w|", "<C-W>v", { desc = "Split window right" })
+-- map("n", "<leader>-", "<C-W>s", { desc = "Split window below" })
+-- map("n", "<leader>|", "<C-W>v", { desc = "Split window right" })
+map("n", "<leader><space>", "<C-^>", { desc = "Previous buffer" })
 
 -- tabs
 map("n", "<leader><tab>l", "<cmd>tablast<cr>", { desc = "Last Tab" })
 map("n", "<leader><tab>f", "<cmd>tabfirst<cr>", { desc = "First Tab" })
 map("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" })
-map("n", "<leader><tab>]", "<cmd>tabnext<cr>", { desc = "Next Tab" })
 map("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Close Tab" })
+map("n", "<leader><tab>]", "<cmd>tabnext<cr>", { desc = "Next Tab" })
 map("n", "<leader><tab>[", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
+map("n", "]w", "<cmd>tabnext<cr>", { desc = "Next Tab" })
+map("n", "[w", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
 
 -- quicksave
 map("n", "<leader>j", ":w<cr>", { desc = "Quicksave" })
 
 -- / to search <c-/> to toggle highlight
-map("n", "<c-_>", ":set hlsearch!<cr>")
+map("n", "<c-_>", ":noh<cr>")
 
 -- qq to record macro, Q to apply
 map("n", "Q", "@q")
@@ -135,7 +137,7 @@ map("i", "<c-_>", "<c-x><c-l>")
 
 -- jump to config
 map("n", "<leader>vv", ":e $MYVIMRC<cr>", { desc = "Edit vimrc" })
-map("n", "<leader>vt", ":e $MYVIMRC<cr>", { desc = "Edit vimrc in tab" })
+map("n", "<leader>vt", ":tabe $MYVIMRC<cr>", { desc = "Edit vimrc in tab" })
 
 -- <esc> goes out of insert mode in term
 map("t", "<esc>", "<c-\\><c-n>")
@@ -156,6 +158,9 @@ map("n", "<leader>ta", ":TestSuite<cr>", {silent = true})
 map("n", "<leader>tl", ":TestLast<cr>", {silent = true})
 map("n", "<leader>tg", ":TestVisit<cr>", {silent = true})
 
+map("n", "<cr>", ":Rerun<cr>", { desc = "Rerun" })
 map("n", "<leader>md", ":Rerun TestLast<cr>", { desc = "Rerun TestLast" })
 map("n", "<leader>ro", ":VtrOpenRunner<cr>", { desc = "Open Tmux runner" })
 map("n", "<leader>rk", ":VtrKillRunner<cr>", { desc = "Kill Tmux runner" })
+
+map('n', "<leader>ub", '<Cmd>lua vim.o.bg = vim.o.bg == "dark" and "light" or "dark"<CR>', { desc = "Toggle background light/dark" })

nvim/lua/config/options.lua

@@ -69,7 +69,7 @@ end
 
 local is_ui = vim.fn.has("gui_vimr") == 1 or vim.g.neovide
 
-vim.opt.guifont = { "Iosevka Light", ":h18" }
+vim.opt.guifont = { "Iosevka Nerd Font Mono", ":h18:l" }
 
 if is_ui then
  -- act as in a term

nvim/lua/plugins/colorschemes.lua

@@ -0,0 +1,8 @@
+return {
+ {
+ "mcchrish/zenbones.nvim",
+ dependencies = "rktjmp/lush.nvim",
+ lazy = false,
+ priority = 1000,
+ },
+}

nvim/lua/plugins/editor.lua

@@ -1,6 +1,4 @@
 return {
- { "mikker/vim-rerunner", dev = true },
-
  "echasnovski/mini.bracketed",
 
  -- TPOPE IS THE DEFAULT
@@ -15,11 +13,65 @@ return {
 
  "AndrewRadev/splitjoin.vim",
  "NvChad/nvim-colorizer.lua",
- "christoomey/vim-tmux-runner",
- "janko-m/vim-test",
  "junegunn/vim-easy-align",
- "junegunn/vim-slash",
  "mattn/emmet-vim",
  "mbbill/undotree",
  "whiteinge/diffconflicts",
+
+ {
+ "nvim-telescope/telescope.nvim",
+ keys = {
+ { "<leader><space>", false },
+ },
+ },
+
+ -- Rerunner/Test/Tmux
+ {
+ "mikker/vim-rerunner",
+ dev = true,
+ cmd = { "Rerun", "RerunWhat" },
+ config = function()
+ vim.g.rerunner_focus = "TestLast"
+ end,
+ },
+ {
+ "christoomey/vim-tmux-runner",
+ init = function()
+ vim.g.VtrOrientation = "h"
+ vim.g.VtrPercentage = 40
+ vim.g.VtrClearBeforeSend = false
+ end,
+ },
+ {
+ "janko-m/vim-test",
+ init = function()
+ vim.cmd([[
+" Use :TT for vim-test
+fun! TTStrategy(cmd)
+ execute 'TT ' . a:cmd
+endfun
+
+let g:test#custom_strategies = { "tt": function('TTStrategy') }
+
+if has('nvim')
+ let test#strategy = "tt"
+else
+ let test#strategy = "basic"
+endif
+
+" let test#strategy = "vtr"
+
+let test#custom_runners = {'Solidity': ['Forge']}
+
+let test#solidity#patterns = {
+ \ 'test': [
+ \ '\v^\s*function (test[^(]+)',
+ \ ],
+ \ 'namespace': [
+ \ '\v^\s*contract (\S+)',
+ \ ]
+ \ }
+]])
+ end,
+ },
 }