adam
/
laughing-hipster
mirror of https://github.com/adamveld12/laughing-hipster
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: stability fixes

pull/6/head
Adam Veldhousen 2021-10-17 15:26:26 -05:00
parent e58c3ff0f2
commit 9f65b7fc2c
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B
11 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.config/vim/.vimrc
View File

@ -8,7 +8,7 @@ execute pathogen#helptags()
set nocompatible
"color schemes
colorscheme torte
"colorscheme torte
"colorscheme jellybeans
"colorscheme molokai
"colorscheme wombat256i
@ -154,7 +154,7 @@ map <leader>s <Plug>(easymotion-s2)
nmap <leader>n :NERDTreeToggle %:p:h<CR>
nmap <leader>m :NERDTreeClose<CR>:NERDTreeFind<CR>
let g:NERDTreeBookmarksFile = ~/.config/vim/.NERDTreeBookmarks
" let g:NERDTreeBookmarksFile = ~/.config/vim/.NERDTreeBookmarks
" strips whitespace
noremap <leader>ws :call StripWhitespace()<CR>

4
.config/vim/plugins.txt
View File

@ -22,13 +22,13 @@ git://github.com/cakebaker/scss-syntax.vim.git
git://github.com/pangloss/vim-javascript.git
git://github.com/vim-ruby/vim-ruby.git
git://github.com/vim-scripts/matchit.zip.git
git://github.com/oscarh/vimerl.git
#git://github.com/oscarh/vimerl.git
git://github.com/sukima/xmledit.git
git://github.com/mxw/vim-jsx.git
git://github.com/gorodinskiy/vim-coloresque.git
git://github.com/groenewege/vim-less.git
git://github.com/tpope/vim-markdown.git
git://github.com/tpope/vim-haml.git
#git://github.com/tpope/vim-haml.git
#themes
git://github.com/wdhg/dragon-energy.git
git://github.com/FrancescoMagliocco/CmptrClr.git

2
Dockerfile
View File

@ -1,6 +1,8 @@
FROM archlinux:latest
ARG INSTALL_TOOLS true
ENV FILES_DEBUG true
ENV FILES_INSTALL_TOOLS ${INSTALL_TOOLS:-true}
RUN pacman -Sy --noconfirm openssh sudo vim git which gnupg make gcc binutils bison \
&& echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \

1
plugins/001-utilities.sh
View File

