From 8b5764579ae3e376c9df28f1a1d110a127acd23e Mon Sep 17 00:00:00 2001
From: Zynh0722 <Zynh0722@gmail.com>
Date: Fri, 7 Apr 2023 01:14:43 -0700
Subject: [PATCH] moving stuff around

---
 after/plugin/harpoon.lua |  2 +-
 after/plugin/treesj.lua  |  6 ++---
 lua/zynh/autos.lua       | 10 +++++++-
 lua/zynh/remap.lua       |  5 ++++
 lua/zynh/set.lua         | 51 +++++++++++++++++++++++-----------------
 5 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua
index eed35ed..800e678 100644
--- a/after/plugin/harpoon.lua
+++ b/after/plugin/harpoon.lua
@@ -4,7 +4,7 @@ local ui = require("harpoon.ui")
 vim.keymap.set("n", "<leader>a", mark.add_file)
 vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
 
-vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
+vim.keymap.set("n", "<C-q>", function() ui.nav_file(1) end)
 vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
 vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
 vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
diff --git a/after/plugin/treesj.lua b/after/plugin/treesj.lua
index b0cdb89..85553cb 100644
--- a/after/plugin/treesj.lua
+++ b/after/plugin/treesj.lua
@@ -1,3 +1,3 @@
-require'treesj'.setup({
-
-})
+-- require'treesj'.setup({
+--
+-- })
diff --git a/lua/zynh/autos.lua b/lua/zynh/autos.lua
index f2ded2c..a2e0d08 100644
--- a/lua/zynh/autos.lua
+++ b/lua/zynh/autos.lua
@@ -1,5 +1,5 @@
 local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
-vim.g.netrw_list_hide = ".DS_Store"
+
 vim.api.nvim_create_autocmd('TextYankPost', {
   callback = function()
     vim.highlight.on_yank()
@@ -7,3 +7,11 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   group = highlight_group,
   pattern = '*',
 })
+
+-- vim.cmd [[
+--     autocmd TermOpen * startinsert
+-- ]]
+
+vim.api.nvim_create_autocmd("TermOpen", {
+    command = "startinsert"
+})
diff --git a/lua/zynh/remap.lua b/lua/zynh/remap.lua
index ca3a88a..3cdb9b6 100644
--- a/lua/zynh/remap.lua
+++ b/lua/zynh/remap.lua
@@ -35,3 +35,8 @@ vim.keymap.set("n", "<leader>r", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><
 
 -- make current file executable
 vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
+
+vim.keymap.set("n", "<C-h>", "<C-w>h")
+vim.keymap.set("n", "<C-j>", "<C-w>j")
+vim.keymap.set("n", "<C-k>", "<C-w>k")
+vim.keymap.set("n", "<C-l>", "<C-w>l")
diff --git a/lua/zynh/set.lua b/lua/zynh/set.lua
index ae80410..1589b8f 100644
--- a/lua/zynh/set.lua
+++ b/lua/zynh/set.lua
@@ -1,36 +1,43 @@
-vim.opt.nu = true
-vim.opt.relativenumber = true
+local opt = vim.opt
 
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
+opt.nu = true
+opt.relativenumber = true
 
-vim.opt.smartindent = true
+opt.tabstop = 4
+opt.softtabstop = 4
+opt.shiftwidth = 4
+opt.expandtab = true
+
+opt.smartindent = true
 
 -- Mouse mode
-vim.o.mouse = 'a'
+opt.mouse = 'a'
 
-vim.opt.wrap = false
+-- Make splitting more natural
+opt.splitright = true
+opt.splitbelow = true
 
-vim.opt.swapfile = false
-vim.opt.backup = false
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
-vim.opt.undofile = true
+opt.wrap = false
 
-vim.opt.hlsearch = false
-vim.opt.incsearch = true
+opt.swapfile = false
+opt.backup = false
+opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+opt.undofile = true
 
-vim.opt.termguicolors = true
+opt.hlsearch = false
+opt.incsearch = true
 
-vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
-vim.opt.isfname:append("@-@")
+opt.termguicolors = true
 
-vim.opt.updatetime = 50
+opt.scrolloff = 8
+opt.signcolumn = "yes"
+opt.isfname:append("@-@")
 
-vim.opt.colorcolumn = "80,120"
+opt.updatetime = 50
 
-vim.opt.conceallevel = 2
+opt.colorcolumn = "80,120"
+
+opt.conceallevel = 2
 
 vim.g.netrw_list_hide = ".DS_Store"
+