diff --git a/cli/.config/nvim/lua/settings.lua b/cli/.config/nvim/lua/settings.lua index b9f881f..741f00b 100644 --- a/cli/.config/nvim/lua/settings.lua +++ b/cli/.config/nvim/lua/settings.lua @@ -1,6 +1,3 @@ -local fsize = '11' -if vim.loop.os_uname().sysname == 'Darwin' then fsize = '14' end - vim.o.modeline = false vim.o.foldmethod = 'marker' vim.o.cursorline = true @@ -27,8 +24,6 @@ vim.o.keymap = 'russian-jcukenwintype' vim.o.iminsert = 0 vim.o.imsearch = 0 -vim.o.title = true -vim.o.titlestring = '[%{hostname()}] %t - neovim' -vim.o.statusline = '[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]' - +local fsize = '11' +if vim.loop.os_uname().sysname == 'Darwin' then fsize = '14' end vim.o.guifont = 'vcascadia:h' .. fsize diff --git a/cli/.config/zsh/functions.zsh b/cli/.config/zsh/functions.zsh index 2996bb8..898a574 100644 --- a/cli/.config/zsh/functions.zsh +++ b/cli/.config/zsh/functions.zsh @@ -69,8 +69,8 @@ greset() { echo "OK to reset and clean teh repo?" read -sq _ (( $? )) && return 1 - /usr/bin/git clean -fd - /usr/bin/git reset --hard + command git clean -fd + command git reset --hard } if testbin diff-so-fancy; then