dirty update

2018-06-08 19:56:59 +02:00 · 2018-06-08 19:56:59 +02:00 · 9aff6691aa
parent b14a989a2c
commit 9aff6691aa
7 changed files with 212 additions and 34 deletions
--- a/.Xresources
+++ b/.Xresources
@ -58,37 +58,79 @@ URxvt*background:       [88]S_base04
 *pointerColorBackground:S_base01
 *pointerColorForeground:S_base1

+! !! black dark/light
+! *color0:                S_base02
+! *color8:                S_base03
+
+! !! red dark/light
+! *color1:                S_red
+! *color9:                S_orange
+
+! !! green dark/light
+! *color2:                S_green
+! *color10:               S_base01
+
+! !! yellow dark/light
+! *color3:                S_yellow
+! *color11:               S_base00
+
+! !! blue dark/light
+! *color4:                S_blue
+! *color12:               S_base0
+
+! !! magenta dark/light
+! *color5:                S_magenta
+! *color13:               S_violet
+
+! !! cyan dark/light
+! *color6:                S_cyan
+! *color14:               S_base1
+
+! !! white dark/light
+! *color7:                S_base2
+! *color15:               S_base3
+
+! from: https://gist.github.com/yevgenko/1167205
+
+*background: #001b26
+!!*foreground: #657b83
+!!*fading: 40
+*fadeColor: #002b36
+!*cursorColor: #93a1a1
+!*pointerColorBackground: #586e75
+!*pointerColorForeground: #93a1a1
+
 !! black dark/light
-*color0:                S_base02
-*color8:                S_base03
+*color0: #073642
+*color8: #002b36

 !! red dark/light
-*color1:                S_red
-*color9:                S_orange
+*color1: #dc322f
+*color9: #cb4b16

 !! green dark/light
-*color2:                S_green
-*color10:               S_base01
+*color2: #859900
+*color10: #586e75

 !! yellow dark/light
-*color3:                S_yellow
-*color11:               S_base00
+*color3: #b58900
+*color11: #657b83

 !! blue dark/light
-*color4:                S_blue
-*color12:               S_base0
+*color4: #268bd2
+*color12: #839496

 !! magenta dark/light
-*color5:                S_magenta
-*color13:               S_violet
+*color5: #d33682
+*color13: #6c71c4

 !! cyan dark/light
-*color6:                S_cyan
-*color14:               S_base1
+*color6: #2aa198
+*color14: #93a1a1

 !! white dark/light
-*color7:                S_base2
-*color15:               S_base3
+*color7: #eee8d5
+*color15: #fdf6e3

 *utf8:                  1
 *saveLines:             999999
--- a/.bashrc
+++ b/.bashrc
@ -32,8 +32,12 @@ shopt -s nocaseglob
 shopt -s histappend

 # for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
+HISTSIZE=1000000
+HISTFILESIZE=20000000
+
+#export EDITOR=/usr/bin/emacs;
+#export TERM="urxvt";
+#export TERMINAL="urxvt";

 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
@ -90,7 +94,7 @@ esac

 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+#    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
    alias ls='ls --color=auto'
    alias grep='grep --color=auto'
    alias fgrep='fgrep --color=auto'
@ -113,5 +117,5 @@ if ! shopt -oq posix; then
 fi

 export GOROOT=/usr/local/go
-export GOPATH=~/projects/go-projects
+export GOPATH=/home/fschl/projects/go-projects
 export PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin
