From e847880b465bfe76d55e7cfaab536e042d8decef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= Date: Thu, 5 Jul 2018 13:46:57 +0200 Subject: [PATCH] Added music support to status line Reduced termite font to 10 Updated work monitor setup --- i3/.i3/config | 11 ++++++----- i3/.i3/scripts/dock.sh | 6 +++--- i3/.i3/scripts/work-layout.sh | 8 ++++---- i3/.i3/scripts/work-monitors.sh | 2 +- i3/.i3/workspaces/ws01.sh | 2 +- i3/.i3/workspaces/ws08.sh | 2 +- i3status-rs/.config/i3status-rs/config.toml | 10 +++++----- i3status-rs/.config/i3status-rs/gpmdp.sh | 9 +++++++++ termite/.config/termite/config | 2 +- 9 files changed, 31 insertions(+), 21 deletions(-) create mode 100755 i3status-rs/.config/i3status-rs/gpmdp.sh diff --git a/i3/.i3/config b/i3/.i3/config index 84c61df..2866e76 100644 --- a/i3/.i3/config +++ b/i3/.i3/config @@ -21,7 +21,7 @@ bindsym $mod+n border normal # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font xft:DejaVu Sans Mono for Powerline 16 +font xft:DejaVu Sans Mono for Powerline 14 # Use Mouse+$mod to drag floating windows floating_modifier $mod @@ -257,17 +257,18 @@ bar { status_command /usr/bin/i3status-rs /home/jfm/.config/i3status-rs/config.toml position bottom - font xft:DejaVu Sans Mono for Powerline, FontAwesome 16 + font xft:DejaVu Sans Mono for Powerline, FontAwesome 14 strip_workspace_numbers yes - + tray_output primary + colors { background #002b36 statusline #F9FAF9 separator #454947 # border backgr. text - focused_workspace #b58900 #b58900 #002b36 - active_workspace #b58900 #002b36 #b58900 + focused_workspace #93a1a1 #93a1a1 #fdf6e3 + active_workspace #93a1a1 #002b36 #93a1a1 inactive_workspace #002b36 #002b36 #fdf6e3 binding_mode #002b36 #002b36 #F9FAF9 urgent_workspace #002b36 #002b36 #d33682 diff --git a/i3/.i3/scripts/dock.sh b/i3/.i3/scripts/dock.sh index c0ec821..21f9509 100755 --- a/i3/.i3/scripts/dock.sh +++ b/i3/.i3/scripts/dock.sh @@ -15,13 +15,13 @@ sleep 1 . ~/.i3/env sleep 1 -i3-msg "workspace 1:Comms; move workspace to output $SECONDARY" +i3-msg "workspace 1:Comms; move workspace to output $LAPTOP" 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" +i3-msg "workspace 8:Media; move workspace to output $SECONDARY" -exit \ No newline at end of file +exit diff --git a/i3/.i3/scripts/work-layout.sh b/i3/.i3/scripts/work-layout.sh index 1fae44d..4f93e16 100755 --- a/i3/.i3/scripts/work-layout.sh +++ b/i3/.i3/scripts/work-layout.sh @@ -3,13 +3,13 @@ ENV_FILE="/home/jfm/.i3/env" /bin/cat <$ENV_FILE -export LAPTOP="eDP1" -export PRIMARY="DP2-2" -export SECONDARY="DP2-1" +export LAPTOP="eDP-1" +export PRIMARY="DP-1-2" +export SECONDARY="DP-1-3" 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 +#feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg diff --git a/i3/.i3/scripts/work-monitors.sh b/i3/.i3/scripts/work-monitors.sh index 51a7794..c877f2c 100755 --- a/i3/.i3/scripts/work-monitors.sh +++ b/i3/.i3/scripts/work-monitors.sh @@ -1,2 +1,2 @@ #!/bin/sh -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 HDMI2 --off --output HDMI1 --off --output DP2 --off --output DP1 --off +xrandr --output eDP-1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP-1-2 --primary --mode 1920x1080 --pos 2560x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output DP-1-3 --mode 1680x1050 --pos 4480x0 --rotate normal --output DP-2 --off --output DP-1-1 --off diff --git a/i3/.i3/workspaces/ws01.sh b/i3/.i3/workspaces/ws01.sh index b8f853b..6a7b5cd 100755 --- a/i3/.i3/workspaces/ws01.sh +++ b/i3/.i3/workspaces/ws01.sh @@ -3,4 +3,4 @@ i3-msg "workspace 1:Comms; append_layout ~/.i3/layouts/workspace1-comms.json" i3-msg "workspace 1:Comms; 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://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" -i3-msg "workspace 1:Comms; move workspace to output $SECONDARY" +i3-msg "workspace 1:Comms; move workspace to output $LAPTOP" diff --git a/i3/.i3/workspaces/ws08.sh b/i3/.i3/workspaces/ws08.sh index 369016f..b4ea163 100755 --- a/i3/.i3/workspaces/ws08.sh +++ b/i3/.i3/workspaces/ws08.sh @@ -1,5 +1,5 @@ #!/bin/bash . ~/.i3/env i3-msg "workspace 8:Media; append_layout ~/.i3/layouts/workspace8-media.json" -i3-msg "workspace 8:Media; exec termite -c ~/.config/termite/laptop-config -t newsboat -e newsboat" +i3-msg "workspace 8:Media; exec termite -t newsboat -e newsboat" #i3-msg "workspace 8:Media; move workspace to output $LAPTOP" diff --git a/i3status-rs/.config/i3status-rs/config.toml b/i3status-rs/.config/i3status-rs/config.toml index 67fb64a..3c4233d 100644 --- a/i3status-rs/.config/i3status-rs/config.toml +++ b/i3status-rs/.config/i3status-rs/config.toml @@ -6,6 +6,11 @@ name = "solarized-dark" idle_bg = "#93a1a1" idle_fg = "#ffffff" +[[block]] +block = "custom" +command = "~/.config/i3status-rs/gpmdp.sh" +interval = 5 + [[block]] block = "memory" display_type = "memory" @@ -16,11 +21,6 @@ format_swap = "{SUp}%" block = "cpu" interval = 1 -[[block]] -block = "load" -interval = 1 -format = "{1m}" - [[block]] block = "pacman" interval = 10 diff --git a/i3status-rs/.config/i3status-rs/gpmdp.sh b/i3status-rs/.config/i3status-rs/gpmdp.sh new file mode 100755 index 0000000..24265aa --- /dev/null +++ b/i3status-rs/.config/i3status-rs/gpmdp.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +STATUS_CMD=$(gpmdp-remote status) +ICON='\uf001' + +if [ $STATUS_CMD == "Playing" ] +then + echo -e $ICON $(gpmdp-remote current) +fi diff --git a/termite/.config/termite/config b/termite/.config/termite/config index d8e81c1..b2b1f7b 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -1,5 +1,5 @@ [options] -font = DejaVu Sans Mono for Powerline 14 +font = DejaVu Sans Mono for Powerline 10 # Solarized dark color scheme