From 34499ac38cd254b83eb3d9150520b133499b4e7b Mon Sep 17 00:00:00 2001 From: Frieder Schlesier Date: Mon, 28 May 2018 19:55:53 +0200 Subject: [PATCH] updates --- .aliases | 8 ++++++++ .gitconfig | 2 +- .i3/config | 45 +++++++++++++++++++++++++++++---------------- install.sh | 32 +++++++++++++++----------------- lock.png | Bin 1387 -> 0 bytes 5 files changed, 53 insertions(+), 34 deletions(-) delete mode 100644 lock.png diff --git a/.aliases b/.aliases index 7bc48b9..996a884 100755 --- a/.aliases +++ b/.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 ' diff --git a/.gitconfig b/.gitconfig index 76dd92b..96a9ffb 100755 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] name = Frieder Schlesier - email = fschl.code@gmail.com + email = frieder@fschl.de [github] user = fschl diff --git a/.i3/config b/.i3/config index 77fe9fd..4ba0094 100755 --- a/.i3/config +++ b/.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 $OUTPUT2 VGA-1 +set $LAPTOP LVDS-1 +set $CENTER VGA-1 +#set $CENTER HDMI-1 +#set $CENTER DP-1 -workspace $WS1 output $OUTPUT2 -workspace $WS2 output $OUTPUT2 -workspace $WS3 output LVDS-1 -workspace $WS4 output LVDS-1 -workspace $WS5 output $OUTPUT2 -workspace $WS8 output LVDS-1 -workspace $WS9 output LVDS-1 +# monitor settings +bindsym $mod+m mode "monitor" +mode "monitor" { + bindsym 1 exec xrandr --output $LAPTOP --auto --primary --output $CENTER --off $RIGHT --off + bindsym 2 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER + #bindsym 3 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --auto --right-of $CENTER + + # 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 diff --git a/install.sh b/install.sh index 115eb6d..ea4d78a 100755 --- a/install.sh +++ b/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-src http://ftp.de.debian.org/debian/ stable main contrib non-free +deb http://ftp.de.debian.org/debian/ ${DIST} main contrib non-free -deb http://security.debian.org/ stable/updates main contrib non-free -deb-src http://security.debian.org/ stable/updates main contrib non-free +deb http://security.debian.org/ ${DIST}/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 "$@" diff --git a/lock.png b/lock.png deleted file mode 100644 index e268624ffb83252bd0838b2861ae9dd30da8f6d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1387 zcmV-x1(f=UP)!1A2fvfvbTl{O3P`-+*CY0Qkmh<03LcNwipDF{o;b zh*bUioxnZ74ZvlYf?@u}nH~W8MdWzsA}*GO8BQvvs+)n=fnK1)6k7<>z)9d~5qU*b z0UBn!VuidU6#`mRbvtkfxRzpO0a}3#z+P2-4QTTh(iAJkq75_KOP&PYpfTT>@Br|E zs;*fQE$q8-RaKt_o&hefWg5V3z~|t`2ouXq;V($tvwgtZK)WrI;uLTK_z@Vyjm{f@ z>w#^+rMS_2uKK($BHOK)m$`mmPW(M}5%48&T{fEGP2d3VsfbM2Ab_fF0qzDK11>b- zgc;yr5!t_((Yui0RO>zp?6YxC71#;9Cn9H|Hdm)V`|c{hSGX1r@deN)BBM62Pzv3{ z-fV^XX3yYS;~n5^BHC6lpQ|GBJFp4(IUPuG6L6yy^N`zcDn0B?>xO<2>4zFqb@3Mw z5jhR)0mf|^&&!ahM=pwX>6O3`aFvY#qaxA`wOu$5s`@Ul!|I+M5gE4PLdf01o~^(} zD|+rt-V`G`d7=}z?2mi!4WHXI&gK!O{miIQ2|yHZsF6o2|}Yd zm(mO?adpT|5yRljh74D&P$HqPBo0jv2mpkVTFL&lO9GJev9Elsw3M)Wnz1sq` ztLiFd%T|C@v!ye10P9t?UjEEOmHLy53ecsh7yI`!zyvTUe(hb4np~D@(F$${VjHt_ z=cIMlmRaJA z16xJp7aM@UJ?zaMz#WG)n^|zT+d(TP)EHLPYk)hf-ehc4)hDb70mHb%uDP~cn}t58 z%`zdwT{LG`wycKQO@ff&MvSmamXP6PO>p8-B9pjXkulskR5t||@BMT`L%>}kax|rl03)h;5cm#wE)^?{7%hATcu7Q#+7tmK+p(_#-`ZFi z#4vmkcL-LKBH&z}{0BEXDm_EQFgz-A9E*quA~KDe_&0KkH%JV_E7YAu)x|GEI|(di z8chttYk@1RnBco~1$U@k`XCy^@H$|Rs?V#nCqP@WP zM5;@aAMreI1<#9CD3h3m2dv=v#0q5+)9|1bJfB&iOkx`T+6n+7GGw(fiDh^i_{)l^ zQTs$%FOyh?M{rN$Wk`+M(Ykdk!&AUSC=YvrPw16FEW^FPt~z|s-W7w}xf1v)nw^=wPB2QTn!YvGNAMlYCn}lPy2gz%?GX&B>vJ0WA toxrWY{r