From 1564e8b0d02edd4b62b49f7828db0e6e26253c9e Mon Sep 17 00:00:00 2001 From: jfm Date: Sun, 22 Apr 2018 18:44:43 +0200 Subject: [PATCH] More workspace and docking changes --- i3/.i3/scripts/dock.sh | 30 +++++++++++++++++------------- i3/.i3/scripts/home-layout.sh | 11 +++++------ i3/.i3/scripts/home-monitors.sh | 2 +- i3/.i3/scripts/laptop-layout.sh | 6 +++--- i3/.i3/scripts/laptop-monitors.sh | 2 +- i3/.i3/scripts/undock.sh | 31 +++++++++++++++++++------------ i3/.i3/scripts/work-layout.sh | 12 ++++++------ i3/.i3/scripts/work-monitors.sh | 2 +- i3/.i3/workspaces/ws01.sh | 2 +- i3/.i3/workspaces/ws02.sh | 2 +- 10 files changed, 55 insertions(+), 45 deletions(-) diff --git a/i3/.i3/scripts/dock.sh b/i3/.i3/scripts/dock.sh index 9fb450a..cae41d6 100755 --- a/i3/.i3/scripts/dock.sh +++ b/i3/.i3/scripts/dock.sh @@ -1,29 +1,33 @@ #!/bin/bash -. ~/.config/i3/env if [[ $(iwgetid -r) = *adazio* ]]; then echo "@Work" - ~/.config/i3/scripts/work-layout.sh & + ~/.i3/scripts/work-monitors.sh & + ~/.i3/scripts/work-layout.sh & fi if [[ $(iwgetid -r) = *moerks.dk* ]]; then echo "@Home" - ~/.config/i3/scripts/home-layout.sh & + ~/.i3/scripts/home-monitors.sh & + ~/.i3/scripts/home-layout.sh & fi +sleep 1 +. ~/.i3/env + echo $PRIMARY echo $SECONDARY echo $LAPTOP sleep 1 -i3-msg "workspace 1: Comms; move workspace to output $SECONDARY" -i3-msg "workspace 2: Web; move workspace to output $PRIMARY" -i3-msg "workspace 3: IDE; move workspace to output $PRIMARY" -i3-msg "workspace 4: Work; move workspace to output $PRIMARY" -i3-msg "workspace 5: Media; move workspace to output $LAPTOP" -i3-msg "workspace 6: REST; move workspace to output $SECONDARY" -i3-msg "workspace 7: OC; move workspace to output $PRIMARY" -i3-msg "workspace 8: Logs; move workspace to output $PRIMARY" -i3-msg "workspace 9: Terminals; move workspace to output $PRIMARY" -i3-msg "workspace 10: Terminals; move workspace to output $PRIMARY" +i3-msg "workspace 1:Comms; move workspace to output $SECONDARY" +i3-msg "workspace 2:Web; move workspace to output $PRIMARY" +i3-msg "workspace 3:IDE; move workspace to output $PRIMARY" +i3-msg "workspace 4:Work; move workspace to output $PRIMARY" +i3-msg "workspace 5:OC; move workspace to output $PRIMARY" +i3-msg "workspace 6:Logs; move workspace to output $SECONDARY" +i3-msg "workspace 7:Term; move workspace to output $PRIMARY" +i3-msg "workspace 8:Media; move workspace to output $LAPTOP" + +exit \ No newline at end of file diff --git a/i3/.i3/scripts/home-layout.sh b/i3/.i3/scripts/home-layout.sh index 7d31131..3d45038 100755 --- a/i3/.i3/scripts/home-layout.sh +++ b/i3/.i3/scripts/home-layout.sh @@ -1,15 +1,14 @@ #!/bin/sh -ENV_FILE="/home/jfm/.config/i3/env" +ENV_FILE="/home/jfm/.i3/env" /bin/cat <$ENV_FILE -export LAPTOP="eDP-1" -export PRIMARY="DP-2-1" -export SECONDARY="DP-2-2" +export LAPTOP="eDP1" +export PRIMARY="DP2-1" +export SECONDARY="DP2-2" export LDPI_PROFILE="default" export HDPI_PROFILE="laptop" EOM -~/.config/polybar/home-polybar.sh -feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg \ No newline at end of file +#~/.config/polybar/home-polybar.sh diff --git a/i3/.i3/scripts/home-monitors.sh b/i3/.i3/scripts/home-monitors.sh index c7a7343..6560bf9 100755 --- a/i3/.i3/scripts/home-monitors.sh +++ b/i3/.i3/scripts/home-monitors.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output DP-2-1 --mode 1920x1200 --pos 1920x0 --rotate normal --output DP-2-2 --primary --mode 1920x1200 --pos 0x0 --rotate normal --output DP-2-3 --off --output eDP-1 --off --output HDMI-2 --off --output HDMI-1 --off --output DP-2 --off --output DP-1 --off +xrandr --output DP2-1 --mode 1920x1200 --pos 1920x0 --rotate normal --output DP2-2 --primary --mode 1920x1200 --pos 0x0 --rotate normal --output DP2-3 --off --output eDP1 --off --output HDMI2 --off --output HDMI1 --off --output DP2 --off --output DP1 --off diff --git a/i3/.i3/scripts/laptop-layout.sh b/i3/.i3/scripts/laptop-layout.sh index e40055f..ee454f7 100755 --- a/i3/.i3/scripts/laptop-layout.sh +++ b/i3/.i3/scripts/laptop-layout.sh @@ -3,9 +3,9 @@ ENV_FILE="/home/jfm/.i3/env" /bin/cat <$ENV_FILE -export LAPTOP="eDP-1" -export PRIMARY="eDP-1" -export SECONDARY="eDP-1" +export LAPTOP="eDP1" +export PRIMARY="eDP1" +export SECONDARY="eDP1" export LDPI_PROFILE="laptop" export HDPI_PROFILE="laptop" diff --git a/i3/.i3/scripts/laptop-monitors.sh b/i3/.i3/scripts/laptop-monitors.sh index fbe5847..68f005f 100755 --- a/i3/.i3/scripts/laptop-monitors.sh +++ b/i3/.i3/scripts/laptop-monitors.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output eDP-1 --primary --mode 2560x1440 --pos 0x0 --rotate normal --output DP-2 --off +xrandr --output HDMI2 --off --output HDMI1 --off --output DP1 --off --output eDP1 --primary --mode 2560x1440 --pos 0x0 --rotate normal --output DP2 --off diff --git a/i3/.i3/scripts/undock.sh b/i3/.i3/scripts/undock.sh index 5a988b5..b457c05 100755 --- a/i3/.i3/scripts/undock.sh +++ b/i3/.i3/scripts/undock.sh @@ -1,15 +1,22 @@ #!/bin/bash -. ~/.config/i3/env -~/.config/i3/scripts/laptop-layout.sh & +~/.i3/scripts/laptop-monitors.sh & +~/.i3/scripts/laptop-layout.sh & -i3-msg "workspace 1: Comms; move workspace to output $LAPTOP" -i3-msg "workspace 2: Web; move workspace to output $LAPTOP" -i3-msg "workspace 3: IDE; move workspace to output $LAPTOP" -i3-msg "workspace 4: Work; move workspace to output $LAPTOP" -i3-msg "workspace 5: Media; move workspace to output $LAPTOP" -i3-msg "workspace 6: REST; move workspace to output $LAPTOP" -i3-msg "workspace 7: OC; move workspace to output $LAPTOP" -i3-msg "workspace 8: Logs; move workspace to output $LAPTOP" -i3-msg "workspace 9: Terminals; move workspace to output $LAPTOP" -i3-msg "workspace 10: Terminals; move workspace to output $LAPTOP" +sleep 1 +. ~/.i3/env + +echo $PRIMARY +echo $SECONDARY +echo $LAPTOP + +i3-msg "workspace 1:Comms; move workspace to output $LAPTOP" +i3-msg "workspace 2:Web; move workspace to output $LAPTOP" +i3-msg "workspace 3:IDE; move workspace to output $LAPTOP" +i3-msg "workspace 4:Work; move workspace to output $LAPTOP" +i3-msg "workspace 5:OC; move workspace to output $LAPTOP" +i3-msg "workspace 6:Logs; move workspace to output $LAPTOP" +i3-msg "workspace 7:Term; move workspace to output $LAPTOP" +i3-msg "workspace 8:Media; move workspace to output $LAPTOP" + +exit \ No newline at end of file diff --git a/i3/.i3/scripts/work-layout.sh b/i3/.i3/scripts/work-layout.sh index 6c0d9a1..1fae44d 100755 --- a/i3/.i3/scripts/work-layout.sh +++ b/i3/.i3/scripts/work-layout.sh @@ -1,15 +1,15 @@ #!/bin/sh -ENV_FILE="/home/jfm/.config/i3/env" +ENV_FILE="/home/jfm/.i3/env" /bin/cat <$ENV_FILE -export LAPTOP="eDP-1" -export PRIMARY="DP-2-2" -export SECONDARY="DP-2-1" +export LAPTOP="eDP1" +export PRIMARY="DP2-2" +export SECONDARY="DP2-1" export LDPI_PROFILE="default" export HDPI_PROFILE="laptop" EOM -~/.config/polybar/work-polybar.sh -feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg \ No newline at end of file +#~/.config/polybar/work-polybar.sh +#feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg \ No newline at end of file diff --git a/i3/.i3/scripts/work-monitors.sh b/i3/.i3/scripts/work-monitors.sh index 639938e..6b66357 100755 --- a/i3/.i3/scripts/work-monitors.sh +++ b/i3/.i3/scripts/work-monitors.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output DP-2-1 --mode 1280x1024 --pos 0x0 --rotate normal --output DP-2-2 --mode 1920x1080 --pos 1280x0 --rotate normal --output DP-2-3 --off --output eDP-1 --primary --mode 2560x1440 --pos 3200x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP-2 --off --output DP-1 --off +xrandr --output DP2-1 --mode 1280x1024 --pos 0x0 --rotate normal --output DP2-2 --mode 1920x1080 --pos 1280x0 --rotate normal --output DP2-3 --off --output eDP1 --primary --mode 2560x1440 --pos 3200x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP2 --off --output DP1 --off diff --git a/i3/.i3/workspaces/ws01.sh b/i3/.i3/workspaces/ws01.sh index 7a521a3..5ce8dbc 100755 --- a/i3/.i3/workspaces/ws01.sh +++ b/i3/.i3/workspaces/ws01.sh @@ -2,5 +2,5 @@ . ~/.i3/env i3-msg "workspace 1:Comms; append_layout ~/.i3/layouts/workspace1-comms.json" -i3-msg "workspace 1:Comms; exec google-chrome-stable --new-window https://chat.google.com https://mattermost.yousee.dk https://tdcgroup.slack.com" +i3-msg "workspace 1:Comms; exec google-chrome-stable --new-window https://chat.google.com https://mattermost.yousee.dk https://tdcgroup.slack.com --no-default-browser-check" i3-msg "workspace 1:Comms; move workspace to output $SECONDARY" diff --git a/i3/.i3/workspaces/ws02.sh b/i3/.i3/workspaces/ws02.sh index 3dbf52d..0fdac45 100755 --- a/i3/.i3/workspaces/ws02.sh +++ b/i3/.i3/workspaces/ws02.sh @@ -2,6 +2,6 @@ . ~/.i3/env i3-msg "workspace 2:Web; append_layout ~/.i3/layouts/workspace2-web.json" -i3-msg "workspace 2: Web; exec google-chrome-stable --new-window https://www.toggl.com/app/timer https://inbox.google.com/" +i3-msg "workspace 2: Web; exec google-chrome-stable --new-window https://www.toggl.com/app/timer https://inbox.google.com/ --no-default-browser-check" i3-msg "workspace 2: Web; move workspace to output $PRIMARY"