@ -7,7 +7,6 @@ files_linkdir() {
local FORCE=$3;
if [[ -d "${SOURCE}" ]]; then
files_debug_log "$SOURCE EXISTS, force=${FORCE} should run? $(! [[ -z "${FORCE}" ]] && echo "yes")"
if ! [[ -z "${FORCE}" ]] || ! [[ -d "${DEST}" ]]; then
files_debug_log "LINKING $SOURCE -> $DEST"

2
plugins/002-config.sh
View File

@ -2,4 +2,4 @@
files_linkdir "${HOME}/.files/.config" "${HOME}/.config" true;
! [[ -f "${HOME}/.gitconfig" ]] && ln -svf "${HOME}/.config/git/.gitconfig" "${HOME}/.gitconfig";
! [[ -f "${HOME}/.gitconfig" ]] && ln -s "${HOME}/.config/git/.gitconfig" "${HOME}/.gitconfig";

10
plugins/200-golang.sh
View File

@ -2,7 +2,7 @@
export GVM_DIR="${HOME}/.gvm"
if ! [[ -f ~/.gvm/scripts/gvm ]]; then
if [[ "${FILES_INSTALL_TOOLS}" = "true" ]] && ! [[ -d ${GVM_DIR} ]]; then
# install go version manager
echo "Installing go version manager";
curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer -o /tmp/gvm-installer.sh;
@ -10,8 +10,10 @@ if ! [[ -f ~/.gvm/scripts/gvm ]]; then
source ~/.gvm/scripts/gvm;
gvm install go1.17 -B;
gvm use go1.17 --default;
else
source ~/.gvm/scripts/gvm;
fi
[ -s "$GVM_DIR/scripts/bash_completion" ] && \. "$GVM_DIR/scripts/bash_completion";
if [[ -s "${GVM_DIR}/scripts/gvm" ]]; then
source ~/.gvm/scripts/gvm;
[ -s "$GVM_DIR/scripts/bash_completion" ] && \. "$GVM_DIR/scripts/bash_completion";
fi

12
plugins/210-node.sh
View File

@ -1,8 +1,8 @@
#!/bin/sh
export NVM_DIR="$HOME/.config/.nvm"
export NVM_DIR="$HOME/.config/.nvm";
if ! [[ -d ${NVM_DIR} ]]; then
if [[ "${FILES_INSTALL_TOOLS}" = "true" ]] && ! [[ -d ${NVM_DIR} ]]; then
# install node version manager
echo "Installing node version manager";
git clone https://github.com/nvm-sh/nvm.git ${NVM_DIR}
@ -10,11 +10,13 @@ if ! [[ -d ${NVM_DIR} ]]; then
source ${NVM_DIR}/nvm.sh;
nvm install ${NVM_VERSION:-v14};
nvm alias default ${NVM_VERSION:-v14};
else
source ${NVM_DIR}/nvm.sh;
fi
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion";
if [[ -s "${NVM_DIR}/nvm.sh" ]]; then
source ${NVM_DIR}/nvm.sh;
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion";
nvm use default;
fi

15
plugins/220-ruby.sh
View File

@ -1,16 +1,17 @@
#!/bin/sh
export RVM_HOME="${HOME}/.rvm"
if ! [[ -d "${RVM_HOME}" ]]; then
export RVM_HOME="${HOME}/.rvm";
if [[ "${FILES_INSTALL_TOOLS}" = "true" ]] && ! [[ -d "${RVM_HOME}" ]]; then
command curl -sSL https://rvm.io/mpapis.asc | gpg2 --import -;
command curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import -;
curl -sSL https://get.rvm.io | bash -s stable --ruby;
fi
echo "rvm_silence_path_mismatch_check_flag=1" > ~/.rvmrc;
[[ -s ${RVM_HOME}/scripts/rvm ]] && source ${RVM_HOME}/scripts/rvm;
# [[ -s ${RVM_HOME}/scripts/completion ]] && source ${RVM_HOME}/scripts/completion;
[[ -s ${RVM_HOME}/scripts/rvm ]] && rvm use ruby-3.0.0 > /dev/null;
if [[ -s ${RVM_HOME}/scripts/rvm ]]; then
! [[ -f ${HOME}/.rvmrc ]] && echo "rvm_silence_path_mismatch_check_flag=1" > ~/.rvmrc;
source ${RVM_HOME}/scripts/rvm;
[[ -s ${RVM_HOME}/scripts/completion ]] && source ${RVM_HOME}/scripts/completion | true;
rvm use ruby-3.0.0 > /dev/null;
fi

7
plugins/230-rust.sh
View File

@ -4,14 +4,13 @@ export RUSTUP_HOME="${HOME}/.config/rust/.rustup";
export CARGO_HOME="${HOME}/.config/rust/.cargo";
export PATH=${PATH}:${CARGO_HOME}/bin;
if ! [[ -d "${CARGO_HOME}" ]]; then
if [[ "${FILES_INSTALL_TOOLS}" = "true" ]] && ! [[ -d ${CARGO_HOME} ]]; then
# install rust
echo "Installing rustup + rust stable";
curl -sLSf https://sh.rustup.rs > /tmp/rustup.sh;
chmod +x /tmp/rustup.sh && /tmp/rustup.sh -y --no-modify-path;
source ${CARGO_HOME}/env
else
source ${CARGO_HOME}/env
fi
[[ -s "${CARGO_HOME}/env" ]] && source ${CARGO_HOME}/env;

24
plugins/500-vim.sh
View File

@ -5,20 +5,28 @@ if [[ -d "${HOME}/.config/vim" ]]; then
export VIMRUNTIME=${VIM}/runtime;
# export PATH=${VIM}:${PATH};
files_linkdir "/usr/share/vim/vim82/" "${VIMRUNTIME}";
files_linkdir "/usr/share/vim/vim82/" "${VIMRUNTIME}/";
! [[ -f ${HOME}/.vimrc ]] && ln -s ${VIM}/.vimrc ${HOME}/.vimrc;
! [[ -f ${HOME}/.vimrc ]] && ln -sf ${VIM}/.vimrc ${HOME}/.vimrc;
if ! [[ -f "${VIMRUNTIME}/autoload/pathogen.vim" ]]; then
! [[ -d "/tmp/vim-pathogen" ]] && git clone git://github.com/tpope/vim-pathogen.git /tmp/vim-pathogen;
mkdir -p ${VIMRUNTIME}/autoload/;
cp -r /tmp/vim-pathogen/autoload/* ${VIMRUNTIME}/autoload;
files_debug_log "installing pathogen.vim";
if ! [[ -d "/tmp/vim-pathogen/" ]]; then
git clone git://github.com/tpope/vim-pathogen.git /tmp/vim-pathogen;
if [[ -d "/tmp/vim-pathogen/autoload" ]]; then
mkdir -p ${VIMRUNTIME}/autoload/;
cp -r /tmp/vim-pathogen/autoload/* ${VIMRUNTIME}/autoload/;
fi
fi
fi
if ! [[ -d "${VIMRUNTIME}/bundle" ]]; then
pushd ${VIM}
rake
popd
files_debug_log "installing vim plugins...";
pushd ${VIM};
[[ -f "$(which rake)" ]] && rake;
popd;
fi
fi

3
sourceme.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
export FILES_INSTALL_TOOLS=${FILES_INSTALL_TOOLS:-false};
function files_debug_log() {
if ! [[ -z "${FILES_DEBUG}" ]]; then
echo -e "# [INFO] $@";
@ -38,4 +40,5 @@ function reload_env() {
fi
}
reload_env