diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 7015f08..319a1dd 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -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" diff --git a/defaults/default-packages b/defaults/default-packages index 59b583e..5f465a5 100644 --- a/defaults/default-packages +++ b/defaults/default-packages @@ -1,7 +1,7 @@ ipython python-language-server requests -neovim +pynvim youtube-dl black poetry diff --git a/git/gitconfig b/git/gitconfig index 6310709..f888cbc 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -28,3 +28,5 @@ conflictstyle = diff3 [mergetool "vimdiff"] cmd = nvim -d $BASE $LOCAL $REMOTE +[init] + defaultBranch = main diff --git a/vim/vimrc b/vim/vimrc index 49f5ebf..5d13efa 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -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