From 70c581dc19f5ff114931381d91d37de4a1bc4ffe Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 1 Oct 2021 01:33:07 -0700
Subject: [PATCH 1/2] git: add no rebase setting to always automatically merge
 when pulling

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 308b64c..5b83e8a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,7 @@
 [credential]
 	helper = store
+[pull]
+   rebase = false
 [user]
 	email = blakelysnorth@gmail.com
 	name = PowerUser64

From 5899ea7937e8e4d3ed0437eaaef10fbb5aeba5e0 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 1 Oct 2021 01:34:19 -0700
Subject: [PATCH 2/2] nvim: Formatting, and repositioning

---
 .config/nvim/lua/blake/settings.lua | 75 ++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/.config/nvim/lua/blake/settings.lua b/.config/nvim/lua/blake/settings.lua
index e26c54f..37bca11 100644
--- a/.config/nvim/lua/blake/settings.lua
+++ b/.config/nvim/lua/blake/settings.lua
@@ -88,9 +88,36 @@ vim.cmd [[
    vnoremap J :m '>+1<CR>gv=gv
    vnoremap K :m '<-2<CR>gv=gv
 
-  " Make vim a hex editor
-  " Edit *.bin files as binaries rather than text files (if your file isn't a .bin,
-  " make a symlink that points to it with the .bin extension and edit the symlink ;)
+  " Format text with Q, rather than gw
+   nnoremap Q gw
+
+   colorscheme slate
+]]
+
+-- 24-bit color
+vim.cmd [[
+   "Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
+   "If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
+   "(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
+   if (empty($TMUX))
+      if (has("nvim"))
+         "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
+         let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+      endif
+      "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
+      "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
+      " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
+      if (has("termguicolors"))
+         "set termguicolors
+      endif
+   endif
+]]
+
+
+-- Make vim a hex editor
+-- Edit *.bin files as binaries rather than text files (if your file isn't a .bin,
+-- make a symlink that points to it with the .bin extension and edit the symlink ;)
+vim.cmd [[
 	augroup Binary
 	   au!
 	   au BufReadPre  *.bin let &bin=1
@@ -101,38 +128,28 @@ vim.cmd [[
 	   au BufWritePost *.bin if &bin | %!xxd
 	   au BufWritePost *.bin set nomod | endif
 	augroup END
-
-   colorscheme slate
-]]
-
-vim.cmd [[
-""""""" Quality of life things that aren't one line (also from stack overflow and stuff)
-"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
-"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
-"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
-if (empty($TMUX))
-if (has("nvim"))
-"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
-let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-endif
-"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
-"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
-" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
-if (has("termguicolors"))
-set termguicolors
-endif
-endif
 ]]
 
 -- 'Visual At' plugin (https://github.com/stoeffel/.dotfiles/blob/master/vim/visual-at.vim)
+-- basically, record a macro, select some lines, then run it, and the macro
+-- will be executed on all visual selected lines individually
 vim.cmd [[
-xnoremap @ :<C-u>call ExecuteMacroOverVisualRange()<CR>
-function! ExecuteMacroOverVisualRange()
-echo "@".getcmdline()
-execute ":'<,'>normal @".nr2char(getchar())
-endfunction
+   xnoremap @ :<C-u>call ExecuteMacroOverVisualRange()<CR>
+   function! ExecuteMacroOverVisualRange()
+   echo "@".getcmdline()
+   execute ":'<,'>normal @".nr2char(getchar())
+   endfunction
 ]]
 
 -- Automatically jump to the last position in a file when opening
 vim.cmd [[ au BufReadPost * if expand('%:p') !~# '\m/\.git/' && line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif ]]
 
+-- Highlight trailing whitespace in red
+vim.cmd [[
+   highlight ExtraWhitespace ctermbg=red guibg=red
+   match ExtraWhitespace /\s\+$/
+   au BufWinEnter * match ExtraWhitespace /\s\+$/
+   au InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+   au InsertLeave * match ExtraWhitespace /\s\+$/
+   au BufWinLeave * call clearmatches()
+]]