This commit is contained in:
Anthony Cicchetti 2020-07-27 16:50:55 -04:00
parent 6a25ea8c08
commit ea1263e2a3
4 changed files with 7 additions and 4 deletions

View file

@ -88,7 +88,7 @@ font:
style: Medium Italic
# Point size
size: 18.0
size: 12.0
# Offset is the extra space around each character. `offset.y` can be thought of
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@ -284,7 +284,7 @@ live_config_reload: true
# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
# Entries in `shell.args` are passed unmodified as arguments to the shell.
shell:
program: /usr/local/bin/zsh
program: /usr/bin/zsh
args:
- --login
# - "sleep 1 && tmux new -A -s DefaultSession"

View file

@ -1,7 +1,7 @@
ipython
python-language-server
requests
neovim
pynvim
youtube-dl
black
poetry

View file

@ -28,3 +28,5 @@
conflictstyle = diff3
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE
[init]
defaultBranch = main

View file

@ -4,7 +4,8 @@ if empty(glob('~/.config/nvim/autoload/plug.vim'))
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
let g:pyxversion = 'python3'
let g:loaded_python_provider = 0
let g:pyxversion = '3'
set number
set relativenumber