MAINT: macos catalina (#4)

This commit is contained in:
Matthew Ryan Dillon 2020-01-22 15:21:23 -07:00 committed by GitHub
parent 83cc9a195e
commit 98c89a360d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 28 deletions

View file

@ -1,39 +1,37 @@
# Dotfiles # Dotfiles
```bash ```bash
$ sudo zypper install \
the_silver_searcher \
cmus \
ctags \
docker \
gcc \
git \
htop \
mr \
nodejs10 \
postgresql \
postgresql-server \
postgresql-devel \
tlp \
tmux \
tree \
vim \
wget \
xz \
zsh
$ git clone https://github.com/thermokarst/dotfiles.git ~/.dotfiles $ git clone https://github.com/thermokarst/dotfiles.git ~/.dotfiles
$ cd ~/.dotfiles $ cd ~/.dotfiles
$ git remote rename origin thermokarst $ git remote rename origin thermokarst
$ sudo chsh $USER -s zsh $ sudo bash -c "echo nix /System/Volumes/Data/nix | tr ' ' '\t' >> /etc/synthetic.conf"
$ sudo mkdir /System/Volumes/Data/nix
$ sudo chown $USER /System/Volumes/Data/nix
# REBOOT
$ git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell $ git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell
$ git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto" $ git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
$ ./install $ ./install
$ curl https://nixos.org/nix/install | sh
$ source ~/.zshrc
$ nix-env -i \
alacritty \
docker \
git \
htop \
mr \
postgresql \
silver-searcher \
tmux \
vim \
wget \
xz
$ base16_ashes
$ curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim $ curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
$ vim +PlugInstall $ vim +PlugInstall
$ mr checkout $ mr checkout
$ wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh $ wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
$ sudo sh Miniconda3-latest-Linux-x86_64.sh # install to /opt/miniconda3 $ sudo sh Miniconda3-latest-MacOSX-x86_64.sh -p /opt/miniconda3 -b
$ sudo conda update conda $ sudo conda update conda
$ wget https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py36-linux-conda.yml $ wget https://raw.githubusercontent.com/qiime2/environment-files/master/latest/staging/qiime2-latest-py36-osx-conda.yml
$ conda env create -n q2dev --file qiime2-latest-py36-linux-conda.yml $ conda env create -n q2dev --file qiime2-latest-py36-osx-conda.yml
``` ```

View file

@ -9,7 +9,6 @@ window:
scrolling: scrolling:
history: 10000 history: 10000
multiplier: 3 multiplier: 3
faux_multiplier: 3
auto_scroll: false auto_scroll: false
tabspaces: 8 tabspaces: 8
font: font:

View file

@ -50,5 +50,7 @@
la = "!git config -l | grep alias | cut -c 7-" la = "!git config -l | grep alias | cut -c 7-"
[push] [push]
default = upstream default = upstream
[credential]
helper = osxkeychain
[pull] [pull]
rebase = true rebase = true

2
vimrc
View file

@ -17,8 +17,6 @@ call plug#begin()
Plug 'mustache/vim-mustache-handlebars' Plug 'mustache/vim-mustache-handlebars'
" the silver searcher " the silver searcher
Plug 'mileszs/ack.vim' Plug 'mileszs/ack.vim'
" ctag generation
Plug 'jsfaint/gen_tags.vim'
" fzf setup " fzf setup
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
call plug#end() call plug#end()

View file

@ -2,6 +2,12 @@
# Defines environment variables. # Defines environment variables.
# #
#
# Nix
#
export NIX_IGNORE_SYMLINK_STORE=1
# #
# Browser # Browser
# #

View file

@ -6,6 +6,10 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
fi fi
if [[ -s "${HOME}/.nix-profile/etc/profile.d/nix.sh" ]]; then
source $HOME/.nix-profile/etc/profile.d/nix.sh
fi
if [[ -s "/opt/miniconda3/etc/profile.d/conda.sh" ]]; then if [[ -s "/opt/miniconda3/etc/profile.d/conda.sh" ]]; then
source /opt/miniconda3/etc/profile.d/conda.sh source /opt/miniconda3/etc/profile.d/conda.sh
fi fi
@ -69,3 +73,5 @@ function back_things_up() {
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh