Browse Source

Mon 12 Sep 2022 17:03:30 ACST

master
Tovi Jaeschke-Rogers 2 years ago
parent
commit
cfa7a5c274
5 changed files with 17 additions and 13 deletions
  1. +4
    -0
      .config/nvim/lua/config/general/autocmd.lua
  2. +3
    -0
      .config/nvim/lua/config/general/options.lua
  3. +7
    -1
      .config/nvim/lua/config/general/remaps.lua
  4. +3
    -1
      .config/nvim/lua/packer-plugins.lua
  5. +0
    -11
      .zshrc

+ 4
- 0
.config/nvim/lua/config/general/autocmd.lua View File

@ -14,6 +14,10 @@ local aucmd_dict = {
{ {
command = [[%s/\s\+$//e]], command = [[%s/\s\+$//e]],
}, },
{
pattern = "*.go",
command = 'GoFormat'
}
}, },
BufRead = { BufRead = {
{ {


+ 3
- 0
.config/nvim/lua/config/general/options.lua View File

@ -28,3 +28,6 @@ vim.o.smarttab = true
vim.o.formatoptions = 'tqj' vim.o.formatoptions = 'tqj'
vim.cmd[[let g:pdv_cfg_autoEndFunction = 0]] vim.cmd[[let g:pdv_cfg_autoEndFunction = 0]]
vim.o.splitbelow = true
vim.o.splitright = true

+ 7
- 1
.config/nvim/lua/config/general/remaps.lua View File

@ -25,7 +25,7 @@ vim.api.nvim_set_keymap('n', '<C-s>', '<cmd>%s//g<Left><Left>', options)
-- Navigating with guides -- Navigating with guides
vim.api.nvim_set_keymap('n', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options) vim.api.nvim_set_keymap('n', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
vim.api.nvim_set_keymap('i', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
-- vim.api.nvim_set_keymap('i', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
vim.api.nvim_set_keymap('v', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options) vim.api.nvim_set_keymap('v', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
-- Spell-check -- Spell-check
@ -45,3 +45,9 @@ vim.api.nvim_set_keymap('n', '<A-7>', '7gt', options)
vim.api.nvim_set_keymap('n', '<A-8>', '8gt', options) vim.api.nvim_set_keymap('n', '<A-8>', '8gt', options)
vim.api.nvim_set_keymap('n', '<A-9>', '9gt', options) vim.api.nvim_set_keymap('n', '<A-9>', '9gt', options)
vim.api.nvim_set_keymap('n', '<leader>gp', '<cmd>Git push<CR>', options)
vim.api.nvim_set_keymap('n', '<leader>gP', '<cmd>Git pull<CR>', options)
vim.api.nvim_set_keymap('n', '<leader>ga', '<cmd>Git add .<CR>', options)
vim.api.nvim_set_keymap('n', '<leader>gA', '<cmd>Git add<CR>', options)
vim.api.nvim_set_keymap('n', '<leader>gc', '<cmd>Git commit<CR>', options)
vim.api.nvim_set_keymap('n', '<leader>gC', '<cmd>Git commit -a<CR>', options)

+ 3
- 1
.config/nvim/lua/packer-plugins.lua View File

@ -58,7 +58,9 @@ return require('packer').startup(function()
disable = false, disable = false,
} }
use 'tpope/vim-fugitive'
use {
'tpope/vim-fugitive',
}
use 'nvim-lua/popup.nvim' use 'nvim-lua/popup.nvim'
use 'nvim-lua/plenary.nvim' use 'nvim-lua/plenary.nvim'


+ 0
- 11
.zshrc View File

@ -5,17 +5,6 @@
# Setup user specific overrides for this in ~/.zshrc. See zshbuiltins(1) # Setup user specific overrides for this in ~/.zshrc. See zshbuiltins(1)
# and zshoptions(1) for more details. # and zshoptions(1) for more details.
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/.local/bin" ] ; then
PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':')"
fi
#if [ -d "$HOME/.local/share/gem/ruby/3.0.0/bin" ]; then
# PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin"
#fi
export PATH="$PATH:$HOME/go/bin"
# Correctly display UTF-8 with combining characters. # Correctly display UTF-8 with combining characters.
if [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then if [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
setopt COMBINING_CHARS setopt COMBINING_CHARS


Loading…
Cancel
Save