--- a/.dockerfunc
+++ b/.dockerfunc
@ -64,8 +64,8 @@ android-studio() {
           -v $ANDROID_DIR/projects:/home/developer/AndroidStudioProjects \
           -v $ANDROID_DIR:/workspace \
           -v $ANDROID_DIR/.docker-dev/.studio-home:/home/developer/.AndroidStudio1.2 \
-           -v $ANDROID_DIR/.docker-dev/.android/avd:/home/developer/.android/avd \
-           ${DOCKER_REPO_PREFIX}/android-studio:latest \
+           -v $ANDROID_DIR/.docker-dev/.android:/home/developer/.android \
+           ${DOCKER_REPO_PREFIX}/android-studio3:latest \
           /bin/studio

    #exit 0;
@ -83,6 +83,21 @@ ant() {
           bash -c "$args"
 }

+arduino() {
+    docker run \
+        -it \
+        --rm \
+        --network=host \
+        --privileged \
+        -e DISPLAY=$DISPLAY \
+        -v /tmp/.X11-unix:/tmp/.X11-unix \
+        -v /dev/ttyUSB0:/dev/ttyUSB0 \
+        -v $HOME/topics:/topics \
+        -v $HOME/projects:/projects \
+        tombenke/darduino:latest \
+        arduino
+}
+
 bro() {
    docker run -it --rm \
           ${DOCKER_REPO_PREFIX}/bropages \
@ -179,10 +194,10 @@ eneon() {
           -e DISPLAY=unix$DISPLAY \
           -v $HOME/projects/java/workspace:/home/eclipse/workspace \
           -v $HOME/dockerfiles/eclipse/eclipse.ini:/opt/eclipse/eclipse.ini:ro \
-           -v /var/run/docker.sock:/var/run/docker.sock \
           -v $HOME/.eclipse_neon/eclipse:/home/elipse/.eclipse/ \
           -v $HOME/.eclipse_neon/plugins:/opt/eclipse/plugins/ \
           -v $HOME/.eclipse_neon/configuration:/opt/eclipse/configuration \
+           -v /var/run/docker.sock:/var/run/docker.sock \
           -v $(which docker):/bin/docker \
           --device /dev/video0 \
           --group-add audio \
@ -192,6 +207,42 @@ eneon() {
    #    exit 0;
 }

+oxygen() {
+    # del_stopped papyrus
+
+    MYUSERID=$(id --user)
+
+    echo "starting papyrus with uid"
+    echo $MYUSERID
+
+           #     -v $BASE/.eclipse:/home/eclipse/.eclipse/ \
+           # -v $BASE/.gradle:/home/eclipse/.gradle/ \
+           # -v $BASE/.egradle:/home/eclipse/.egradle/ \
+           # -v $BASE/plugins:/opt/eclipse/plugins/ \
+           # -v $BASE/configuration:/opt/eclipse/configuration \
+
+
+    local BASE="/media/driveBay/Backups/eclipse-configs/oxygen_configs"
+    docker run -it \
+           --net host \
+           --name="oxygen" \
+           -v /tmp/.X11-unix:/tmp/.X11-unix \
+           -e DISPLAY=unix$DISPLAY \
+           -v $HOME/projects/java/workspace:/home/eclipse/workspace \
+           -v /var/run/docker.sock:/var/run/docker.sock \
+           -v $(which docker):/bin/docker \
+           --user $MYUSERID \
+           --device /dev/video0 \
+           --group-add audio \
+           --group-add video \
+           ${DOCKER_REPO_PREFIX}/eclipse:oxygen \
+           sh -c "/opt/eclipse/eclipse"
+
+    #    exit 0;
+}
+
+
+
 gimp() {
    del_stopped gimp

@ -207,31 +258,53 @@ gimp() {
    exit 0;
 }

-go() {
-    docker run -i --rm \
-           -v "$PWD":/usr/src/myapp \
-           -w /usr/src/myapp \
-           ${DOCKER_REPO_PREFIX}/golang-dev:latest go "$@"
-}
-
-
 icedove() {
    del_stopped icedove
+    MYUSERID=$(id --user)
+
+    echo "starting with"
+    echo $MYUSERID

    docker run -d \
           --name="icedove" \
           -v /etc/localtime:/etc/localtime:ro \
           -v $HOME/Downloads/:/root/Downloads \
           -v $HOME/Documents/:/root/Documents \
-           -v $HOME/.thunderbird/:/root/.icedove \
+           -v $HOME/.thunderbird/:/root/.thunderbird \
           -v $HOME/.gnupg/:/root/.gnupg \
           -v /tmp/.X11-unix:/tmp/.X11-unix \
           -e DISPLAY=unix$DISPLAY \
-           ${DOCKER_REPO_PREFIX}/icedove:latest
+           ${DOCKER_REPO_PREFIX}/thunderbird:latest
+#           -v $HOME/.thunderbird/:/root/.icedove \
+#           ${DOCKER_REPO_PREFIX}/icedove:latest

    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

@ -396,6 +469,19 @@ 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

--- a/.tmux.conf
+++ b/.tmux.conf
@ -1,3 +1,4 @@
+# similar to emacs commands...
 unbind C-b
 set -g prefix M-a

--- a/.vimrc
+++ b/.vimrc
@ -0,0 +1,16 @@
+set encoding=utf8
+
+set number
+set ruler
+set smartcase
+set hlsearch
+set expandtab
+set smarttab
+set shiftwidth=4
+set tabstop=4
+
+set ai "auto indent
+set si "smart indent
+set wrap "wrap lines
+
+syntax enable
--- a/2
+++ b/2
@ -9,7 +9,7 @@ install: all
 # TODO: remove i3 config from default setup. we don't need this on servers
 dotfiles:
 # add aliases for dotfiles
-	for file in $(shell find $(CURDIR) -name ".*" -not -name ".gitignore" -not -name ".git" -not -name ".*.swp"); do \
+	for file in $(shell find $(CURDIR) -name ".*" -not -name ".gitignore" -not -name ".git" -not -name ".*.swp" -not -name ".*ssh*"); do \
 		f=$$(basename $$file); \
 		ln -sfn $$file $(HOME)/$$f; \
 	done
--- a/etc/fonts/local.conf
+++ b/etc/fonts/local.conf
@ -0,0 +1,29 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+    <match target="font">
+        <edit mode="assign" name="rgba">
+            <const>rgb</const>
+        </edit>
+    </match>
+    <match target="font">
+        <edit mode="assign" name="hinting">
+            <bool>true</bool>
+        </edit>
+    </match>
+    <match target="font">
+        <edit mode="assign" name="hintstyle">
+            <const>hintslight</const>
+        </edit>
+    </match>
+    <match target="font">
+        <edit mode="assign" name="antialias">
+            <bool>true</bool>
+        </edit>
+    </match>
+    <match target="font">
+        <edit mode="assign" name="lcdfilter">
+            <const>lcddefault</const>
+        </edit>
+    </match>
+</fontconfig>