Merge branch 'master' of ssh://git.blakenorth.net:6102/home/git/dotfiles
This commit is contained in:
commit
8e77bfcd60
2 changed files with 10 additions and 2 deletions
|
@ -153,6 +153,10 @@ return require('packer').startup(function()
|
||||||
require('other').autosession()
|
require('other').autosession()
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
use {
|
||||||
|
'ellisonleao/glow.nvim',
|
||||||
|
ft = { 'md', 'markdown', }
|
||||||
|
}
|
||||||
|
|
||||||
-- Conveniences
|
-- Conveniences
|
||||||
use { -- Undo tree
|
use { -- Undo tree
|
||||||
|
|
8
.zshrc
8
.zshrc
|
@ -85,7 +85,7 @@
|
||||||
|
|
||||||
# Edit config files
|
# Edit config files
|
||||||
alias \
|
alias \
|
||||||
nvc="(cd ~/.config/nvim && nvim)" \
|
nvc="(cd ~/.config/nvim/lua && nvim)" \
|
||||||
zshrc="$EDITOR ~/.zshrc" \
|
zshrc="$EDITOR ~/.zshrc" \
|
||||||
fstab="sudo $EDITOR /etc/fstab" \
|
fstab="sudo $EDITOR /etc/fstab" \
|
||||||
|
|
||||||
|
@ -158,9 +158,12 @@
|
||||||
|
|
||||||
# an improved way to manage the todo list
|
# an improved way to manage the todo list
|
||||||
todo() {
|
todo() {
|
||||||
|
(
|
||||||
cd "$(dirname "$(realpath ~/todo)")"
|
cd "$(dirname "$(realpath ~/todo)")"
|
||||||
test -d .git || git rev-parse --git-dir > /dev/null 2>&1 && echo 'pulling repository' && git pull
|
# only pull the repo if there is some argument
|
||||||
|
[ -z "$1" ] || test -d .git || git rev-parse --git-dir > /dev/null 2>&1 && echo 'pulling repository' && git pull
|
||||||
"$EDITOR" ~/todo
|
"$EDITOR" ~/todo
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Simple extraction script. Taken from manjaro's .bashrc
|
# Simple extraction script. Taken from manjaro's .bashrc
|
||||||
|
@ -317,6 +320,7 @@
|
||||||
echo 'Error: Could not `cd` into the repo'
|
echo 'Error: Could not `cd` into the repo'
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
ls
|
||||||
}
|
}
|
||||||
|
|
||||||
calc() {
|
calc() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue