updates

.aliases

@@ -9,6 +9,14 @@ alias l='ls -CF'
 alias feh='feh -d --scale-down'
 alias camshot='fswebcam -r 640x480 --jpeg 90 -F 3 -D 1 --no-banner'
 
+alias ta='tmux attach'
+alias u='sudo ufw status numbered'
+alias act='sudo systemctl -l -t service --state=active'
+alias fai='sudo systemctl -l -t service --state=failed'
+
+alias dss='docker stack services '
+alias dsd='docker stack deploy -c docker-compose.yml '
+
 alias dps='docker container ls -a'
 alias di='docker image ls'
 alias dv='docker volume '

.gitconfig

@@ -1,6 +1,6 @@
 [user]
     name = Frieder Schlesier
-    email = fschl.code@gmail.com
+    email = frieder@fschl.de
 
 [github]
     user = fschl

.i3/config

@@ -87,11 +87,6 @@ for_window [class="Tor Browser"] floating enable
 
 bindsym $mod+a focus parent # focus the parent container
 
-#bindsym $mod+d focus child # focus the child container
-
-
-bindsym $mod+p exec xrandr-toggle
-
 # manage workspaces
 # http://fontawesome.io/cheatsheet/
 set $WS1 "1 "
@@ -117,16 +112,34 @@ assign [class="^Thunderbird$"] $WS4
 assign [class=".*KeePass.*"] $WS8
 
 # https://faq.i3wm.org/question/3726/workspace-output-multiple-values/index.html%3Fanswer=3731.html#post-id-3731
-set $OUTPUT1 LVDS-1
+set $LAPTOP LVDS-1
-set $OUTPUT2 VGA-1
+set $CENTER VGA-1
+#set $CENTER HDMI-1
+#set $CENTER DP-1
 
-workspace $WS1 output $OUTPUT2
+# monitor settings
-workspace $WS2 output $OUTPUT2
+bindsym $mod+m mode "monitor"
-workspace $WS3 output LVDS-1
+mode "monitor" {
-workspace $WS4 output LVDS-1
+    bindsym 1 exec xrandr --output $LAPTOP --auto --primary --output $CENTER --off $RIGHT --off
-workspace $WS5 output $OUTPUT2
+    bindsym 2 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER
-workspace $WS8 output LVDS-1
+    #bindsym 3 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --auto --right-of $CENTER
-workspace $WS9 output LVDS-1
+
+    # back to normal: Enter or Escape
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+    bindsym $mod+m mode "default"
+}
+
+bindsym $mod+p exec xrandr-toggle
+
+
+workspace $WS1 output $CENTER
+workspace $WS2 output $CENTER
+workspace $WS3 output $LAPTOP
+workspace $WS4 output $LAPTOP
+workspace $WS5 output $CENTER
+workspace $WS8 output $LAPTOP
+workspace $WS9 output $LAPTOP
 
 # switch to workspace
 bindsym $mod+1 workspace $WS1
@@ -207,13 +220,13 @@ bar {
     # inactive_workspace #002b36 #586e75 #002b36
     # urgent_workspace #d33682 #d33682 #fdf6e3
     # }
-    output LVDS-1
+    output $LAPTOP
     font pango:DejaVu Sans Mono, FontAwesome 8
     status_command i3status --config ~/.i3/status.conf
 }
 
 bar {
-    output $OUTPUT2
+    output $CENTER
     output DP-1
     output HDMI-1
     status_command i3status --config ~/.i3/status_small.conf

install.sh

@@ -7,19 +7,12 @@ set -e
 USERNAME=fschl
 
 apt_sources() {
+    DIST="${$1:-stable}"
     cat <<-EOF > /etc/apt/sources.list
-deb http://ftp.de.debian.org/debian/ stable main contrib non-free
+deb http://ftp.de.debian.org/debian/ ${DIST} main contrib non-free
-deb-src http://ftp.de.debian.org/debian/ stable main contrib non-free
 
-deb http://security.debian.org/ stable/updates main contrib non-free
+deb http://security.debian.org/ ${DIST}/updates main contrib non-free
-deb-src http://security.debian.org/ stable/updates main contrib non-free
 
-# stable-updates, previously known as 'volatile'
-deb http://ftp.de.debian.org/debian/ stable-updates main contrib non-free
-deb-src http://ftp.de.debian.org/debian/ stable-updates main contrib non-free
-
-deb http://ftp.de.debian.org/debian/ stable-proposed-updates main
-deb http://ftp.de.debian.org/debian/ testing main
 EOF
 
 }
@@ -47,9 +40,9 @@ base_applications() {
         gcc \
         git \
         gnupg \
-        gnupg2 \
         gnupg-agent \
         gnupg-curl \
+        gnupg2 \
         grep \
         htop \
         iotop \
@@ -61,7 +54,6 @@ base_applications() {
         ssh \
         sudo \
         tar \
-        tinc \
         tmux \
         tree \
         vim \
@@ -137,9 +129,13 @@ install_i3() {
     apt update
     apt install -y \
         alsa-utils \
+        aspell \
+        aspell-de \
+        aspell-en \
         clipit \
         emacs25 \
         feh \
+        fonts-font-awesome \
         fswebcam \
         i3 \
         i3lock \
@@ -163,13 +159,12 @@ install_i3() {
 
     echo "... setting capslock to control"
     sed -i "s/^XKBOPTIONS=.*/XKBOPTIONS=\"ctrl:nocaps\"/" /etc/default/keyboard
-
 }
 
 install_docker() {
 
     # https://docs.docker.com/engine/installation/binaries/#install-static-binaries
-    VERS="17.03.0-ce"
+    VERS="18.03.0-ce"
     echo "installing docker binary Version $VERS ..."
     # https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
 
@@ -198,10 +193,10 @@ install_docker() {
 install_compose() {
 
     # https://github.com/docker/compose/releases
-    VERS="1.11.2"
+    VERS="1.20.1"
     echo "installing docker-compose $VERS ... curling from github"
 
-    curl -SL "https://github.com/docker/compose/releases/download/1.11.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+    curl -SL "https://github.com/docker/compose/releases/download/${VERS}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
 
     chmod +x /usr/bin/docker-compose
 
@@ -318,6 +313,7 @@ main() {
         echo "Usage: \n base | desktop | server | dotfiles | compose | go"
     fi
 
+    # TODO: refactor to case
     if [[ $cmd == "compose" ]]; then
         install_compose
     elif [[ $cmd == "base" ]]; then
@@ -340,8 +336,10 @@ main() {
         install_server_base
     elif [[ $cmd == "desktop" ]]; then
         install_i3
+        if [ -f "./get_private_stuff.sh" ]; then
+            source get_private_stuff.sh
+        fi
     fi
-
 }
 
 main "$@"