Skip to content

Commit

Permalink
merge-master-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sabrehagen committed Nov 3, 2023
1 parent 7fe3ef6 commit 012388b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ My [daily driver](https://github.com/users/sabrehagen/packages/container/package
![desktop](https://i.imgur.com/LZvxAnW.jpg)
![desktop](https://i.imgur.com/jm4RrKw.jpg)
![desktop](https://i.imgur.com/C1eBDKX.jpg)
![desktop](https://i.imgur.com/cEBbzyu.png)
![desktop](https://i.imgur.com/n3YUPD9.png)

## Running on the Desktop

Expand Down
20 changes: 19 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ RUN apt-get update -qq && \
bc \
build-essential \
cargo \
cava \
cmake \
cmatrix \
curl \
Expand All @@ -66,6 +67,7 @@ RUN apt-get update -qq && \
fonts-noto-color-emoji \
g++ \
gcc \
gimp \
git \
golang-go \
gtk-theme-switch \
Expand Down Expand Up @@ -211,6 +213,13 @@ RUN git clone https://github.com/fastfetch-cli/fastfetch /opt/fastfetch && \
cmake --build . --target fastfetch --target flashfetch && \
install fastfetch /usr/local/bin

# Install gh
RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
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 && \
apt-get update -qq && \
apt-get install -qq gh

# Install gotop
RUN git clone --depth 1 https://github.com/xxxserxxx/gotop /opt/gotop && \
cd /opt/gotop && \
Expand Down Expand Up @@ -274,7 +283,7 @@ RUN go install github.com/darkhz/invidtui@latest

# Install jobber
RUN apt-get update -qq && \
apt-get install -qq rsync && \
apt-get install -qq debhelper rsync && \
mkdir /opt/jobber && \
git clone --depth 1 https://github.com/dshearer/jobber /opt/jobber/jobber-src && \
cd /opt/jobber/jobber-src && \
Expand Down Expand Up @@ -355,6 +364,12 @@ RUN wget -O /usr/local/bin/timeago -nv https://raw.githubusercontent.com/sabreha
# Install tldr
RUN pipx install tldr

# Install ueberzugpp
RUN echo 'deb http://download.opensuse.org/repositories/home:/justkidding/xUbuntu_23.04/ /' | tee /etc/apt/sources.list.d/home:justkidding.list && \
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 && \
apt-get update -qq && \
apt-get install -qq ueberzugpp

# Install vs code
RUN wget -O code.deb -nv "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-arm64" && \
dpkg -i code.deb && \
Expand Down Expand Up @@ -391,6 +406,9 @@ RUN apt-get update -qq && \
make install && \
cp /usr/lib/xava/out_x11_cairo.so /usr/lib/xava/out_x11_opengl.so

# Install xcolor
RUN cargo install xcolor

# Install yarn
RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \
Expand Down
3 changes: 0 additions & 3 deletions docker/scripts/build-dotfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ DOTFILES_CACHEBUST=$(date +%s > $REPO_ROOT/.dotfiles-cachebust)

# Rebuild the desktop environment
$REPO_ROOT/docker/scripts/build.sh

# Store build exit code
echo $? > $REPO_ROOT/.build-exit-code

0 comments on commit 012388b

Please sign in to comment.