From 10e6a07826cddd2ba8969d8d2ebf26885e4cad57 Mon Sep 17 00:00:00 2001 From: Frieder Schlesier Date: Thu, 3 Jun 2021 07:45:13 +0200 Subject: [PATCH] remove unused stuff --- .dockerfunc | 155 --------------------------------------------- .tmux.conf | 4 -- bin/go | 10 --- bin/gofmt | 18 ------ scripts/install.sh | 22 +------ 5 files changed, 1 insertion(+), 208 deletions(-) delete mode 100755 bin/go delete mode 100755 bin/gofmt diff --git a/.dockerfunc b/.dockerfunc index 4562135..e047584 100755 --- a/.dockerfunc +++ b/.dockerfunc @@ -306,22 +306,6 @@ photon() { } -gimp() { - del_stopped gimp - - docker run -d \ - -v /etc/localtime:/etc/localtime:ro \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -e DISPLAY=unix$DISPLAY \ - -v $HOME/Pictures:/root/Pictures \ - -v $HOME/projects:/root/projects \ - -v $HOME/Documents:/root/Documents \ - --name gimp \ - ${DOCKER_REPO_PREFIX}/gimp - - exit 0; -} - icedove() { del_stopped icedove MYUSERID=$(id --user) @@ -345,30 +329,6 @@ icedove() { exit 0; } -thunderbird() { - del_stopped thunderbird - MYUSERID=$(id --user) - - echo "starting thunderbird with uid" - echo $MYUSERID - - # docker run -d - docker run -ti \ - --name="thunderbird" \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -e DISPLAY=unix$DISPLAY \ - -v /etc/localtime:/etc/localtime:ro \ - --user $MYUSERID \ - -v $HOME/Downloads/:/home/appuser/Downloads \ - -v $HOME/Documents/:/home/appuser/Documents \ - -v $HOME/.thunderbird/:/home/appuser/.thunderbird \ - -v $HOME/.gnupg/:/home/appuser/.gnupg \ - ${DOCKER_REPO_PREFIX}/thunderbird:latest \ - bash - - # exit 0; -} - inkscape() { del_stopped inkscape @@ -423,46 +383,6 @@ java() { } -# latex() { -# del_stopped latex - -# docker run -it --rm \ -# --net host \ -# -v $(pwd):/usr/src/latex \ -# --workdir="/usr/src/latex" \ -# ${DOCKER_REPO_PREFIX}/latex "$@" -# } - -# pdflatex() { -# local file=$@ -# local cur_dir=$(pwd) -# local FILENAME=${file%%.*} - -# latex bash -c "latex $file; latex $file; pdflatex $file" - -# sudo rm $FILENAME.aux $FILENAME.dvi $FILENAME.out - -# sudo chown ${DOCKER_REPO_PREFIX}:${DOCKER_REPO_PREFIX} $FILENAME.pdf -# } - -libreoffice() { - del_stopped libreoffice - - docker run -d \ - -v /etc/localtime:/etc/localtime:ro \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -e DISPLAY=unix$DISPLAY \ - -v $HOME/Documents:/root/Documents \ - -v $HOME/Pictures:/root/Pictures \ - -v $HOME/Downloads:/root/Downloads \ - -e GDK_SCALE \ - -e GDK_DPI_SCALE \ - --name libreoffice \ - ${DOCKER_REPO_PREFIX}/libreoffice - - exit 0; -} - memo() { del_stopped memo_standalone @@ -491,21 +411,6 @@ netbeans() { ${DOCKER_REPO_PREFIX}/netbeans:latest } -# start from a directory which contains a openvpn config file named 'config.ovpn' -# cert and key files should be in the same directory or relatively referencable -# from the config file -openvpn() { - del_stopped openvpn - - docker run -it --rm \ - --name="openvpn" \ - --net host \ - --device /dev/net/tun:/dev/net/tun \ - --cap-add NET_ADMIN \ - -v "$PWD":/etc/openvpn \ - ${DOCKER_REPO_PREFIX}/openvpn:latest config.ovpn -} - papyrus() { # del_stopped papyrus @@ -541,46 +446,6 @@ papyrus() { } - -pulseaudio() { - del_stopped pulseaudio - - docker run -d \ - -v /etc/localtime:/etc/localtime:ro \ - --device /dev/snd \ - -p 4713:4713 \ - --restart always \ - --name pulseaudio \ - ${DOCKER_REPO_PREFIX}/pulseaudio -} - -# pulseaudio() { -# del_stopped pulseaudio - -# docker run -d \ -# -v /etc/localtime:/etc/localtime:ro \ -# --device /dev/snd \ -# -p 4713:4713 \ -# --restart always \ -# -v /var/run/dbus:/var/run/dbus \ -# -v /etc/machine-id:/etc/machine-id \ -# --name pulseaudio \ -# ${DOCKER_REPO_PREFIX}/pulseaudio -# } - -p3() { - local args=$@ - local cur_dir=$(pwd) - local targetmount=$(basename $cur_dir) - - docker run -it --rm \ - -v $(pwd):/src/$targetmount \ - -w /src/$targetmount \ - python:3 \ - bash -c "$args" -} - - rstudio(){ del_stopped rstudio @@ -612,26 +477,6 @@ scenebuilder() { exit 0; } -skype() { - del_stopped skype - - docker run -d \ - -v $HOME/Downloads:/root/skype/Downloads \ - -v /run/user/1000/pulse:/run/user/1000/pulse \ - -v /var/lib/dbus:/var/lib/dbus \ - -v ~/.pulse:/root/.pulse \ - -v /etc/localtime:/etc/localtime:ro \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -e DISPLAY=unix$DISPLAY \ - --device /dev/video0 \ - --device /dev/snd \ - --name skype \ - --net host \ - ${DOCKER_REPO_PREFIX}/skype - - exit 0; -} - # call with net-name as param tinc() { local tinc_dir="${HOME}/.config/etc-tinc" diff --git a/.tmux.conf b/.tmux.conf index 12749a4..7adf980 100755 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,7 +1,3 @@ -# similar to emacs commands... -unbind C-b -set -g prefix M-a - bind -n M-Left select-pane -L bind -n M-Right select-pane -R bind -n M-Up select-pane -U diff --git a/bin/go b/bin/go deleted file mode 100755 index 525c7da..0000000 --- a/bin/go +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# execute go command inside a container -# - -set -o pipefail - -source $HOME/.dockerfunc - -go $@ diff --git a/bin/gofmt b/bin/gofmt deleted file mode 100755 index a93f17d..0000000 --- a/bin/gofmt +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# execute go command inside a container -# - -set -o pipefail -set -x - -source $HOME/.dockerfunc - -# TODO: increase performance for go commands -# check directory calling from -# USE LABELS https://docs.docker.com/engine/userguide/labels-custom-metadata/#query-labels -# run a go-dev container for that go application -# check if maybe there is already a container running for this app -# if so, just docker exec the command inside this app container - -go fmt $@ diff --git a/scripts/install.sh b/scripts/install.sh index 6f6152b..21b44f2 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -185,6 +185,7 @@ install_latex() { texlive-latex-extra \ texlive-latex-recommended \ texlive-pictures \ + texlive-plain-generic \ zathura \ --no-install-recommends } @@ -237,7 +238,6 @@ install_i3() { network-manager-gnome \ network-manager-vpnc \ network-manager-vpnc-gnome \ - nextcloud-desktop \ ntfs-3g \ nmap \ pulseaudio \ @@ -250,7 +250,6 @@ install_i3() { thunderbird-l10n-de \ thunderbird-l10n-en-gb \ vlc \ - xclip \ xorg \ --no-install-recommends @@ -372,25 +371,6 @@ install_virtualbox() { software-properties-common \ --no-install-recommends - curl -fsSL https://download.docker.com/linux/debian/gpg | $SUDO apt-key add - - - # add docker apt repo - cat <<-EOF > /etc/apt/sources.list.d/docker.list - deb [arch=amd64] https://download.docker.com/linux/debian stretch stable - # deb [arch=amd64] https://download.docker.com/linux/debian stretch test - # deb [arch=amd64] https://download.docker.com/linux/debian stretch nightly -EOF - - apt update - apt install -y \ - docker-ce \ - --no-install-recommends - - groupadd docker - addgroup ${USERNAME} docker - - docker version - docker info } get_dotfiles() {