Skip to content

Commit

Permalink
adding more nvim stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Motevasselani committed Jun 4, 2024
1 parent 3fad529 commit ccbc503
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 1 deletion.
4 changes: 3 additions & 1 deletion config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
"vim-test": { "branch": "master", "commit": "6acc7d96487abaaa57a19b0d43efaea6633d6bb7" },
"vimux": { "branch": "master", "commit": "f7c41607d9246ec4b6cc28587cce84d75d106e3e" }
}
6 changes: 6 additions & 0 deletions config/nvim/lua/plugins/neotree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ return {
"MunifTanjim/nui.nvim",
},
config = function()
require("neo-tree").setup({
close_if_last_window = true,
})
vim.keymap.set("n", "<C-n>", ":Neotree filesystem reveal left<CR>", {})



end,
}
12 changes: 12 additions & 0 deletions config/nvim/lua/plugins/vim-test.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
return {
"vim-test/vim-test",
dependencies = {
"preservim/vimux"
},
vim.keymap.set('n', '<leader>t', ':TestNearest<CR>'),
vim.keymap.set('n', '<leader>T', ':TestFile<CR>'),
vim.keymap.set('n', '<leader>a', ':TestSuite<CR>'),
vim.keymap.set('n', '<leader>l', ':TestLast<CR>'),
vim.keymap.set('n', '<leader>g', ':TestVisit<CR>'),
vim.cmd("let test#strategy = 'vimux'"),
}
28 changes: 28 additions & 0 deletions config/nvim/lua/vim-options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,32 @@ vim.cmd("set expandtab")
vim.cmd("set tabstop=2")
vim.cmd("set softtabstop=2")
vim.cmd("set shiftwidth=2")
vim.cmd("map s <Nop>")


vim.keymap.set("n", "<Space>", "<Nop>", { silent = true, remap = false })
vim.g.mapleader = " "


-- vim.keymap.set("n", "<M-h>", "<Nop>", { silent = true, remap = true })

-- vim.cmd("nnoremap <M-p> :echom 'p'<cr>")
-- vim.cmd("nnoremap <M-h> :wincmd h<cr>")
-- vim.cmd("nnoremap <M-j> :wincmd j<cr>")
-- vim.cmd("nnoremap <M-k> :wincmd k<cr>")
-- vim.cmd("nnoremap <M-l> :wincmd l<cr>")


vim.keymap.set('n', '<C-h>', ':wincmd h<CR>')
vim.keymap.set('n', '<C-j>', ':wincmd j<CR>')
vim.keymap.set('n', '<C-k>', ':wincmd k<CR>')
vim.keymap.set('n', '<C-l>', ':wincmd l<CR>')
-- vim.keymap.set('n', '<M-h>', ':wincmd h<CR>')
-- vim.keymap.set('n', '<M-j>', ':wincmd j<CR>')
-- vim.keymap.set('n', '<M-k>', ':wincmd k<CR>')
-- vim.keymap.set('n', '<M-l>', ':wincmd l<CR>')

vim.keymap.set('n', '<leader>h', ':nohlsearch<CR>')



0 comments on commit ccbc503

Please sign in to comment.