Skip to content

Commit 012388b

Browse files
committed
merge-master-changes
1 parent 7fe3ef6 commit 012388b

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ My [daily driver](https://github.com/users/sabrehagen/packages/container/package
77
![desktop](https://i.imgur.com/LZvxAnW.jpg)
88
![desktop](https://i.imgur.com/jm4RrKw.jpg)
99
![desktop](https://i.imgur.com/C1eBDKX.jpg)
10-
![desktop](https://i.imgur.com/cEBbzyu.png)
10+
![desktop](https://i.imgur.com/n3YUPD9.png)
1111

1212
## Running on the Desktop
1313

docker/Dockerfile

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ RUN apt-get update -qq && \
5050
bc \
5151
build-essential \
5252
cargo \
53+
cava \
5354
cmake \
5455
cmatrix \
5556
curl \
@@ -66,6 +67,7 @@ RUN apt-get update -qq && \
6667
fonts-noto-color-emoji \
6768
g++ \
6869
gcc \
70+
gimp \
6971
git \
7072
golang-go \
7173
gtk-theme-switch \
@@ -211,6 +213,13 @@ RUN git clone https://github.com/fastfetch-cli/fastfetch /opt/fastfetch && \
211213
cmake --build . --target fastfetch --target flashfetch && \
212214
install fastfetch /usr/local/bin
213215

216+
# Install gh
217+
RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
218+
chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
219+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
220+
apt-get update -qq && \
221+
apt-get install -qq gh
222+
214223
# Install gotop
215224
RUN git clone --depth 1 https://github.com/xxxserxxx/gotop /opt/gotop && \
216225
cd /opt/gotop && \
@@ -274,7 +283,7 @@ RUN go install github.com/darkhz/invidtui@latest
274283

275284
# Install jobber
276285
RUN apt-get update -qq && \
277-
apt-get install -qq rsync && \
286+
apt-get install -qq debhelper rsync && \
278287
mkdir /opt/jobber && \
279288
git clone --depth 1 https://github.com/dshearer/jobber /opt/jobber/jobber-src && \
280289
cd /opt/jobber/jobber-src && \
@@ -355,6 +364,12 @@ RUN wget -O /usr/local/bin/timeago -nv https://raw.githubusercontent.com/sabreha
355364
# Install tldr
356365
RUN pipx install tldr
357366

367+
# Install ueberzugpp
368+
RUN echo 'deb http://download.opensuse.org/repositories/home:/justkidding/xUbuntu_23.04/ /' | tee /etc/apt/sources.list.d/home:justkidding.list && \
369+
curl -fsSL https://download.opensuse.org/repositories/home:justkidding/xUbuntu_23.04/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/home_justkidding.gpg > /dev/null && \
370+
apt-get update -qq && \
371+
apt-get install -qq ueberzugpp
372+
358373
# Install vs code
359374
RUN wget -O code.deb -nv "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-arm64" && \
360375
dpkg -i code.deb && \
@@ -391,6 +406,9 @@ RUN apt-get update -qq && \
391406
make install && \
392407
cp /usr/lib/xava/out_x11_cairo.so /usr/lib/xava/out_x11_opengl.so
393408

409+
# Install xcolor
410+
RUN cargo install xcolor
411+
394412
# Install yarn
395413
RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
396414
echo "deb https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \

docker/scripts/build-dotfiles.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ DOTFILES_CACHEBUST=$(date +%s > $REPO_ROOT/.dotfiles-cachebust)
88

99
# Rebuild the desktop environment
1010
$REPO_ROOT/docker/scripts/build.sh
11-
12-
# Store build exit code
13-
echo $? > $REPO_ROOT/.build-exit-code

0 commit comments

Comments
 (0)