nvim: cosmetics; zsh: fix greset function
This commit is contained in:
parent
5bb526a1a1
commit
7d3a85940c
2 changed files with 4 additions and 9 deletions
|
@ -1,6 +1,3 @@
|
||||||
local fsize = '11'
|
|
||||||
if vim.loop.os_uname().sysname == 'Darwin' then fsize = '14' end
|
|
||||||
|
|
||||||
vim.o.modeline = false
|
vim.o.modeline = false
|
||||||
vim.o.foldmethod = 'marker'
|
vim.o.foldmethod = 'marker'
|
||||||
vim.o.cursorline = true
|
vim.o.cursorline = true
|
||||||
|
@ -27,8 +24,6 @@ vim.o.keymap = 'russian-jcukenwintype'
|
||||||
vim.o.iminsert = 0
|
vim.o.iminsert = 0
|
||||||
vim.o.imsearch = 0
|
vim.o.imsearch = 0
|
||||||
|
|
||||||
vim.o.title = true
|
local fsize = '11'
|
||||||
vim.o.titlestring = '[%{hostname()}] %t - neovim'
|
if vim.loop.os_uname().sysname == 'Darwin' then fsize = '14' end
|
||||||
vim.o.statusline = '[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]'
|
|
||||||
|
|
||||||
vim.o.guifont = 'vcascadia:h' .. fsize
|
vim.o.guifont = 'vcascadia:h' .. fsize
|
||||||
|
|
|
@ -69,8 +69,8 @@ greset() {
|
||||||
echo "OK to reset and clean teh repo?"
|
echo "OK to reset and clean teh repo?"
|
||||||
read -sq _
|
read -sq _
|
||||||
(( $? )) && return 1
|
(( $? )) && return 1
|
||||||
/usr/bin/git clean -fd
|
command git clean -fd
|
||||||
/usr/bin/git reset --hard
|
command git reset --hard
|
||||||
}
|
}
|
||||||
|
|
||||||
if testbin diff-so-fancy; then
|
if testbin diff-so-fancy; then
|
||||||
|
|
Loading…
Reference in a new issue