Merge branch 'master' of github.com:sabrehagen/desktop-environment

docker/Dockerfile

@@ -78,6 +78,8 @@ RUN apt-get update -qq && \
   perl \
   python \
   python-pip \
+  python3 \
+  python3-pip \
   ruby \
   software-properties-common \
   ssh \
@@ -161,7 +163,8 @@ RUN apt-get install -qq \
   make -j$(nproc) && \
   make install && \
   echo user_allow_other >> /etc/fuse.conf && \
-  mkdir -p $HOME/.config/cloudstorage
+  mkdir -p $HOME/.config/cloudstorage && \
+  mkdir $HOME/cloudstorage
 
 # Install dive docker image explorer
 RUN wget -qnv -O dive.deb https://github.com/wagoodman/dive/releases/download/v0.7.2/dive_0.7.2_linux_amd64.deb && \
@@ -198,6 +201,14 @@ RUN go get github.com/moul/gotty-client/cmd/gotty-client
 # Install helm
 RUN curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
 
+# Install i3-gaps
+RUN add-apt-repository ppa:kgilmer/speed-ricer && \
+  apt-get update -qq && \
+  apt-get install -qq i3-gaps
+
+# Install i3-resurrect
+RUN pip3 install --user --upgrade i3-resurrect
+
 # Install jump directory navigator
 RUN wget -qnv -O jump.deb https://github.com/gsamokovarov/jump/releases/download/v0.22.0/jump_0.22.0_amd64.deb && \
   dpkg -i jump.deb && \
@@ -217,7 +228,7 @@ RUN curl -fsSL https://github.com/jesseduffield/lazygit/releases/download/v0.8.1
   tar -C /usr/local/bin -xzf -
 
 # Install musikcube
-RUN wget -O musikcube.deb -nv https://github.com/clangen/musikcube/releases/download/0.65.1/musikcube_0.65.1_ubuntu_cosmic_amd64.deb && \
+RUN wget -O musikcube.deb -nv https://github.com/clangen/musikcube/releases/download/0.65.0/musikcube_0.65.0_ubuntu_disco_amd64.deb && \
   dpkg -i musikcube.deb || apt-get install -qq --fix-broken && \
   rm musikcube.deb
 

docker/scripts/alacritty.sh

@@ -1,7 +0,0 @@
-REPO_ROOT=$(dirname $(readlink -f $0))/../..
-
-# Export desktop environment shell configuration
-eval "$($REPO_ROOT/docker/scripts/environment.sh)"
-
-# Start a desktop environment detached from this shell
-docker exec $DESKTOP_ENVIRONMENT_CONTAINER_NAME alacritty >/dev/null 2>&1 &

docker/scripts/environment.sh

@@ -42,8 +42,9 @@ echo export DESKTOP_ENVIRONMENT_CACHE_ZSH=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/
 echo export DESKTOP_ENVIRONMENT_STATE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/google-chrome
 echo export DESKTOP_ENVIRONMENT_STATE_CODE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Code
 echo export DESKTOP_ENVIRONMENT_STATE_GITHUB=$DESKTOP_ENVIRONMENT_USER_HOME/.config/github
+echo export DESKTOP_ENVIRONMENT_STATE_I3=$DESKTOP_ENVIRONMENT_USER_HOME/.i3
 echo export DESKTOP_ENVIRONMENT_STATE_JUMP=$DESKTOP_ENVIRONMENT_USER_HOME/.jump
-echo export DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_USER_HOME/.musikcube
+echo export DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/musikcube/1
 echo export DESKTOP_ENVIRONMENT_STATE_RESCUETIME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/RescueTime.com
 echo export DESKTOP_ENVIRONMENT_STATE_SIGNAL=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Signal
 echo export DESKTOP_ENVIRONMENT_STATE_SLACK=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Slack

docker/scripts/start.sh

@@ -52,6 +52,7 @@ docker run \
   --volume DESKTOP_ENVIRONMENT_STATE_CHROME:$DESKTOP_ENVIRONMENT_STATE_CHROME \
   --volume DESKTOP_ENVIRONMENT_STATE_CODE:$DESKTOP_ENVIRONMENT_STATE_CODE \
   --volume DESKTOP_ENVIRONMENT_STATE_GITHUB:$DESKTOP_ENVIRONMENT_STATE_GITHUB \
+  --volume DESKTOP_ENVIRONMENT_STATE_I3:$DESKTOP_ENVIRONMENT_STATE_I3 \
   --volume DESKTOP_ENVIRONMENT_STATE_JUMP:$DESKTOP_ENVIRONMENT_STATE_JUMP \
   --volume DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE:$DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE \
   --volume DESKTOP_ENVIRONMENT_STATE_RESCUETIME:$DESKTOP_ENVIRONMENT_STATE_RESCUETIME \
@@ -75,4 +76,3 @@ until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m
 
 # Start the desktop environment inside the container
 $REPO_ROOT/docker/scripts/exec.sh /home/$DESKTOP_ENVIRONMENT_USER/.config/scripts/startup.sh
-$REPO_ROOT/docker/scripts/alacritty.sh