made tab helper, relative movement

ftplugin/html.lua

@@ -1,2 +1 @@
-vim.bo.shiftwidth = 2
+require("helpers").set_tab(2)
-vim.bo.tabstop = 2

ftplugin/htmldjango.lua

@@ -1,2 +1 @@
-vim.bo.shiftwidth = 2
+require("helpers").set_tab(2)
-vim.bo.tabstop = 2

ftplugin/javascript.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/javascriptreact.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/json.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/svelte.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/text.lua

@@ -1,13 +1,7 @@
-local function local_map(mode, lhs, rhs, opts)
+local map = require("helpers").map
-	local options = { noremap = true }
-	if opts then
-		options = vim.tbl_extend("force", options, opts)
-	end
-	vim.api.nvim_buf_set_keymap(0, mode, lhs, rhs, options)
-end
 
 local function silent_map(mode, lhs, rhs)
-	local_map(mode, lhs, rhs, { silent = true })
+    map(mode, lhs, rhs, { silent = true })
 end
 
 silent_map("n", "<Up>", "gk")

ftplugin/typescript.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/typescriptreact.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/vue.lua

@@ -1,3 +1 @@
-local len = 2
+require("helpers").set_tab(2)
-vim.bo.shiftwidth = len
-vim.bo.tabstop = len

ftplugin/yaml.lua.nothanks

@@ -1,2 +1 @@
-vim.bo.shiftwidth = 4
+require("helpers").set_tab(4)
-vim.bo.tabstop = 4

init.lua

@@ -1,3 +1,2 @@
-require("packer_check")
 require("base")
 require("plugins")

lua/base.lua

@@ -1,9 +1,7 @@
 -- SHOULD NOT CONTAIN ANY SETTINGS RELATED TO EXTERNAL PLUGINS
 -- OR CUSTOM CODE YOU YOURSELF WROTE.
 
-local helpers = require("helpers")
+local map = require("helpers").map
-local map = helpers.map
-
 local opt = vim.opt
 local g = vim.g
 
@@ -53,6 +51,20 @@ map("t", "<C-Space>", [[<C-\><C-n>]])
 map("n", [[<Leader>\]], ":" .. term_command .. "<CR>")
 map("n", [[<Leader>|]], ":v" .. term_command .. "<CR>")
 
+-- Move cursor relative to visual line breaks
+local function silent_map(mode, lhs, rhs)
+    map(mode, lhs, rhs, { silent = true })
+end
+
+silent_map("n", "<Up>", "gk")
+silent_map("n", "<Down>", "gj")
+silent_map("n", "<Home>", "g<Home>")
+silent_map("n", "<End>", "g<End>")
+
+silent_map("i", "<Up>", "<C-o>gk")
+silent_map("i", "<Down>", "<C-o>gj")
+silent_map("i", "<Home>", "<C-o>g<Home>")
+silent_map("i", "<End>", "<C-o>g<End>")
 
 opt.autoindent = true
 opt.autoread = true

lua/helpers.lua

@@ -71,4 +71,9 @@ function M.lsp_config_defaults()
     }
 end
 
+function M.set_tab(length)
+    vim.bo.shiftwidth = length
+    vim.bo.tabstop = length
+end
+
 return M

lua/plugins/config.lua

@@ -36,11 +36,15 @@ function M.fzf()
     map("n", "<Leader>r", ":Rg <C-R><C-W><CR>")
     map("n", "<Leader>R", ":Rg<CR>")
     map("n", "<Leader>s", ":Lines<CR>")
-    map("n", "<Leader>gf", ":GFiles<CR>")
+    map("n", "<Leader>gl", ":GFiles<CR>")
-    map("n", "<Leader>gn", ":GFiles?<CR>")
+    map("n", "<Leader>gs", ":GFiles?<CR>")
     map("n", "<Leader>gc", ":Commits<CR>")
 end
 
+function M.fzf_checkout()
+    map("n", "<Leader>gb", ":GBranches<CR>")
+end
+
 function M.rnvimr()
     map("n", "<Leader>f", [[:RnvimrToggle<CR>]])
 end
@@ -72,10 +76,6 @@ function M.auto_session()
     })
 end
 
-function M.fzf_checkout()
-    map("n", "<Leader>gb", ":GBranches<CR>")
-end
-
 function M.indent_blankline()
     vim.opt.list = true
 

lua/plugins/init.lua

@@ -1,3 +1,4 @@
+require("plugins.install_packer")
 require("plugins.startup")
 
 local config = require("plugins.config")