diff --git a/bashrc/ubuntu.bashrc b/bashrc/ubuntu.bashrc index d65f3d7..400a60b 100644 --- a/bashrc/ubuntu.bashrc +++ b/bashrc/ubuntu.bashrc @@ -194,3 +194,6 @@ export DOCKER_BUILDKIT=1 # direnv eval "$(direnv hook bash)" + +# Don't install gems globally, that would be chaos for file permissions +export GEM_HOME="$HOME/.gems" PATH="$HOME/.gems/bin:$PATH" diff --git a/bin/synchorize-dotfiles b/bin/synchorize-dotfiles new file mode 100755 index 0000000..ec8ee53 --- /dev/null +++ b/bin/synchorize-dotfiles @@ -0,0 +1,14 @@ +#!/bin/bash + +set -exu # WARNING: Chaos ahead! + +DOTFILES_HOME=${DOTFILES_HOME:-"$HOME/.dotfiles"} +DOTFILES_SYNC_COMMIT_MSG="Synchorized userland configuration to personal GitHub dotfiles repo" + +if [[ $SKIP_REBASE_STEP == "" ]]; then + git -C "$DOTFILES_HOME" pull --rebase --progress --verbose # Attempt to rebase from upstream remote. +fi + +git -C "$DOTFILES_HOME" add . --verbose # Add everything +git -C "$DOTFILES_HOME" commit --verbose --signoff --gpg-sign -m "$DOTFILES_SYNC_COMMIT_MSG" # Use an predefined commit message btw. +git -C "$DOTFILES_HOME" push --verbose --progress # ..and push to prod! diff --git a/gitconfig/linux b/gitconfig/linux index 5b0ee81..29a78f7 100644 --- a/gitconfig/linux +++ b/gitconfig/linux @@ -44,3 +44,8 @@ stage = "add" unstage = "restore --staged" stats = "status" +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/nanorc/config/linux.nanorc b/nanorc/config/linux.nanorc index 16aa459..7396675 100644 --- a/nanorc/config/linux.nanorc +++ b/nanorc/config/linux.nanorc @@ -7,3 +7,6 @@ include /usr/share/nano/extra/*.nanorc # enable multibuffer stuff set multibuffer + +# enable soft line wrap, because I don't want to zoom all way out +set softwrap diff --git a/ssh-client/ubuntu b/ssh-client/ubuntu index 858c223..acc9fc4 100644 --- a/ssh-client/ubuntu +++ b/ssh-client/ubuntu @@ -1,4 +1,4 @@ -# My VMs +# My VMs, through Virtualbox Host ubuntu-vm Hostname localhost Port 1222 @@ -10,12 +10,16 @@ Host bshq User shitfuckery IdentityFile ~/.ssh/github-personal +# Git hosts, as usual Host gitlab.com User git IdentityFile ~/.ssh/launchpad Host github.com User git IdentityFile ~/.ssh/launchpad +Host gitlab.alpinelinux.org + User git + IdentityFile ~/.ssh/launchpad # Launchpad.net SSH keys for mirroring some repos manually, # partularly the gitlab.com:termux-package-android5x/src.git repo @@ -32,3 +36,4 @@ Host ghost-localhost Hostname 10.29.113.229 User ubuntu IdentityFile ~/.ssh/github-personal + diff --git a/zshrc/ubuntu.zshrc b/zshrc/ubuntu.zshrc index 8224eca..0ecd372 100644 --- a/zshrc/ubuntu.zshrc +++ b/zshrc/ubuntu.zshrc @@ -57,15 +57,19 @@ HIST_STAMPS="mm/dd/yyyy" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git command-not-found git-flow git-prompt nvm) +plugins=( + git + command-not-found + git-flow + git-prompt + nvm + zsh_reload +) source $ZSH/oh-my-zsh.sh ### Oh My ZSH configuration ends here ### -# You may need to manually set your language environment -export LANG=en_US.UTF-8 - # for WSL stuff only, see https://github.com/microsoft/WSL/issues/4029 # and https://unix.stackexchange.com/questions/257061/gentoo-linux-gpg-encrypts-properly-a-file-passed-through-parameter-but-throws-i/257065#257065 export GPG_TTY=$(tty) @@ -178,3 +182,6 @@ export PYENV_ROOT="$HOME/.pyenv" [ -d "$PYENV_ROOT" ] && export PATH="$PYENV_ROOT/bin:$PATH" \ && eval "$(pyenv init -)" \ && eval "$(pyenv init --path)" + +# Don't install gems globally, that would be chaos for file permissions +export GEM_HOME="$HOME/.gems" PATH="$HOME/.gems/bin:$PATH"