Skip to content

Commit

Permalink
Various updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jorisroovers committed Sep 20, 2022
1 parent c0610bb commit 4ded45a
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 29 deletions.
7 changes: 6 additions & 1 deletion .aliases_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,13 @@ copy-dotfiles() {
# use /./ in rsync to tell rsync to copy the path from that point forward
# Thanks sir! https://serverfault.com/a/973844/166001
rsync --relative ~/./{.env.sh,.aliases_functions.sh,.version-managers.sh} $target
rsync --relative ~/./{.gitconfig,.gitignore_global,.joris.omp.json,.utils.py,.pdbrc,.zshrc,brew.sh,.vimrc} $target
rsync --relative ~/./{.tool-versions,.joris.omp.json,.utils.py,.zshrc,brew.sh,.vimrc} $target
# git
rsync --relative ~/./{.gitconfig,.gitignore_global} $target
# python
rsync --relative ~/./{.pdbrc,.pythonrc.py} $target
rsync --relative ~/./{.config/gh/config.yml,.ssh/assh.yml} $target
# vscode
rsync --relative ~/Library/Application\ Support/Code\ -\ Insiders/User/{settings,keybindings}.json $target/vscode
}

Expand Down
1 change: 1 addition & 0 deletions .env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export PATH
export PIP_REQUIRE_VIRTUALENV=true
# Use pdbr for debugging:
export PYTHONBREAKPOINT=pdbr.set_trace
export PYTHONSTARTUP="$HOME/.pythonrc.py"

### MISC ###############################################################################################################

Expand Down
4 changes: 4 additions & 0 deletions .gitignore_global
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.DS_Store
.idea
.vagrant

# VS Code
.vscode
*.code-workspace

# asdf
.tool-versions
10 changes: 10 additions & 0 deletions .pythonrc.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from rich import pretty
from rich import inspect
from rich.pretty import pprint

pretty.install()

# You can also define functions:
# def myfunc(foo):
# print("myfunc:", foo)
# return foo
5 changes: 4 additions & 1 deletion .version-managers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*

# pyenv (Python): https://github.com/pyenv/pyenv
eval "$(pyenv init -)"
# eval "$(pyenv init -)"

# ASDF (version manager to rule them all!): https://asdf-vm.com/
[[ -s "$(brew --prefix asdf)/libexec/asdf.sh" ]] && source "$(brew --prefix asdf)/libexec/asdf.sh"

# sdkman (Java): https://sdkman.io/
export SDKMAN_DIR="$HOME/.sdkman"
Expand Down
60 changes: 35 additions & 25 deletions brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,62 @@
# Cleaned output of `brew list --full-name -1`
# List with libraries removed:
# brew list --full-name -1 | grep -v "^lib"

# Modern command replacements
bat # cat
dog # dig
dust # du
fd # find
lsd # ls
ripgrep # grep
sd # sed
assh # ssh

# Other essentials
vim
jq
tree
pstree
fzf
git
git-delta
watch
wget


# Python
pipx
poetry
pyenv

# Data manipulation
jless
miller
xsv


ansible
assh
bat
desk
dive
dog
dust
fd
ffmpeg
fx
fzf
gh
git
git-delta
go
gping
hexyl
htop
hyperfine
jless
jq
kubernetes-cli
lsd
miller
mosh
navi
node
openldap
pipx
poetry
pstree
pyenv
rich-cli
ripgrep
ruby
sd
tree
vim
watch
websocat
wget
xsv
xz
font-hack-nerd-font
wireshark
eddieantonio/eddieantonio/imgcat
saulpw/vd/visidata
font-hack-nerd-font

font-hack-nerd-font
3 changes: 2 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install_brew_package jq
install_brew_package gh
install_brew_package ripgrep
install_brew_package oh-my-posh
install_brew_package fzf

# Nerd-font installation doesn't work via homebrew on linux (only on macOS),
# but oh-my-posh provides a way to install it easily :-)
Expand All @@ -30,6 +31,6 @@ ln -fs $PWD/{.vimrc,.vimhelp} ~
ln -fs $PWD/{.utils.py,.aliases_functions.sh} ~
ln -fs $PWD/.joris.omp.json ~
ln -fs $PWD/{.bash_profile,.env.sh} ~
ln -fs $PWD/{.gitconfig,.gitignore_global} ~
ln -fs $PWD/{.gitconfig,.gitignore_global,.gituserinfo} ~
ln -fs $PWD/.ssh/assh.yml ~/.ssh
ln -fs $PWD/.config/gh/config.yml ~/.config/gh/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
},
"workbench.editor.limit.enabled": true,
"workbench.editor.limit.value": 5,
"python.languageServer": "Default",
"python.languageServer": "Pylance",
"workbench.editorAssociations": {
"*.ipynb": "jupyter-notebook"
},
Expand Down

0 comments on commit 4ded45a

Please sign in to comment.