Skip to content

Commit

Permalink
Update using latest utils
Browse files Browse the repository at this point in the history
  • Loading branch information
erichlf committed May 18, 2024
1 parent 898f411 commit abf2ea4
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 24 deletions.
1 change: 1 addition & 0 deletions scripts/devcontainer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ git submodule update
# create links to dotfiles
sym_links

INFO "Installing NEOVIM..."
# get the newest neovim
sudo add-apt-repository ppa:ppa-verse/neovim -y
sudo apt-get update
Expand Down
8 changes: 7 additions & 1 deletion scripts/mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ sudo xcode-select --install
brew doctor
brew cleanup

brew install neovim fzf starship stow gpg
INFO "Installing base system..."
brew install \
fzf \
gpg \
neovim \
starship \
stow

git submodule init
git submodule update
Expand Down
27 changes: 8 additions & 19 deletions scripts/nas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,33 @@ DOTFILES_DIR=$(pwd)

set -e

function pac_update(){
yes | sudoj pacman -Syu

return 0
}

function pac_install(){
yes | sudoj pacman -S --needed $@

return 0
}

alias sudo=sudoj
source "$DOTFILES_DIR/scripts/utils.sh"

print_details

git submodule init
git submodule update

INFO "Installing busybox"
INFO "Installing busybox..."
sudo busybox --install /opt/bin/

INFO "Installing JuNest"
INFO "Installing JuNest..."
[[ ! -d $HOME/.local/share/junest ]] && git clone https://github.com/fsquillace/junest.git $HOME/.local/share/junest
[[ ! -d $HOME/.junest ]] && junest setup
pac_update

INFO "Installing stow"
INFO "Installing stow..."
pac_install \
stow

sym_links

INFO "Installing zsh"
INFO "Installing zsh..."
sudo opkg install \
zsh

INFO "Installing base system"
INFO "Installing base system..."
pac_install \
btop \
fzf \
Expand All @@ -54,7 +43,7 @@ zsh_extras

starship_install

INFO "Installing neovim"
INFO "Installing neovim..."
pac_install \
chafa \
git-lfs \
Expand All @@ -71,4 +60,4 @@ pac_install \

lunarvim_install

INFO "FInished setting up system"
INFO "Finished setting up system..."
2 changes: 2 additions & 0 deletions scripts/phone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source "$DOTFILES_DIR/scripts/utils.sh"

print_details

INFO "Installing base system"
pkg install -y \
fzf \
git \
Expand Down Expand Up @@ -37,3 +38,4 @@ lunarvim_install

yes | pkg remove nano

INFO "Finished setting up system"
8 changes: 4 additions & 4 deletions scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ DOTFILES_DIR: $DOTFILES_DIR
# function to create my links
# This expects the variable $DOTFILES_DIR to exist
function sym_links(){
INFO "Creating symlinks"
INFO "Creating symlinks..."
mkdir -p $HOME/.config
stow -v --dotfiles --adopt --dir $DOTFILES_DIR --target $HOME --restow my-home
stow -v --adopt --dir $DOTFILES_DIR/private/ --target $HOME/.ssh --restow .ssh
Expand Down Expand Up @@ -145,7 +145,7 @@ function lazygit_install(){

# install lunarvim
function lunarvim_install(){
INFO "Installing LunarVIM"
INFO "Installing LunarVIM..."

# ensure there are no failures due to installing python packages
python3 -m pip config set global.break-system-packages true
Expand All @@ -155,7 +155,7 @@ function lunarvim_install(){

# setup starship
function starship_install(){
INFO "Installing starship"
INFO "Installing starship..."
curl -sS https://starship.rs/install.sh -o starship.sh
chmod +x starship.sh
./starship.sh -y --bin-dir $HOME/.local/bin
Expand All @@ -164,7 +164,7 @@ function starship_install(){

# install the various zsh components
function zsh_extras(){
INFO "Setting up zsh extras"
INFO "Setting up zsh extras..."
# install zgenom
[ ! -d $HOME/.zgenom ] && git clone https://github.com/jandamm/zgenom.git ${HOME}/.zgenom

Expand Down

0 comments on commit abf2ea4

Please sign in to comment.