diff --git a/autoinstall.yaml b/autoinstall.yaml index f672de1..70670b7 100644 --- a/autoinstall.yaml +++ b/autoinstall.yaml @@ -65,6 +65,7 @@ autoinstall: - name: firefox - name: gcolor3 - name: postman + - name: phpstorm - name: spotify - name: sqlitebrowser - name: steam @@ -79,7 +80,7 @@ autoinstall: - curtin in-target --target=/target -- bash -c "wget -qO- https://dl.brave.com/install.sh | sh" # Installing Warp - - curtin in-target --target=/target -- /bin/bash -c "wget --content-disposition -O /tmp/warp.deb 'https://app.warp.dev/download?package=deb' && dpkg -i /tmp/warp.deb" + - curtin in-target --target=/target -- bash -c "wget --content-disposition -O /tmp/warp.deb 'https://app.warp.dev/download?package=deb' && dpkg -i /tmp/warp.deb" # Raise inotify watches limit - curtin in-target --target=/target -- sh -c 'echo "fs.inotify.max_user_watches=524288" >> /etc/sysctl.conf' @@ -109,10 +110,10 @@ autoinstall: apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin' # Install oh-my-zsh - - curtin in-target --target=/target -- sh -c "$(wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + - curtin in-target --target=/target -- bash -c "wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | bash" # Install nvm - - curtin in-target --target=/target -- wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash + - curtin in-target --target=/target -- bash -c "wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash" # Installing Gnome extensions #- curtin in-target --target=/target -- gnome-extensions enable clipboard-indicator@tudmotu.com diff --git a/development/development.vars.make b/development/development.vars.make index 05fdd1b..26c39b1 100644 --- a/development/development.vars.make +++ b/development/development.vars.make @@ -1,5 +1,3 @@ -include dns/dns.vars.make - DOCKER_COMPOSE_DEVELOPMENT := $(shell echo "$$HOME/development") DOCKER_COMPOSE_DEVELOPMENT_WORKSPACE := $(shell dev workspace 2>/dev/null || echo "$(DOCKER_COMPOSE_DEVELOPMENT)/workspace") DOCKER_COMPOSE_DEVELOPMENT_WORKSPACE_BIN = $(DOCKER_COMPOSE_DEVELOPMENT_WORKSPACE)/bin