From d59d6ce9bcdc0121c67cec927c498a56422e1855 Mon Sep 17 00:00:00 2001 From: Frieder Schlesier Date: Sat, 26 Dec 2015 12:05:14 +0100 Subject: [PATCH] more updates --- .aliases | 1 + .bashrc | 0 .dockerfunc | 20 ++++++++++---------- .gitconfig | 0 .i3/config | 3 +++ .i3/status.conf | 11 ++++++++--- .profile | 0 .tmux.conf | 0 .xsessionrc | 0 20-thinkpad.conf | 13 +++++++++++++ LICENSE.md | 0 Makefile | 0 README.md | 0 install.sh | 0 14 files changed, 35 insertions(+), 13 deletions(-) mode change 100644 => 100755 .aliases mode change 100644 => 100755 .bashrc mode change 100644 => 100755 .dockerfunc mode change 100644 => 100755 .gitconfig mode change 100644 => 100755 .i3/config mode change 100644 => 100755 .i3/status.conf mode change 100644 => 100755 .profile mode change 100644 => 100755 .tmux.conf mode change 100644 => 100755 .xsessionrc create mode 100644 20-thinkpad.conf mode change 100644 => 100755 LICENSE.md mode change 100644 => 100755 Makefile mode change 100644 => 100755 README.md mode change 100644 => 100755 install.sh diff --git a/.aliases b/.aliases old mode 100644 new mode 100755 index a1d41ff..bd12838 --- a/.aliases +++ b/.aliases @@ -12,3 +12,4 @@ alias di='docker images' alias dip="docker inspect -f '{{ .NetworkSettings.IPAddress }}'" # call with or ID alias dih="docker inspect -f '{{ .Config.Hostname }}'" # call with or ID alias dstats="docker stats "'$(sudo docker ps -aq)' # shows stats thingy for all containers + diff --git a/.bashrc b/.bashrc old mode 100644 new mode 100755 diff --git a/.dockerfunc b/.dockerfunc old mode 100644 new mode 100755 index 673101d..19247b5 --- a/.dockerfunc +++ b/.dockerfunc @@ -51,8 +51,8 @@ chrome() { # one day remove /etc/hosts bind mount when effing # overlay support inotify, such bullshit + # --memory 2gb \ docker run -d \ - --memory 2gb \ --net host \ -v /etc/localtime:/etc/localtime:ro \ -v /tmp/.X11-unix:/tmp/.X11-unix \ @@ -66,13 +66,12 @@ chrome() { --device /dev/snd \ --device /dev/dri \ --device /dev/video0 \ - --device /dev/usb \ - --device /dev/bus/usb \ --group-add audio \ --group-add video \ - --name chrome \ - fschl/chrome --user-data-dir=/data --force-device-scale-factor=1 \ - --proxy-server="$proxy" --host-resolver-rules="$map" "$args" + --name="chrome" \ + fschl/chrome:latest --user-data-dir=/data + #--force-device-scale-factor=1 \ + #--proxy-server="$proxy" --host-resolver-rules="$map" "$args" } eclipse() { @@ -80,13 +79,13 @@ eclipse() { docker run -d \ --net host \ + --name="eclipse" \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -e DISPLAY=unix$DISPLAY \ -v $HOME/projects/java/workspace:/home/eclipse/workspace \ -v $HOME/.eclipse/plugins:/opt/eclipse/plugins \ -v $HOME/.eclipse/configuration:/opt/eclipse/configuration \ -v $HOME/.sonar:/home/eclipse/.sonar \ - --name eclipse \ fschl/eclipse:latest } @@ -103,14 +102,14 @@ icedove() { del_stopped icedove docker run -d \ + --name="icedove" \ -v /etc/localtime:/etc/localtime:ro \ -v $HOME/Downloads/:/root/Downloads \ -v $HOME/.thunderbird/:/root/.icedove \ -v $HOME/.gnupg/:/root/.gnupg \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -e DISPLAY=unix$DISPLAY \ - --name icedove \ - fschl/icedove + fschl/icedove:latest } latex() { @@ -144,6 +143,7 @@ openvpn() { del_stopped openvpn docker run -it --rm \ + --name="openvpn" \ --net host \ --device /dev/net/tun:/dev/net/tun \ --cap-add NET_ADMIN \ @@ -222,7 +222,7 @@ vlc() { -v "$args":/home/vlc \ -v /etc/localtime:/etc/localtime:ro \ -v /tmp/.X11-unix:/tmp/.X11-unix \ - -v /run/user/1000/pulse:/run/user/1000/pulse \ + -v /run/user/1000/pulse:/run/user/vlc/pulse \ -v /var/lib/dbus:/var/lib/dbus \ -v ~/.pulse:/root/.pulse \ -e DISPLAY=unix$DISPLAY \ diff --git a/.gitconfig b/.gitconfig old mode 100644 new mode 100755 diff --git a/.i3/config b/.i3/config old mode 100644 new mode 100755 index e1932f6..6a4172b --- a/.i3/config +++ b/.i3/config @@ -87,6 +87,9 @@ bindsym $mod+a focus parent # focus the child container #bindsym $mod+d focus child +# float some applications +for_window [class="Tor Browser"] floating enable + # switch to workspace bindsym $mod+1 workspace 1 bindsym $mod+2 workspace 2 diff --git a/.i3/status.conf b/.i3/status.conf old mode 100644 new mode 100755 index 858a84a..499a76e --- a/.i3/status.conf +++ b/.i3/status.conf @@ -18,7 +18,8 @@ order += "run_watch Docker" order += "run_watch DHCP" order += "path_exists VPN" #order += "ipv6" -order += "wireless wlan0" +#order += "wireless wlan0" +order += "wireless wlp3s0" order += "ethernet eth0" order += "volume master" order += "battery 0" @@ -30,6 +31,10 @@ wireless wlan0 { format_up = "W: (%quality at %essid) %ip" format_down = "W: down" } +wireless wlp3s0 { + format_up = "W: (%quality at %essid) %ip" + format_down = "W: down" +} ethernet eth0 { # if you use %speed, i3status requires root privileges @@ -77,11 +82,11 @@ disk "/" { } disk "/var" { - format = "var %avail" + format = "/var %avail" } disk "/home" { - format = "home %avail" + format = "/home %avail" } volume master { diff --git a/.profile b/.profile old mode 100644 new mode 100755 diff --git a/.tmux.conf b/.tmux.conf old mode 100644 new mode 100755 diff --git a/.xsessionrc b/.xsessionrc old mode 100644 new mode 100755 diff --git a/20-thinkpad.conf b/20-thinkpad.conf new file mode 100644 index 0000000..bdcadcd --- /dev/null +++ b/20-thinkpad.conf @@ -0,0 +1,13 @@ +# https://wiki.debian.org/InstallingDebianOn/Thinkpad/Trackpoint +# should reside at /usr/share/X11/xorg.conf.d/20-thinkpad.conf + +Section "InputClass" + Identifier "Trackpoint Wheel Emulation" + MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint" + MatchDevicePath "/dev/input/event*" + Option "EmulateWheel" "true" + Option "EmulateWheelButton" "2" + Option "Emulate3Buttons" "false" + Option "XAxisMapping" "6 7" + Option "YAxisMapping" "4 5" +EndSection diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh old mode 100644 new mode 100755