From 11f01f84e0acbee633f5837863c29d7134f40a55 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Mon, 2 Aug 2021 16:11:04 +1000 Subject: [PATCH] big-cleanup --- README.md | 32 -------------- docker/Dockerfile | 79 +++++++---------------------------- docker/scripts/clean-hard.sh | 2 - docker/scripts/environment.sh | 11 +---- docker/scripts/start.sh | 11 +---- 5 files changed, 18 insertions(+), 117 deletions(-) diff --git a/README.md b/README.md index e6834ec..6d6ba43 100644 --- a/README.md +++ b/README.md @@ -20,38 +20,6 @@ git clone https://github.com/sabrehagen/desktop-environment Fork the [github-computer/github-computer](https://github.com/github-computer/github-computer) repository and this desktop environment will be deployed to GitHub's cloud. -## Keybindings - -```sh -# Launch terminal -Mod + Return - -# Launch chrome -Mod + b - -# Launch vs code -Mod + c - -# Launch dmenu -Mod + d - -# Launch pcmanfm -Mod + e - -# Launch slack -Mod + m - -# Launch signal -Mod + y - -# Launch maim -Mod + x - -# Launch i3lock -Mod + slash - -``` - ## Project Goals - [x] A computer wholly defined in code. diff --git a/docker/Dockerfile b/docker/Dockerfile index aea5b82..e81f88e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -64,7 +64,6 @@ RUN apt-get update -qq && \ httpie \ iftop \ iputils-ping \ - irssi \ jq \ keychain \ libnotify-bin \ @@ -157,12 +156,6 @@ RUN wget -O bat.deb -q https://github.com/sharkdp/bat/releases/download/v0.16.0/ dpkg -i bat.deb && \ rm bat.deb -# Install brave -RUN curl -s https://brave-browser-apt-beta.s3.brave.com/brave-core-nightly.asc | apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-prerelease.gpg add - && \ - echo "deb [arch=amd64] https://brave-browser-apt-beta.s3.brave.com/ stable main" | sudo tee /etc/apt/sources.list.d/brave-browser-beta.list && \ - apt-get update && \ - apt-get -qq install brave-browser-beta - # Install chrome RUN apt-get update -qq && \ apt-get install -qq \ @@ -216,22 +209,10 @@ RUN apt-get install -qq libncurses5-dev && \ make && \ make install -# Install ctop -RUN wget -O /usr/local/bin/ctop https://github.com/bcicen/ctop/releases/download/v0.7.5/ctop-0.7.5-linux-amd64 && \ - chmod +x /usr/local/bin/ctop - -# Install define -RUN wget -O /usr/local/bin/define -q https://github.com/Rican7/define/releases/download/v0.1.2/define_linux_amd64 && \ - chmod +x /usr/local/bin/define - # Install dijo RUN curl -fsSL https://github.com/NerdyPepper/dijo/releases/download/v0.2.5/dijo-x86_64-linux -o /usr/local/bin/dijo && \ chmod +x /usr/local/bin/dijo -# Install 6cord -RUN curl -fsSL https://gitlab.com/diamondburned/6cord/-/jobs/515405685/artifacts/raw/6cord_nk -o /usr/local/bin/6cord && \ - chmod +x /usr/local/bin/6cord - # Install dive docker image explorer RUN wget -q -O dive.deb https://github.com/wagoodman/dive/releases/download/v0.9.2/dive_0.9.2_linux_amd64.deb && \ dpkg -i dive.deb && \ @@ -241,11 +222,6 @@ RUN wget -q -O dive.deb https://github.com/wagoodman/dive/releases/download/v0.9 RUN curl -fsSL "https://github.com/docker/compose/releases/download/1.25.0-rc1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \ chmod +x /usr/local/bin/docker-compose -# Install ferdi -RUN wget -q -O ferdi.deb https://github.com/getferdi/ferdi/releases/download/v5.5.0/ferdi_5.5.0_amd64.deb && \ - dpkg -i ferdi.deb && \ - rm ferdi.deb - # Install fzf RUN git clone --depth 1 https://github.com/junegunn/fzf.git $HOME/.fzf && \ $HOME/.fzf/install --bin @@ -286,20 +262,6 @@ RUN add-apt-repository ppa:longsleep/golang-backports && \ apt-get update -qq && \ apt-get install -qq golang-go -# Install go-cistern -RUN git clone --depth 1 https://github.com/nbedos/cistern /opt/cistern && \ - cd /opt/cistern && \ - mkdir build && \ - export CISTERN_VERSION="$(git describe --tags --dirty)_$(go env GOOS)/$(go env GOARCH)" && \ - export GO111MODULE=on && \ - go build -ldflags "-X main.Version=$CISTERN_VERSION" -o build/cistern ./cmd/cistern && \ - cp build/cistern /usr/local/bin - -# Install gopass -RUN wget -O gopass.deb -nv https://github.com/gopasspw/gopass/releases/download/v1.12.4/gopass_1.12.4_linux_amd64.deb && \ - dpkg -i gopass.deb || apt-get install -qq --fix-broken && \ - rm gopass.deb - # Install gotop RUN wget -q -O gotop-deb https://github.com/cjbassi/gotop/releases/download/3.0.0/gotop_3.0.0_linux_amd64.deb && \ dpkg -i gotop-deb @@ -391,7 +353,7 @@ RUN apt-get install -qq \ ./make.sh all # Install nodejs -RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - # Install novnc RUN git clone --depth 1 https://github.com/cloud-computer/noVNC.git /opt/noVNC && \ @@ -440,18 +402,23 @@ RUN wget -O rescuetime.deb -nv https://www.rescuetime.com/installers/rescuetime_ dpkg -i rescuetime.deb || apt-get install -qq --fix-broken && \ rm rescuetime.deb -# Install skype -RUN wget -O skype.deb -q https://go.skype.com/skypeforlinux-64.deb && \ - dpkg -i skype.deb && \ - rm skype.deb - -# Install slack term -RUN wget -O /usr/local/bin/slack-term -nv https://github.com/erroneousboat/slack-term/releases/download/v0.5.0/slack-term-linux-amd64 && \ - chmod +x /usr/local/bin/slack-term - # Install speedtest RUN pip3 install --user speedtest-cli +# install taskwarrior +RUN apt-get install -qq taskwarrior + +# Install taskwarrior-tui +RUN wget -O taskwarrior.deb -q https://github.com/kdheepak/taskwarrior-tui/releases/download/v0.9.5/taskwarrior-tui.deb && \ + dpkg -i taskwarrior.deb && \ + rm taskwarrior.deb + +# Install terraform +RUN wget --quiet https://releases.hashicorp.com/terraform/1.0.3/terraform_1.0.3_linux_amd64.zip && \ + unzip terraform_1.0.3_linux_amd64.zip && \ + mv terraform /usr/bin && \ + rm terraform_1.0.3_linux_amd64.zip + # Install timeago RUN wget -O /usr/local/bin/timeago -nv https://raw.githubusercontent.com/sabrehagen/timeago/master/timeago && \ chmod +x /usr/local/bin/timeago @@ -510,26 +477,12 @@ RUN yarn global add \ http-server \ imgur-uploader-cli \ localtunnel \ + nativefier \ nodemon \ rebase-editor \ tldr && \ tldr --update -# Install gantt -RUN wget -O /usr/local/bin/gantt -q https://raw.githubusercontent.com/andrew-ls/gantt/master/bin/gantt && \ - chmod +x /usr/local/bin/gantt - -# install taskwarrior -RUN apt-get install -qq taskwarrior - -# Install taskwarrior-tui -RUN wget -O taskwarrior.deb -q https://github.com/kdheepak/taskwarrior-tui/releases/download/v0.9.5/taskwarrior-tui.deb && \ - dpkg -i taskwarrior.deb && \ - rm taskwarrior.deb - -# Install trellowarrior -RUN pip3 install --user trellowarrior - # Configure openvpn RUN mkdir -p $HOME/.config/openvpn && \ mknod $HOME/.config/openvpn/tun c 10 200 && \ diff --git a/docker/scripts/clean-hard.sh b/docker/scripts/clean-hard.sh index 6f47e17..03b5fcb 100755 --- a/docker/scripts/clean-hard.sh +++ b/docker/scripts/clean-hard.sh @@ -5,8 +5,6 @@ $REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CHROME & $REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CODE & $REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_JUMP & $REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE & -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_TRAEFIK & -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_ZOOM & # Wait for cleans to complete in parallel wait diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index 0845414..74a679f 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -25,33 +25,24 @@ echo export DESKTOP_ENVIRONMENT_USER_ID=1000 echo export DESKTOP_ENVIRONMENT_DOCKER_NETWORK=$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME # Desktop environment application cache volumes -echo export DESKTOP_ENVIRONMENT_CACHE_BRAVE=$DESKTOP_ENVIRONMENT_USER_HOME/.cacheBraveSoftware echo export DESKTOP_ENVIRONMENT_CACHE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/google-chrome echo export DESKTOP_ENVIRONMENT_CACHE_SSH=$DESKTOP_ENVIRONMENT_USER_HOME/.ssh echo export DESKTOP_ENVIRONMENT_CACHE_TMUX=$DESKTOP_ENVIRONMENT_USER_HOME/.tmux echo export DESKTOP_ENVIRONMENT_CACHE_YARN=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/yarn -echo export DESKTOP_ENVIRONMENT_CACHE_ZOOM=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/zoom echo export DESKTOP_ENVIRONMENT_CACHE_ZSH=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/zsh # Desktop environment application state volumes -echo export DESKTOP_ENVIRONMENT_STATE_BRAVE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/BraveSoftware 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_DISCORD=$DESKTOP_ENVIRONMENT_USER_HOME/.config/discord -echo export DESKTOP_ENVIRONMENT_STATE_FERDI=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Ferdi echo export DESKTOP_ENVIRONMENT_STATE_I3=$DESKTOP_ENVIRONMENT_USER_HOME/.config/i3/i3-resurrect -echo export DESKTOP_ENVIRONMENT_STATE_IRSSI=$DESKTOP_ENVIRONMENT_USER_HOME/.irssi/logs echo export DESKTOP_ENVIRONMENT_STATE_JUMP=$DESKTOP_ENVIRONMENT_USER_HOME/.jump echo export DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/musikcube/1 echo export DESKTOP_ENVIRONMENT_STATE_NCHAT=$DESKTOP_ENVIRONMENT_USER_HOME/.config/nchat 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 -echo export DESKTOP_ENVIRONMENT_STATE_TELEGRAM=$DESKTOP_ENVIRONMENT_USER_HOME/.local/share/TelegramDesktop echo export DESKTOP_ENVIRONMENT_STATE_X11=/tmp/.X11-unix -echo export DESKTOP_ENVIRONMENT_STATE_ZOOM=$DESKTOP_ENVIRONMENT_USER_HOME/.zoom # Desktop environment user state volumes +echo export DESKTOP_ENVIRONMENT_USER_APPS=$DESKTOP_ENVIRONMENT_USER_HOME/apps echo export DESKTOP_ENVIRONMENT_USER_DOCUMENTS=$DESKTOP_ENVIRONMENT_USER_HOME/documents echo export DESKTOP_ENVIRONMENT_USER_DOWNLOADS=$DESKTOP_ENVIRONMENT_USER_HOME/downloads echo export DESKTOP_ENVIRONMENT_USER_GO=$DESKTOP_ENVIRONMENT_USER_HOME/go diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index 31304ed..f67f038 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -38,28 +38,19 @@ docker run \ --volume /run/udev:/run/udev \ --volume /var/lib/docker:/var/lib/docker \ --volume /var/run/docker.sock:/var/run/docker.sock \ - --volume DESKTOP_ENVIRONMENT_CACHE_BRAVE:$DESKTOP_ENVIRONMENT_CACHE_BRAVE \ --volume DESKTOP_ENVIRONMENT_CACHE_CHROME:$DESKTOP_ENVIRONMENT_CACHE_CHROME \ --volume DESKTOP_ENVIRONMENT_CACHE_SSH:$DESKTOP_ENVIRONMENT_CACHE_SSH \ --volume DESKTOP_ENVIRONMENT_CACHE_TMUX:$DESKTOP_ENVIRONMENT_CACHE_TMUX \ --volume DESKTOP_ENVIRONMENT_CACHE_YARN:$DESKTOP_ENVIRONMENT_CACHE_YARN \ - --volume DESKTOP_ENVIRONMENT_CACHE_ZOOM:$DESKTOP_ENVIRONMENT_CACHE_ZOOM \ --volume DESKTOP_ENVIRONMENT_CACHE_ZSH:$DESKTOP_ENVIRONMENT_CACHE_ZSH \ - --volume DESKTOP_ENVIRONMENT_STATE_BRAVE:$DESKTOP_ENVIRONMENT_STATE_BRAVE \ --volume DESKTOP_ENVIRONMENT_STATE_CHROME:$DESKTOP_ENVIRONMENT_STATE_CHROME \ --volume DESKTOP_ENVIRONMENT_STATE_CODE:$DESKTOP_ENVIRONMENT_STATE_CODE \ - --volume DESKTOP_ENVIRONMENT_STATE_DISCORD:$DESKTOP_ENVIRONMENT_STATE_DISCORD \ - --volume DESKTOP_ENVIRONMENT_STATE_FERDI:$DESKTOP_ENVIRONMENT_STATE_FERDI \ --volume DESKTOP_ENVIRONMENT_STATE_I3:$DESKTOP_ENVIRONMENT_STATE_I3 \ - --volume DESKTOP_ENVIRONMENT_STATE_IRSSI:$DESKTOP_ENVIRONMENT_STATE_IRSSI \ --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 \ - --volume DESKTOP_ENVIRONMENT_STATE_SIGNAL:$DESKTOP_ENVIRONMENT_STATE_SIGNAL \ - --volume DESKTOP_ENVIRONMENT_STATE_SLACK:$DESKTOP_ENVIRONMENT_STATE_SLACK \ - --volume DESKTOP_ENVIRONMENT_STATE_TELEGRAM:$DESKTOP_ENVIRONMENT_STATE_TELEGRAM \ --volume DESKTOP_ENVIRONMENT_STATE_X11:/tmp/.X11-unix \ - --volume DESKTOP_ENVIRONMENT_STATE_ZOOM:$DESKTOP_ENVIRONMENT_STATE_ZOOM \ + --volume DESKTOP_ENVIRONMENT_USER_APPS:$DESKTOP_ENVIRONMENT_USER_APPS \ --volume DESKTOP_ENVIRONMENT_USER_DOCUMENTS:$DESKTOP_ENVIRONMENT_USER_DOCUMENTS \ --volume DESKTOP_ENVIRONMENT_USER_DOWNLOADS:$DESKTOP_ENVIRONMENT_USER_DOWNLOADS \ --volume DESKTOP_ENVIRONMENT_USER_GO:$DESKTOP_ENVIRONMENT_USER_GO \