From 77c9f41b4b42519fe3d9a9b896a114f1d22cdfaf Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Sat, 19 Nov 2022 18:52:39 -0700 Subject: [PATCH] Update dotfiles --- .bash_aliases | 7 ++++++- .bash_profile | 7 +++++++ .bashrc | 2 ++ .config/nvim/init.vim | 2 +- .gitconfig | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index c6058d1..71a349e 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,6 +1,11 @@ # User specific aliases and functions: # alias vim="/usr/bin/vim.gtk" -alias ls="ls -h --color=auto" +if [[ "$OSTYPE" == "darwin"* ]]; then + export LSCOLORS=ExGxBxDxCxEgEdxbxgxcxd + alias ls="ls -G" +else + alias ls="ls -h --color=auto" +fi export CC=gcc export CXX=g++ alias nv="nvim" diff --git a/.bash_profile b/.bash_profile index 9e43b11..3bebb96 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,3 +1,10 @@ source ~/.bashrc source ~/.bash_aliases . "$HOME/.cargo/env" + +# Setting PATH for Python 3.10 +# The original version is saved in .bash_profile.pysave +PATH="/Library/Frameworks/Python.framework/Versions/3.10/bin:${PATH}" +export PATH + +[[ -f ~/.bashrc ]] && source ~/.bashrc # ghcup-env \ No newline at end of file diff --git a/.bashrc b/.bashrc index 1231d2c..da78c66 100644 --- a/.bashrc +++ b/.bashrc @@ -177,3 +177,5 @@ export CMAKE_PREFIX_PATH=/opt/homebrew/Cellar/qt\@5/5.15.2 alias sshkvm4g="ssh root@172.111.1.101" alias sshkvm2g="ssh root@172.111.1.102" . "$HOME/.cargo/env" + +[ -f "/Users/joey/.ghcup/env" ] && source "/Users/joey/.ghcup/env" # ghcup-env \ No newline at end of file diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index a9a4620..8dc2181 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -901,7 +901,7 @@ dap.configurations.nim = { }, } -require('dap-python').setup('python3') +require('dap-python').setup('/opt/homebrew/bin/python3') -- If you want to use this for rust and c, add something like this: diff --git a/.gitconfig b/.gitconfig index 08176e4..cfdf48e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,6 +5,7 @@ email = jyapayne@gmail.com [core] editor = nvim + autocrlf = input [pull] rebase = false [color]