diff --git a/bash/.bashrc b/bash/.bashrc index a81594f..123686f 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -185,3 +185,6 @@ alias prod="ssh -fN sochi" alias top="htop" alias ssh="TERM=xterm-256color ssh" alias vim="nvr -s --remote" +alias buildtool="/home/jfm/Customers/TDC/Code/Onboarding/build-tool/buildtool.sh" +alias vpnup="nmcli con up id \"YouSee VPN\"" +alias vpndown="nmcli con down id \"YouSee VPN\"" diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 2d2d8d2..048c515 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -149,6 +149,7 @@ bindsym $mod+Ctrl+1 exec --no-startup-id ~/.config/i3/workspaces/ws01.sh bindsym $mod+Ctrl+2 exec --no-startup-id ~/.config/i3/workspaces/ws02.sh bindsym $mod+Ctrl+3 exec --no-startup-id ~/.config/i3/workspaces/ws03.sh bindsym $mod+Ctrl+4 exec --no-startup-id ~/.config/i3/workspaces/ws04.sh +bindsym $mod+Shift+Ctrl+4 exec --no-startup-id ~/.config/i3/workspaces/ws04-music.sh #bindsym $mod+Ctrl+5 exec --no-startup-id ~/.config/i3/workspaces/ws05.sh #bindsym $mod+Ctrl+6 exec --no-startup-id ~/.config/i3/workspaces/ws06.sh #bindsym $mod+Ctrl+7 exec --no-startup-id ~/.config/i3/workspaces/ws07.sh @@ -233,3 +234,4 @@ smart_borders on #### Custom Config exec --no-startup-id /home/jfm/.config/i3/scripts/start_layout.sh +exec --no-startup-id /home/jfm/.config/i3/scripts/music.sh diff --git a/i3/.config/i3/layouts/workspace0-timewaste.json b/i3/.config/i3/layouts/workspace0-timewaste.json index e22fce8..c76a3fd 100644 --- a/i3/.config/i3/layouts/workspace0-timewaste.json +++ b/i3/.config/i3/layouts/workspace0-timewaste.json @@ -1,50 +1,49 @@ { - "border": "pixel", - "floating": "auto_off", - "layout": "splitv", - "percent": 1, - "type": "con", - "nodes": [ + "border": "pixel", + "floating": "auto_off", + "layout": "splith", + "percent": 1, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 1, + "floating": "auto_off", + "geometry": { + "height": 434, + "width": 738, + "x": 0, + "y": 0 + }, + "name": "WeeChat", + "percent": 1, + "swallows": [ { - "border": "pixel", - "current_border_width": 1, - "floating": "auto_off", - "geometry": { - "height": 434, - "width": 738, - "x": 0, - "y": 0 - }, - "name": "Hacker News", - "percent": 0.5, - "swallows": [ - { - "class": "^Termite$", - "title": "^hackernews$" - } - ], - "type": "con" - }, - - { - "border": "pixel", - "current_border_width": 1, - "floating": "auto_off", - "geometry": { - "height": 434, - "width": 738, - "x": 0, - "y": 0 - }, - "name": "Reddit", - "percent": 0.5, - "swallows": [ - { - "class": "^Termite$", - "title": "^rtv$", - } - ], - "type": "con" + "class": "^Termite$", + "title": "^weechat$" } - ] + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 1, + "floating": "auto_off", + "geometry": { + "height": 434, + "width": 738, + "x": 0, + "y": 0 + }, + "name": "Music", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^music$", + } + ], + "type": "con" + } + ] } diff --git a/i3/.config/i3/layouts/ws-comms-wide.json b/i3/.config/i3/layouts/ws-comms-wide.json index e270277..bfea610 100644 --- a/i3/.config/i3/layouts/ws-comms-wide.json +++ b/i3/.config/i3/layouts/ws-comms-wide.json @@ -70,7 +70,7 @@ "swallows": [ { "class": "^Google\\-chrome$", - "instance": "^chat.google.com$" + "instance": "^hangouts.google.com$" } ], "type": "con" @@ -115,16 +115,16 @@ "x": 0, "y": 0 }, - "name": "Mattermost", + "name": "Slack", "percent": 1, "swallows": [ { "class": "^Google\\-chrome$", - "instance": "^mattermost.yousee.dk__tdcgroup_channels_onboarding$" + "instance": "^tdcgroup.slack.com__messages_C518LG04W$" } ], "type": "con" } - ] + ] } diff --git a/i3/.config/i3/layouts/ws-news-wide.json b/i3/.config/i3/layouts/ws-news-wide.json new file mode 100644 index 0000000..0317ff7 --- /dev/null +++ b/i3/.config/i3/layouts/ws-news-wide.json @@ -0,0 +1,100 @@ +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.65, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Newsboat", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^newsboat$" + } + ], + "type": "con" + }, + { + "border": "none", + "floating": "auto_off", + "layout": "splith", + "percent": 0.5, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Reddit", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^rtv$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Twitter", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^bark$" + } + ], + "type": "con" + } + ] + } + ] +} + +{ + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Music", + "percent": 0.35, + "swallows": [ + { + "class": "^Google Play Music Desktop Player$", + "instance": "^google play music desktop player$" + } + ], + "type": "con" +} + diff --git a/i3/.config/i3/layouts/ws-work-wide-music.json b/i3/.config/i3/layouts/ws-work-wide-music.json new file mode 100644 index 0000000..0c9a3be --- /dev/null +++ b/i3/.config/i3/layouts/ws-work-wide-music.json @@ -0,0 +1,150 @@ +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.3, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Chrome", + "percent": 0.7, + "swallows": [ + { + "class": "^Google\\-chrome$", + "instance": "^google\\-chrome$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Shell", + "percent": 0.3, + "swallows": [ + { + "class": "^Termite$", + "title": "^shell$" + } + ], + "type": "con" + } + ] +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.4, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "NeoVim", + "percent": 0.7, + "swallows": [ + { + "class": "^Termite$", + "title": "^vim$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Ranger", + "percent": 0.3, + "swallows": [ + { + "class": "^Termite$", + "title": "^ranger$" + } + ], + "type": "con" + } + ] +} + +{ + "border": "none", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.3, + "type": "con", + "nodes": [ + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "Netflix", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^music$" + } + ], + "type": "con" + }, + { + "border": "pixel", + "current_border_width": 0, + "floating": "auto_off", + "geometry": { + "height": 466, + "width": 739, + "x": 0, + "y": 0 + }, + "name": "WeeChat", + "percent": 0.5, + "swallows": [ + { + "class": "^Termite$", + "title": "^weechat$" + } + ], + "type": "con" + } + ] +} + diff --git a/i3/.config/i3/scripts/work-layout.sh b/i3/.config/i3/scripts/work-layout.sh index 823d148..ba55f7d 100755 --- a/i3/.config/i3/scripts/work-layout.sh +++ b/i3/.config/i3/scripts/work-layout.sh @@ -4,8 +4,8 @@ ENV_FILE="/home/jfm/.config/i3/env" /bin/cat <$ENV_FILE export LAPTOP="eDP1" -export PRIMARY="DP1-2" -export SECONDARY="DP1-3" +export PRIMARY="DP1-3" +export SECONDARY="DP1-2" export LOCATION="work" EOM diff --git a/i3/.config/i3/scripts/work-monitors.sh b/i3/.config/i3/scripts/work-monitors.sh index 3e52c66..3df0224 100755 --- a/i3/.config/i3/scripts/work-monitors.sh +++ b/i3/.config/i3/scripts/work-monitors.sh @@ -7,5 +7,6 @@ xrandr --output HDMI-1 --off xrandr --output DP-1 --off xrandr --output DP-2 --off xrandr --output DP-1-1 --off -xrandr --output DP1-3 --mode 1680x1050 --pos 4480x0 --rotate normal -xrandr --output eDP-1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP1-2 --primary --mode 1920x1080 --pos 2560x0 --rotate normal +xrandr --output DP1-2 --mode 1680x1050 --pos 4480x0 --rotate normal +xrandr --output eDP-1 --mode 2560x1440 --pos 0x0 --rotate normal +xrandr --output DP1-3 --primary --mode 1920x1080 --pos 2560x0 --rotate normal diff --git a/i3/.config/i3/workspaces/ws00.sh b/i3/.config/i3/workspaces/ws00.sh index 9e64b53..07bd535 100755 --- a/i3/.config/i3/workspaces/ws00.sh +++ b/i3/.config/i3/workspaces/ws00.sh @@ -1,5 +1,6 @@ #!/bin/bash . ~/.config/i3/env -i3-msg "workspace 0:; append_layout ~/.config/i3/layouts/workspace0-irc.json" +i3-msg "workspace 0:; append_layout ~/.config/i3/layouts/workspace0-timewaste.json" i3-msg "workspace 0:; exec termite -t weechat -e weechat" +i3-msg "workspace 0:; exec termite -t music -e ncmpcpp" i3-msg "workspace 0:; move workspace to output $SECONDARY" diff --git a/i3/.config/i3/workspaces/ws01.sh b/i3/.config/i3/workspaces/ws01.sh index 75a5554..ad3d93c 100755 --- a/i3/.config/i3/workspaces/ws01.sh +++ b/i3/.config/i3/workspaces/ws01.sh @@ -6,12 +6,12 @@ then i3-msg "workspace 1:; append_layout ~/.config/i3/layouts/ws-comms-wide.json" i3-msg "workspace 1:; exec google-chrome-stable --app=https://mail.google.com" i3-msg "workspace 1:; exec google-chrome-stable --app=https://calendar.google.com" - i3-msg "workspace 1:; exec google-chrome-stable --app=https://chat.google.com" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://hangouts.google.com" i3-msg "workspace 1:; exec google-chrome-stable --app=https://messages.android.com" - i3-msg "workspace 1:; exec google-chrome-stable --app=https://mattermost.yousee.dk/tdcgroup/channels/onboarding" + i3-msg "workspace 1:; exec google-chrome-stable --app=https://tdcgroup.slack.com/messages/C518LG04W/" i3-msg "workspace 1:; move workspace to output $PRIMARY" else i3-msg "workspace 1:; append_layout ~/.config/i3/layouts/workspace1-comms.json" - i3-msg "workspace 1:; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" + i3-msg "workspace 1:; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://hangouts.google.com https://messages.android.com https://tdcgroup.slack.com/messages/C518LG04W/" i3-msg "workspace 1:; move workspace to output $LAPTOP" fi diff --git a/i3/.config/i3/workspaces/ws04-music.sh b/i3/.config/i3/workspaces/ws04-music.sh new file mode 100755 index 0000000..c351b37 --- /dev/null +++ b/i3/.config/i3/workspaces/ws04-music.sh @@ -0,0 +1,20 @@ +#!/bin/bash +. ~/.config/i3/env + +if [ $LOCATION = "home" ]; +then + i3-msg "workspace 4:; append_layout ~/.config/i3/layouts/ws-work-wide-music.json" + i3-msg "workspace 4:; exec google-chrome-stable --no-default-browser-check --new-window" + i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote' --hold" + i3-msg "workspace 4:; exec termite -t shell" + i3-msg "workspace 4:; exec termite -t ranger -e ~/.config/ranger/ranger.sh --hold" + i3-msg "workspace 4:; exec termite -t music -e ncmpcpp" + i3-msg "workspace 4:; exec termite -t weechat -e weechat" + i3-msg "workspace 4:; move workspace to output $PRIMARY" +else + i3-msg "workspace 4:; append_layout ~/.config/i3/layouts/workspace4-work.json" + i3-msg "workspace 4:; exec termite -t shell1" + i3-msg "workspace 4:; exec termite -t shell2 -e ~/.config/ranger/ranger.sh --hold" + i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote' --hold" + i3-msg "workspace 4:; move workspace to output $PRIMARY" +fi diff --git a/i3/.config/i3/workspaces/ws09.sh b/i3/.config/i3/workspaces/ws09.sh index 9c5b90e..9ff1152 100755 --- a/i3/.config/i3/workspaces/ws09.sh +++ b/i3/.config/i3/workspaces/ws09.sh @@ -1,7 +1,18 @@ #!/bin/bash . ~/.config/i3/env -i3-msg "workspace 9:; append_layout ~/.config/i3/layouts/workspace9-news.json" -i3-msg "workspace 9:; exec termite -t newsboat -e newsboat" -i3-msg "workspace 9:; exec termite -t hackernews -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py'" -i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark'" -i3-msg "workspace 9:; move workspace to output $SECONDARY" + +if [ $LOCATION = "home" ]; +then + i3-msg "workspace 9:; append_layout ~/.config/i3/layouts/ws-news-wide.json" + i3-msg "workspace 9:; exec termite -t newsboat -e newsboat --hold" + i3-msg "workspace 9:; exec termite -t bark -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py' --hold" + i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark' --hold" + i3-msg "workspace 9:; exec gpmdp" + i3-msg "workspace 9:; move workspace to output $PRIMARY" +else + i3-msg "workspace 9:; append_layout ~/.config/i3/layouts/workspace9-news.json" + i3-msg "workspace 9:; exec termite -t newsboat -e newsboat --hold" + i3-msg "workspace 9:; exec termite -t hackernews -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py' --hold" + i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark' --hold" + i3-msg "workspace 9:; move workspace to output $SECONDARY" +fi diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config index 1245e88..0317add 100644 --- a/polybar/.config/polybar/config +++ b/polybar/.config/polybar/config @@ -78,7 +78,7 @@ font-1 = FontAwesome:pixelsize=12;1 modules-left = i3 modules-center = -modules-right = gpmdp +modules-right = mpd gpmdp [bar/laptop] monitor = ${env:LAPTOP} @@ -241,7 +241,7 @@ label = %date% %time% type = internal/battery battery = BAT0 adapter = AC -full-at = 95 +full-at = 94 interval = 120 format-charging = @@ -278,6 +278,12 @@ type = custom/script exec = ~/.config/polybar/scripts/gpmdp.sh interval = 5 +[module/mpd] +type = internal/mpd +host = 127.0.0.1 +port = 6600 +interval = 2 + [global/wm] margin-top = 5 margin-bottom = 5