Update decontainer install

Author: erichlf

scripts/devcontainer.sh

@@ -14,10 +14,7 @@ print_details
 apt_update
 apt_install \
   fzf \
-  golang-go \
-  npm \
   pass \
-  python3-venv \
   software-properties-common \
   stow \
   wget \
@@ -27,10 +24,6 @@ apt_install \
 # change to zsh as default shell
 sudo chsh -s /usr/bin/zsh
 
-# ensure that submodules are downloaded
-git submodule init
-git submodule update
-
 # ensure that .config is owned by the current user
 if [[ -d $HOME/.config && ! $(stat -c "%U" $HOME/.config) == "$(whoami)" ]]; then
   sudo chown $(id -u):$(id -g) $HOME/.config
@@ -45,9 +38,6 @@ wget https://github.com/neovim/neovim-releases/releases/download/v0.10.1/nvim.ap
 sudo mv nvim.appimage /usr/bin/nvim
 sudo chmod u+x /usr/bin/nvim
 
-curl https://sh.rustup.rs -sSf | bash -s -- -y
-source $HOME/.cargo/env
-
 zsh_extras
 
 starship_install

scripts/utils.sh

@@ -12,27 +12,27 @@ ORANGE='\033[0;33'
 RED='\033[0;31m'
 RESET='\033[0m'
 
-function LOG(){
+function LOG() {
   echo -e "$@ ${RESET}"
 }
 
-function INFO(){
+function INFO() {
   LOG ${GREEN}$@
 }
 
-function WARN(){
+function WARN() {
   LOG ${ORANGE}$@
 }
 
-function ERROR(){
+function ERROR() {
   LOG ${RED}$@
 }
 
 # print the current system details
 # this expects DOTFILES_DIR and SYSTEM to be defined
-function print_details(){
+function print_details() {
   LOG ${BWHITE} \
-"
+    "
 SYSTEM:         $SYSTEM
 OS:             $OS
 KERNEL:         $KERNEL
@@ -47,82 +47,82 @@ DOTFILES_DIR:   $DOTFILES_DIR
 
 # function to create my links
 # This expects the variable $DOTFILES_DIR to exist
-function sym_links(){
+function sym_links() {
   INFO "Creating symlinks..."
   mkdir -p $HOME/.config
   stow -v --dotfiles --adopt --dir $DOTFILES_DIR --target $HOME --restow home
-  stow -v --adopt --dir $DOTFILES_DIR/private/ --target $HOME/.ssh --restow .ssh
+  [[ -d $DOTFILES/private/.ssh ]] && stow -v --adopt --dir $DOTFILES_DIR/private/ --target $HOME/.ssh --restow .ssh
   stow -v --adopt --dir $DOTFILES_DIR --target $HOME/.config/ --restow config
   # if the adopt made a local change then undo that
   git checkout HEAD -- config home private
 
   return 0
 }
 
-function ask(){
+function ask() {
   read -p "$1 [$2] " answer
   answer="${answer:-$2}"
   case "$answer" in
-    y|Y ) return 0;;
-    n|N ) return 1;;
-    * ) ask "$1" "$2";;
+  y | Y) return 0 ;;
+  n | N) return 1 ;;
+  *) ask "$1" "$2" ;;
   esac
 }
 
 ############################### Ubuntu specifics #########################################
-function no_ppa_exists(){
-  ppa_added=`grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -v list.save | grep -v deb-src | grep deb | grep $1 | wc -l`
-  [ $ppa_added == 0 ];
+function no_ppa_exists() {
+  ppa_added=$(grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -v list.save | grep -v deb-src | grep deb | grep $1 | wc -l)
+  [ $ppa_added == 0 ]
 }
 
-function add_ppa(){
+function add_ppa() {
   sudo add-apt-repository ppa:$1 -y
   apt_update
 
   return 0
 }
 
-function apt_update(){
+function apt_update() {
   sudo apt-get update 1>/dev/null
 }
 
-function apt_install(){
+function apt_install() {
   sudo apt-get install -y $@
 
   return 0
 }
 
-function pac_update(){
+function pac_update() {
   sudo pacman -Syu --noconfirm
 
   return 0
 }
 
-function pac_install(){
+function pac_install() {
   sudo pacman -S --needed --noconfirm $@
 
   return 0
 }
 
-function yay_install(){
+function yay_install() {
   yay -S --needed --noconfirm $@ --mflags "--nocheck"
 
   return 0
 }
 
-function yay_update(){
+function yay_update() {
   yay -Syu --noconfirm
 
   return 0
 }
 
-function pip3_install(){
+function pip3_install() {
   sudo -H pip3 install $@
 
   return 0
 }
 
-function sudo_rule(){
+function sudo_rule() {
   INFO "$USER ALL = NOPASSWD: $@" | sudo tee -a /etc/sudoers
 
   return 0
@@ -131,7 +131,7 @@ function sudo_rule(){
 ############################ manual install items ########################################
 
 # setup fzf
-function fzf_install(){
+function fzf_install() {
   mkdir -p $HOME/.local/bin
   rm -rf $HOME/.fzf
   git clone --depth 1 https://github.com/junegunn/fzf.git $HOME/.fzf
@@ -142,7 +142,7 @@ function fzf_install(){
 }
 
 # install lazygit
-function lazygit_install(){
+function lazygit_install() {
   LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | \grep -Po '"tag_name": "v\K[^"]*')
   cd /tmp
   curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz"
@@ -152,7 +152,7 @@ function lazygit_install(){
 }
 
 # install lunarvim
-function lunarvim_install(){
+function lunarvim_install() {
   INFO "Installing LunarVIM..."
   NPM_CONFIG_PREFIX=$HOME/npm-global
 
@@ -163,7 +163,7 @@ function lunarvim_install(){
 }
 
 # setup starship
-function starship_install(){
+function starship_install() {
   INFO "Installing starship..."
   curl -sS https://starship.rs/install.sh -o starship.sh
   chmod +x starship.sh
@@ -172,7 +172,7 @@ function starship_install(){
 }
 
 # install the various zsh components
-function zsh_extras(){
+function zsh_extras() {
   INFO "Setting up zsh extras..."
   # install zgenom
   [ ! -d $HOME/.zgenom ] && git clone https://github.com/jandamm/zgenom.git ${HOME}/.zgenom
@@ -183,5 +183,5 @@ function zsh_extras(){
   # install fonts
   mkdir -p $HOME/.local/bin
   curl -fsSL https://raw.githubusercontent.com/getnf/getnf/main/install.sh | bash
-  $HOME/.local/bin/getnf -i DejaVuSansMono,DroidSansMono,Hack,Recursive,RobotoMono | true  # don't fail on fonts
+  $HOME/.local/bin/getnf -i DejaVuSansMono,DroidSansMono,Hack,Recursive,RobotoMono | true # don't fail on fonts
 }