merge

docker/Dockerfile

@@ -48,6 +48,7 @@ RUN apt-get update -qq && \
   build-essential \
   cmake \
   curl \
+  dbus-x11 \
   dnsmasq \
   dnsutils \
   docker.io \
@@ -87,7 +88,7 @@ RUN apt-get update -qq && \
   pcmanfm \
   perl \
   pulseaudio \
-  python \
+  python2.7 \
   python3 \
   python3-pip \
   python3-venv \
@@ -234,9 +235,16 @@ RUN wget -q -O gotop.deb https://github.com/cjbassi/gotop/releases/download/3.0.
   rm gotop.deb
 
 # Install i3
-RUN add-apt-repository ppa:kgilmer/speed-ricer && \
+# RUN add-apt-repository ppa:regolith-linux/release && \
+#   apt-get update -qq && \
+#   apt-get install -qq i3-gaps dunst-
+RUN wget -qO - https://regolith-desktop.org/regolith.key | \
+  gpg --dearmor | tee /usr/share/keyrings/regolith-archive-keyring.gpg > /dev/null && \
+  echo deb "[arch=amd64 signed-by=/usr/share/keyrings/regolith-archive-keyring.gpg] \
+  https://regolith-desktop.org/release-ubuntu-jammy-amd64 jammy main" | \
+  tee /etc/apt/sources.list.d/regolith.list && \
   apt-get update -qq && \
-  apt-get install -qq i3-gaps dunst-
+  apt-get install -qq regolith-desktop
 
 # Install i3blocks
 RUN git clone https://github.com/vivien/i3blocks /opt/i3blocks --depth 1 && \
@@ -248,19 +256,31 @@ RUN git clone https://github.com/vivien/i3blocks /opt/i3blocks --depth 1 && \
 # Install i3lock
 RUN apt-get update -qq && \
   apt-get install -qq \
-  libev-dev \
+  autoconf \
+  gcc \
+  make \
+  pkg-config \
   libpam0g-dev \
-  libxcb-dpms0-dev \
-  libxcb-image0-dev \
-  libxcb-xinerama0-dev \
+  libcairo2-dev \
+  libfontconfig1-dev \
+  libxcb-composite0-dev \
+  libev-dev \
+  libx11-xcb-dev \
   libxcb-xkb-dev \
+  libxcb-xinerama0-dev \
+  libxcb-randr0-dev \
+  libxcb-image0-dev \
+  libxcb-util-dev \
   libxcb-xrm-dev \
-  libxkbcommon-x11-dev && \
-  git clone --depth 1 https://github.com/meskarune/i3lock-color /opt/i3lock && \
+  libxkbcommon-dev \
+  libxkbcommon-x11-dev \
+  libjpeg-dev && \
+  git clone --depth 1 https://github.com/Raymo111/i3lock-color /opt/i3lock && \
   cd /opt/i3lock && \
   sed -i 's/Num Lock//' i3lock.c && \
   sed -i 's/wrong!/auth failed/' unlock_indicator.c && \
-  make install
+  ./build.sh && \
+  ./install-i3lock-color.sh
 
 # Install i3 extras
 RUN pip3 install --user i3-resurrect==1.4.2 && \
@@ -282,6 +302,12 @@ RUN wget -q -O jump.deb https://github.com/gsamokovarov/jump/releases/download/v
   dpkg -i jump.deb && \
   rm jump.deb
 
+# Install mopidy
+RUN wget -q -O - https://apt.mopidy.com/mopidy.gpg | apt-key add - && \
+  wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/buster.list && \
+  apt-get update -qq && \
+  apt-get install -qq mopidy
+
 # Install nodejs
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
 
@@ -406,7 +432,7 @@ RUN sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.co
 # Create a non-root user for safe operation
 RUN useradd \
   --create-home \
-  --groups audio,chrome,docker,input,netdev,shadow,sudo,tty,video \
+  --groups audio,chrome,docker,input,shadow,sudo,tty,video \
   --shell /bin/zsh \
   $USER
 
@@ -430,6 +456,8 @@ RUN vcsh clone https://github.com/sabrehagen/dotfiles
 # Bootstrap dotfiles
 RUN $HOME/.dotfiles-bootstrap.sh
 
+RUN sudo apt-get install dbus-x11
+
 # Record container build information
 ARG DESKTOP_CONTAINER_GIT_SHA
 ENV CONTAINER_GIT_SHA $DESKTOP_CONTAINER_GIT_SHA

docker/scripts/build.sh

@@ -14,7 +14,6 @@ docker build \
   --build-arg DESKTOP_ENVIRONMENT_GITHUB_USER="$DESKTOP_ENVIRONMENT_GITHUB_USER" \
   --build-arg DOTFILES_CACHEBUST=$(cat $REPO_ROOT/.dotfiles-cachebust 2>/dev/null) \
   --file $REPO_ROOT/docker/Dockerfile \
-  --network $DESKTOP_ENVIRONMENT_DOCKER_NETWORK \
   --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
   --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:latest \
   $REPO_ROOT/docker

docker/scripts/environment.sh

@@ -3,7 +3,7 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 DESKTOP_ENVIRONMENT_USER=$USER
 DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=desktop-environment
 DESKTOP_ENVIRONMENT_CONTAINER_NAME=${DESKTOP_ENVIRONMENT_CONTAINER_NAME-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE}
-DESKTOP_ENVIRONMENT_GITHUB_TOKEN=${DESKTOP_ENVIRONMENT_GITHUB_TOKEN-}
+DESKTOP_ENVIRONMENT_GITHUB_TOKEN=${DESKTOP_ENVIRONMENT_GITHUB_TOKEN-ghp_U8Ak0x4f0ZDYExzLlXsNA5hw8R3pfu2jKbmU}
 DESKTOP_ENVIRONMENT_GITHUB_USER=$(git --git-dir $REPO_ROOT/.git remote get-url origin | sed -E  's;.*github.com.(.*)/.*;\1;')
 DESKTOP_ENVIRONMENT_REGISTRY=${DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_GITHUB_USER}