From 4506255eabdf61680147ad4b7b9f377524cd8b55 Mon Sep 17 00:00:00 2001
From: Philippe Zwietering <philippe.zwietering@intraffic.nl>
Date: Thu, 13 Apr 2023 16:58:34 +0200
Subject: [PATCH] Changed formatting to just use LSP ones and added some remaps

---
 after/plugin/neoformat.lua |  1 -
 lua/flip/packer.lua        |  4 +++-
 lua/flip/remap.lua         | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 after/plugin/neoformat.lua

diff --git a/after/plugin/neoformat.lua b/after/plugin/neoformat.lua
deleted file mode 100644
index 2991492..0000000
--- a/after/plugin/neoformat.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.keymap.set('n', '<leader>f', vim.cmd.Neoformat)
diff --git a/lua/flip/packer.lua b/lua/flip/packer.lua
index a7c1345..f0fc2fa 100644
--- a/lua/flip/packer.lua
+++ b/lua/flip/packer.lua
@@ -13,6 +13,7 @@ return require('packer').startup(function(use)
 	  requires = { {'nvim-lua/plenary.nvim'} }
   }
 
+  -- Color stuff
   use ({
 	'tanvirtin/monokai.nvim',
 	as = 'monokai',
@@ -21,13 +22,14 @@ return require('packer').startup(function(use)
 	end
   })
 
+  -- Miscellaneous packages that fit on a line
   use ('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
   use ('nvim-treesitter/playground')
   use ('theprimeagen/harpoon')
   use ('mbbill/undotree')
   use ('tpope/vim-fugitive')
-  use ('sbdchd/neoformat')
 
+  -- LSP stuff
   use {
 	  'VonHeikemen/lsp-zero.nvim',
 	  branch = 'v2.x',
diff --git a/lua/flip/remap.lua b/lua/flip/remap.lua
index b760350..8c8be4f 100644
--- a/lua/flip/remap.lua
+++ b/lua/flip/remap.lua
@@ -1,2 +1,14 @@
+-- Leader is space now
 vim.g.mapleader = " "
+-- Project View instead of :Ex
 vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
+
+-- Easily move up and down
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
+-- Slide lines below into the current one
+vim.keymap.set("n", "J", "mzJ`z")
+
+-- Auto formatting
+vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)