3 files changed, 90 insertions, 9 deletions
diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua
index 56d0ed8..7e75489 100644
--- a/lua/config/mappings.lua
+++ b/lua/config/mappings.lua
@@ -1,7 +1,65 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = "\\"
 
-vim.keymap.set({"n","v"},"j","<up>")
-vim.keymap.set({"n","v"},"k","<down>")
-vim.keymap.set({"n","v"},"l","<left>")
-vim.keymap.set({"n","v"},";","<right>")
+vim.keymap.set({ "n", "v" }, "h", ";")
+
+-- Motions
+vim.keymap.set({ "n", "v" }, "j", "<up>")
+vim.keymap.set({ "n", "v" }, "k", "<down>")
+vim.keymap.set({ "n", "v" }, "l", "<left>")
+vim.keymap.set({ "n", "v" }, ";", "<right>")
+
+-- Move lines
+vim.keymap.set("n", "mj", ":move -2<cr>")
+vim.keymap.set("n", "mk", ":move +1<cr>")
+
+vim.keymap.set("v", "mj", ":move '<-2<cr>gv=gv")
+vim.keymap.set("v", "mk", ":move '>+1<cr>gv=gv")
+
+-- Move Characters
+vim.keymap.set("n", "ml", "Xp<left>")
+vim.keymap.set("n", "m;", "xp")
+
+-- Select windows
+vim.keymap.set("n", "<leader>j", ":wincmd k<cr>")
+vim.keymap.set("n", "<leader>k", ":wincmd j<cr>")
+vim.keymap.set("n", "<leader>l", ":wincmd h<cr>")
+vim.keymap.set("n", "<leader>;", ":wincmd l<cr>")
+
+-- Move windows
+vim.keymap.set("n", "<leader>J", ":wincmd K<cr>")
+vim.keymap.set("n", "<leader>K", ":wincmd J<cr>")
+vim.keymap.set("n", "<leader>L", ":wincmd H<cr>")
+vim.keymap.set("n", "<leader:", ":wincmd L<cr>")
+
+-- Split windows
+vim.keymap.set("n", "<leader>\\", ":vsplit<cr>")
+vim.keymap.set("n", "<leader>-", ":split<cr>")
+
+-- Switch buffers
+vim.keymap.set("n", "<leader>[", ":bprevious<cr>")
+vim.keymap.set("n", "<leader>]", ":bnext<cr>")
+
+-- Whitespace
+vim.keymap.set("n", "<leader><space>", ":set list!<cr>")
+
+-- Toggle tabs/spaces
+vim.keymap.set("n", "<leader>=", ":set noexpandtab! | %retab!<cr>")
+
+-- Number line
+vim.keymap.set("n", "<leader>n", ":set number! relativenumber!<cr>")
+
+-- Buffer Actions
+vim.keymap.set("n", "<leader>w", ":write<cr>")
+vim.keymap.set("n", "<leader>q", ":quit<cr>")
+vim.keymap.set("n", "<leader>x", ":xit<cr>")
+vim.keymap.set("n", "<leader>a", ":qall<cr>")
+vim.keymap.set("n", "<leader>z", "ZZ")
+
+-- Command
+vim.keymap.set("n", "<leader><return>", ":")
+
+-- Tabs
+vim.keymap.set("n", "<leader><tab>", ":tabnext<cr>")
+vim.keymap.set("n", "<leader>t", ":tabnew<cr>")
+
diff --git a/lua/config/settings.lua b/lua/config/settings.lua
index 8d5a321..9f42db5 100644
--- a/lua/config/settings.lua
+++ b/lua/config/settings.lua
@@ -1,4 +1,27 @@
-vim.cmd("set expandtab")
-vim.cmd("set tabstop=2")
-vim.cmd("set softtabstop=2")
-vim.cmd("set shiftwidth=2")
+vim.opt.autochdir = true
+
+-- Tabs
+vim.opt.expandtab = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+
+-- Whitespace
+vim.opt.listchars = {
+  eol = '↴',
+  tab = '➔ ',
+  trail = '~',
+  extends = '»',
+  precedes = '«',
+  space = '·'
+}
+
+-- Spelling
+vim.opt.spell = true
+vim.opt.spelllang = "en_gb"
+
+-- vim.cmd("set expandtab")
+-- vim.cmd("set tabstop=2")
+-- vim.cmd("set softtabstop=2")
+-- vim.cmd("set shiftwidth=2")
+
diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
index 92a1ef6..91a3d59 100644
--- a/lua/plugins/nvim-tree.lua
+++ b/lua/plugins/nvim-tree.lua
@@ -3,6 +3,6 @@ return {
   dependencies = { "nvim-tree/nvim-web-devicons" },
   config = true,
   keys = {
-    {"<leader><tab>", ":NvimTreeToggle<CR>"}
+    {"<leader>o", ":NvimTreeToggle<CR>"}
   }
 }