From d8f8e42d36ef2283b66dec1377205dfa94634518 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Fri, 10 May 2019 09:31:59 -0600 Subject: [PATCH] Update files --- .bash_aliases | 24 +----------------------- .config/nvim/init.vim | 3 ++- .gitconfig | 2 +- .profile | 27 +++++++++++++++++++++++++++ .vimrc | 1 + 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 50f2434..6127c7a 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,23 +1,3 @@ -export PATH=/usr/lib/dart/bin:$HOME/.local/bin:/snap/bin:/usr/local/gradle/gradle-4.6/bin:/usr/local/kotlinc/bin:/usr/local/android-studio/bin:$HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin:/usr/sbin:/local/bin:/usr/local/bin:/sbin:/usr/games:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/android-sdk -export PATH=$PATH:$HOME/.cargo/bin:$HOME/yuzu/:$HOME/.nimble/bin:$HOME/nimlibs -export PATH=$PATH:$HOME/gcclibs/aarch64-linux-gnu/bin:$HOME/gcclibs/arm-linux-gnueabi/bin -export PATH=$HOME/android-studio/bin:$HOME/.pub-cache/bin:$HOME/flutter/bin:$PATH -export LD_LIBRARY_PATH=$HOME/Qt/5.12.0/gcc_64/lib:$LD_LIBRARY_PATH -export GOROOT=/usr/local/go -export GOBIN=$GOROOT/bin -export ANDROID_HOME=$HOME/Android/Sdk -export PATH=$PATH:/usr/local/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools -export DEVKITPRO=/opt/devkitpro -export DEVKITARM=${DEVKITPRO}/devkitARM -export DEVKITA64=${DEVKITPRO}/devkitA64 -export PATH=$PATH:$DEVKITA64/bin:$DEVKITPRO/tools/bin -export JAVA_HOME=/usr/lib/jvm/default-java -export PATH=$HOME/.opam/4.05.0/bin:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin:$PATH -export LD_LIBRARY_PATH="$HOME/Qt/5.12.0/gcc_64/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH:/lib:/usr/lib:/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu" -export LFS=/mnt/lfs -export PYTHONSTARTUP="$HOME/.pythonstartup" -export ANT_OPTS="-Xmx1024m -XX:MaxPermSize=256m" -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" # User specific aliases and functions: # alias vim="/usr/bin/vim.gtk" alias ls="ls -h --color=auto" @@ -34,9 +14,6 @@ alias tcat='highlight -O ansi --force' alias dc="docker-compose" -export WINEPREFIX=~/.WineItunes -export WINEARCH=win32 - PS1="\n\[\e[30;01m\](\[\e[31;01m\]\w\[\e[30;01m\])\[\e[30;1m\]\n\[\e[30;1m\](\[\e[34m\]\$(/bin/date +'%a %b %e %-I:%M:%S %Z %Y')\[\e[30;1m\])\n\[\e[30;1m\](\[\e[32;1m\]\u @ \h\[\e[30;1m\])-> \[\e[0m\]" export LANG=en_US.UTF-8 @@ -75,3 +52,4 @@ export TERM=screen-256color export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 . $HOME/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true . /home/joey/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true + diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 0df8998..ead88bb 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -3,10 +3,10 @@ map [1;5B map [1;5C map [1;5D nnoremap gm m +let g:ale_shell="/bin/bash" " Live updating substitution! set inccommand=nosplit -set number relativenumber let g:airline#extensions#ale#enabled = 1 let mapleader = "\" @@ -229,6 +229,7 @@ let g:EasyClipShareYanks = 1 "let g:syntastic_check_on_wq = 0 call plug#begin('~/.local/share/nvim/plugged') +Plug 'rust-lang/rust.vim' Plug 'zah/nim.vim' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-unimpaired' diff --git a/.gitconfig b/.gitconfig index a3ac576..8f7800b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] email = jyapayne@gmail.com - name = Joey Payne + name = Joey Yakimowich-Payne [core] editor = vim [color] diff --git a/.profile b/.profile index e112bc5..b0474a9 100644 --- a/.profile +++ b/.profile @@ -28,3 +28,30 @@ fi #xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape' export PATH="$HOME/.cargo/bin:$PATH" +export PATH=/usr/lib/dart/bin:$HOME/.local/bin:/snap/bin:/usr/local/gradle/gradle-4.6/bin:/usr/local/kotlinc/bin:/usr/local/android-studio/bin:$HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin:/usr/sbin:/local/bin:/usr/local/bin:/sbin:/usr/games:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/android-sdk +export PATH=$PATH:$HOME/.cargo/bin:$HOME/yuzu/:$HOME/.nimble/bin:$HOME/nimlibs +export PATH=$PATH:$HOME/gcclibs/aarch64-linux-gnu/bin:$HOME/gcclibs/arm-linux-gnueabi/bin +export PATH=$HOME/.pub-cache/bin:$PATH +export PATH=$PATH:$HOME/flutter/bin +export GOROOT=/usr/lib/go-1.11/ +export GOPATH=$HOME/go +export GOBIN=$GOROOT/bin +export PATH=$PATH:$GOBIN +alias nim='$HOME/.nimble/bin/nim' +export DEVKITPRO=/opt/devkitpro +export DEVKITARM=${DEVKITPRO}/devkitARM +export DEVKITA64=${DEVKITPRO}/devkitA64 +export PATH=$PATH:$DEVKITA64/bin:$DEVKITPRO/tools/bin +export JAVA_HOME=/usr/lib/jvm/default-java +export PATH=$HOME/.opam/4.05.0/bin:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin:$PATH +export LD_LIBRARY_PATH="$HOME/Qt/5.12.3/gcc_64/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH:/lib:/usr/lib:/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu" +export LFS=/mnt/lfs +export PYTHONSTARTUP="$HOME/.pythonstartup" +export ANT_OPTS="-Xmx1024m -XX:MaxPermSize=256m" +export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" +export WINEPREFIX=~/.WineItunes +export WINEARCH=win32 +export GTK_IM_MODULE=fcitx +export XMODIFIERS=@im=fcitx +export QT_IM_MODULE=fcitx + diff --git a/.vimrc b/.vimrc index 5f03f0f..6bc2eee 100644 --- a/.vimrc +++ b/.vimrc @@ -2,6 +2,7 @@ map [1;5A map [1;5B map [1;5C map [1;5D +let g:ale_shell="/bin/bash" let mapleader = "\" let maplocalleader = "\"