diff options
| -rw-r--r-- | .config/nvim/init.lua | 4 | ||||
| -rw-r--r-- | .config/nvim/lua/autoclose_conf.lua | 7 | ||||
| -rw-r--r-- | .config/nvim/lua/neorg_conf.lua | 8 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 15 | ||||
| -rw-r--r-- | .config/nvim/lua/settings.lua | 1 | ||||
| -rw-r--r-- | .zshrc | 5 | ||||
| -rwxr-xr-x | bin/safegit | 28 |
7 files changed, 57 insertions, 11 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index a02b752..ce6583c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -26,7 +26,6 @@ require('lspsaga_conf') require('nerdcommenter_conf') require('bqf_conf') require('autosession_conf') -require('autoclose_conf') require('buffers') require('oil_conf') require('neorg_conf') -- note taking @@ -34,6 +33,3 @@ require('neorg_conf') -- note taking if vim.g.neovide then require('neovide_conf') end - ---- basic plugins setup -require('autoclose').setup() diff --git a/.config/nvim/lua/autoclose_conf.lua b/.config/nvim/lua/autoclose_conf.lua index 3417860..8b13789 100644 --- a/.config/nvim/lua/autoclose_conf.lua +++ b/.config/nvim/lua/autoclose_conf.lua @@ -1,6 +1 @@ -require("autoclose").setup({ - options = { - disable_when_touch = true, - touch_regex = "[%w(%[{]" --(alphanumeric characters or ( or [ or {)' - }, -}) + diff --git a/.config/nvim/lua/neorg_conf.lua b/.config/nvim/lua/neorg_conf.lua index 3c8b934..895122e 100644 --- a/.config/nvim/lua/neorg_conf.lua +++ b/.config/nvim/lua/neorg_conf.lua @@ -5,6 +5,14 @@ require('neorg').setup({ ["core.integrations.treesitter"] = {}, ["core.autocommands"] = {}, ["core.concealer"] = {}, + ["core.export"] = {}, + ["core.presenter"] = { + config = { + zen_mode = "zen-mode" + } + }, + ["core.tempus"] = {}, + ["core.summary"] = {}, ["core.dirman"] = { config = { workspaces = { diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 6498770..7bd8b20 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -8,6 +8,15 @@ return require('lazy').setup({ dependencies = { "luarocks.nvim" }, version = "*", -- Pin Neorg to the latest stable release }, + -- Lua + { + "folke/zen-mode.nvim", + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + } + }, 'edkolev/tmuxline.vim', 'romainl/vim-cool', -- common @@ -91,7 +100,11 @@ return require('lazy').setup({ 'rmagatti/auto-session', -- auto close delimiters because lazy - 'm4xshen/autoclose.nvim', + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + config = true, + }, 'mg979/vim-visual-multi', }) diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 5c1655c..9e54de8 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -6,6 +6,7 @@ vim.cmd([[ HOME = os.getenv("HOME") vim.g.mapleader = ' ' +vim.g.maplocalleader = ',' vim.wo.cursorline = true vim.opt.termguicolors = true @@ -142,6 +142,11 @@ export MANWIDTH=80 source ~/functions/zig.sh source ~/functions/fzf.sh + +# https://stackoverflow.com/a/14307127/11015039 +alias git=safegit +compdef safegit=git + source ~/.fzf/shell/completion.zsh source ~/.fzf/shell/key-bindings.zsh fpath=(~/code/github/zig/shell-completions $fpath) diff --git a/bin/safegit b/bin/safegit new file mode 100755 index 0000000..b5c92c0 --- /dev/null +++ b/bin/safegit @@ -0,0 +1,28 @@ +#!/bin/zsh + +set -o errexit +set -o nounset +set -o pipefail +if [[ "${TRACE-0}" == "1" ]]; then + set -o xtrace +fi + +local isforce=0 +local ispush=0 +for arg in "$@"; do + if [ "$arg" = "-f" ] || [ "$arg" = "--force" ]; then + isforce=1 + fi + + if [ "$arg" = "push" ]; then + ispush=1 + fi + + if [ "$ispush" = 1 ] && [ "$isforce" = 1 ]; then + echo "use \`--force-with-lease\` instead so you don't cause race conflicts in the repo" + return 1 + fi +done + +git "$@" + |