Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for 20.04 #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
bind-key -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"

# alt-vim keys to resize panel without prefix
bind -n M-h resize-pane -L 10
Expand Down
13 changes: 6 additions & 7 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function ensure_dotfiles() {

echo "Do you want to copy the dotfiles to your home reposory?"
echo "(This may overwrite some files) Are you sure? (y/[n]) ";
read -rn reply
read -r reply
if [[ ${reply} =~ ^[YyZz]$ ]]; then
rsync --exclude '.git/' \
--exclude 'bootstrap' \
Expand Down Expand Up @@ -121,13 +121,13 @@ function ensure_vim_configuration() {
sudo apt-get -qq remove vim-tiny
fi

if is_installed vim-gnome; then
if is_installed vim-gtk3; then
echo 'vim gnome already installed. Updating vim'
sudo apt-get update -qq
sudo apt-get install --only-upgrade -qq -y vim-gnome
sudo apt-get install --only-upgrade -qq -y vim-gtk3
else
echo 'Installing vim (huge config)'
sudo apt-get install -qq vim-gnome
sudo apt-get install -qq vim-gtk3
fi
vim +PlugInstall +PlugUpdate +PlugUpgrade +qall
}
Expand Down Expand Up @@ -201,9 +201,8 @@ function ensure_packages() {
jq
meld
nmon
python-autopep8
python-dev
python-yapf
python3-autopep8
python3-yapf
python3-dev
rsync
shellcheck
Expand Down