From 1bf929addbfb62650aab4d17d3148f3da7d85922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= Date: Wed, 7 Nov 2018 08:10:14 +0100 Subject: [PATCH] Worked on ultrawide layouts --- compton/.config/compton/compton.conf | 8 +- i3/.config/i3/config | 4 +- i3/.config/i3/layouts/ws-comms-wide.json | 25 ++- i3/.config/i3/layouts/ws-ide-wide.json | 41 +--- i3/.config/i3/layouts/ws-work-wide.json | 270 ++++++++++++----------- i3/.config/i3/scripts/home-layout.sh | 3 +- i3/.config/i3/scripts/home-monitors.sh | 4 +- i3/.config/i3/scripts/work-layout.sh | 3 +- i3/.config/i3/workspaces/ws03.sh | 10 +- i3/.config/i3/workspaces/ws04.sh | 10 +- termite/.config/termite/home-config | 33 +++ termite/.config/termite/laptop-config | 7 +- 12 files changed, 211 insertions(+), 207 deletions(-) create mode 100644 termite/.config/termite/home-config diff --git a/compton/.config/compton/compton.conf b/compton/.config/compton/compton.conf index df13e61..6f71145 100644 --- a/compton/.config/compton/compton.conf +++ b/compton/.config/compton/compton.conf @@ -62,7 +62,6 @@ no-dnd-shadow = true; # Avoid drawing shadows on dock/panel windows. no-dock-shadow = true; # Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows. -clear-shadow = true; # The blur radius for shadows. (default 12) shadow-radius = 5; # The left offset for shadows. (default -15) @@ -117,8 +116,7 @@ inactive-opacity-override = false; alpha-step = 0.06; opacity-rule = [ - "100:name = 'Netflix'", - "100:class_g = 'Google-chrome'" + "100:name = 'Netflix'" ]; # Dim inactive windows. (0.0 - 1.0) @@ -134,7 +132,6 @@ blur-background-fixed = false; blur-background-exclude = [ "name = 'Netflix'", "class_g = 'netflix.com'", - "class_g = 'Google-chrome'", "window_type = 'dock'", "window_type = 'desktop'" ]; @@ -157,10 +154,9 @@ fade-out-step = 0.03; # no-fading-openclose = true; # Specify a list of conditions of windows that should not be faded. -fade-exclude = [ +fade-exclude = [ "name = 'Netflix'", "class_g = 'netflix.com'", - "class_g = 'Google-chrome'" ]; ################################# diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 4a6da75..2d2d8d2 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -160,7 +160,7 @@ for_window [class="^.*"] border pixel 0 for_window [class="Nitrogen"] floating enable sticky enable border none for_window [class="feh"] floating enable sticky enable border none for_window [class="mpv"] floating enable sticky enable border none -for_window [class="^jetbrains-.+"][window_type=dialog] focus +#for_window [class="^jetbrains-.+"][window_type=dialog] focus for_window [class="Arandr"] floating enable sticky enable border none # reload the configuration file @@ -174,10 +174,8 @@ bindsym $mod+l exec --no-startup-id light-locker-command -l # Autostart applications exec --no-startup-id compton --config /home/jfm/.config/compton/compton.conf -#exec --no-startup-id nitrogen --restore exec --no-startup-id nm-applet exec --no-startup-id pasystray -#exec --no-startup-id blueman-applet exec --no-startup-id light-locker # Color palette used for the terminal ( ~/.Xresources file ) diff --git a/i3/.config/i3/layouts/ws-comms-wide.json b/i3/.config/i3/layouts/ws-comms-wide.json index 1d7fbcc..e270277 100644 --- a/i3/.config/i3/layouts/ws-comms-wide.json +++ b/i3/.config/i3/layouts/ws-comms-wide.json @@ -15,11 +15,12 @@ "x": 0, "y": 0 }, - "name": "jfm@moerks:~", + "name": "Mail", "percent": 0.5, "swallows": [ { - "class": "^Termite$" + "class": "^Google\\-chrome$", + "instance": "^mail.google.com$" } ], "type": "con" @@ -34,11 +35,12 @@ "x": 0, "y": 0 }, - "name": "jfm@moerks:~", + "name": "Calendar", "percent": 0.5, "swallows": [ { - "class": "^Termite$" + "class": "^Google\\-chrome$", + "instance": "^calendar.google.com$" } ], "type": "con" @@ -63,11 +65,12 @@ "x": 0, "y": 0 }, - "name": "jfm@moerks:~", + "name": "Hangouts Chat", "percent": 0.5, "swallows": [ { - "class": "^Termite$" + "class": "^Google\\-chrome$", + "instance": "^chat.google.com$" } ], "type": "con" @@ -82,11 +85,12 @@ "x": 0, "y": 0 }, - "name": "jfm@moerks:~", + "name": "Messages", "percent": 0.5, "swallows": [ { - "class": "^Termite$" + "class": "^Google\\-chrome$", + "instance": "^messages.android.com$" } ], "type": "con" @@ -111,11 +115,12 @@ "x": 0, "y": 0 }, - "name": "jfm@moerks:~", + "name": "Mattermost", "percent": 1, "swallows": [ { - "class": "^Termite$" + "class": "^Google\\-chrome$", + "instance": "^mattermost.yousee.dk__tdcgroup_channels_onboarding$" } ], "type": "con" diff --git a/i3/.config/i3/layouts/ws-ide-wide.json b/i3/.config/i3/layouts/ws-ide-wide.json index ea2ff64..056259a 100644 --- a/i3/.config/i3/layouts/ws-ide-wide.json +++ b/i3/.config/i3/layouts/ws-ide-wide.json @@ -9,7 +9,7 @@ "y": 0 }, "name": "Chrome", - "percent": 0.333333333333333, + "percent": 0.333, "swallows": [ { "class": "^Google\\-chrome" @@ -21,8 +21,8 @@ { "border": "none", "floating": "auto_off", - "layout": "splith", - "percent": 0.41875, + "layout": "tabbed", + "percent": 0.666, "type": "con", "nodes": [ { @@ -39,42 +39,11 @@ "percent": 0.595663265306122, "swallows": [ { - "class": "^Termite$", - "title": "^vim$" - } - ], - "type": "con" - } - ] -} - -{ - "border": "none", - "floating": "auto_off", - "layout": "splitv", - "percent": 0.247916666666667, - "type": "con", - "nodes": [ - { - "border": "pixel", - "current_border_width": 0, - "floating": "auto_off", - "geometry": { - "height": 466, - "width": 739, - "x": 0, - "y": 0 - }, - "name": "Shell", - "percent": 0.5, - "swallows": [ - { - "class": "^Termite$", - "title": "^shell$" + "class": "^jetbrains-idea$", + "instance": "^sun\\-awt\\-X11\\-XFramePeer$" } ], "type": "con" } ] } - diff --git a/i3/.config/i3/layouts/ws-work-wide.json b/i3/.config/i3/layouts/ws-work-wide.json index 6f8bf7c..9ed3fdb 100644 --- a/i3/.config/i3/layouts/ws-work-wide.json +++ b/i3/.config/i3/layouts/ws-work-wide.json @@ -1,148 +1,150 @@ { - "border": "pixel", - "current_border_width": 0, - "floating": "auto_off", - "geometry": { - "height": 466, - "width": 739, - "x": 0, - "y": 0 + "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" }, - "name": "Chrome", - "percent": 0.333333333333333, - "swallows": [ - { - "class": "^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": "splith", - "percent": 0.41875, - "type": "con", - "nodes": [ + "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": [ { - "border": "pixel", - "current_border_width": 0, - "floating": "auto_off", - "geometry": { - "height": 466, - "width": 739, - "x": 0, - "y": 0 - }, - "name": "NeoVim", - "percent": 0.595663265306122, - "swallows": [ - { - "class": "^Termite$", - "title": "^vim$" - } - ], - "type": "con" - }, - { - "border": "none", - "floating": "auto_off", - "layout": "splitv", - "percent": 0.404336734693878, - "type": "con", - "nodes": [ - { - "border": "pixel", - "current_border_width": 0, - "floating": "auto_off", - "geometry": { - "height": 466, - "width": 739, - "x": 0, - "y": 0 - }, - "name": "Shell", - "percent": 0.791666666666667, - "swallows": [ - { - "class": "^Termite$", - "title": "^shell1$" - } - ], - "type": "con" - }, - { - "border": "pixel", - "current_border_width": 0, - "floating": "auto_off", - "geometry": { - "height": 466, - "width": 739, - "x": 0, - "y": 0 - }, - "name": "Ranger", - "percent": 0.208333333333333, - "swallows": [ - { - "class": "^Termite$", - "title": "^ranger$" - } - ], - "type": "con" - } - ] + "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.247916666666667, - "type": "con", - "nodes": [ + "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": [ { - "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": "^Netflix$" - } - ], - "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" + "class": "^Google\\-chrome$", + "instance": "^netflix.com$" } - ] + ], + "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/home-layout.sh b/i3/.config/i3/scripts/home-layout.sh index 0b7368a..e8d9323 100755 --- a/i3/.config/i3/scripts/home-layout.sh +++ b/i3/.config/i3/scripts/home-layout.sh @@ -5,7 +5,7 @@ ENV_FILE="/home/jfm/.config/i3/env" /bin/cat <$ENV_FILE export LAPTOP="DP1-3" export PRIMARY="DP1-3" -export SECONDARY="DP1-2" +export SECONDARY="DP1-3" export LOCATION="home" EOM @@ -15,5 +15,4 @@ EOM killall polybar & sleep 1 polybar primary & -polybar secondary & nitrogen --restore & diff --git a/i3/.config/i3/scripts/home-monitors.sh b/i3/.config/i3/scripts/home-monitors.sh index 70f378e..a24321c 100755 --- a/i3/.config/i3/scripts/home-monitors.sh +++ b/i3/.config/i3/scripts/home-monitors.sh @@ -9,5 +9,5 @@ xrandr --output HDMI2 --off xrandr --output HDMI1 --off xrandr --output DP1-1 --off xrandr --output DP2 --off -xrandr --output DP1-3 --primary --mode 1920x1200 --pos 0x0 --rotate normal -xrandr --output DP1-2 --mode 1920x1200 --pos 1920x0 --rotate normal +xrandr --output DP1-3 --primary --mode 3440x1440 --pos 0x0 --rotate normal +xrandr --output DP1-2 --off diff --git a/i3/.config/i3/scripts/work-layout.sh b/i3/.config/i3/scripts/work-layout.sh index db04b45..823d148 100755 --- a/i3/.config/i3/scripts/work-layout.sh +++ b/i3/.config/i3/scripts/work-layout.sh @@ -7,8 +7,7 @@ export LAPTOP="eDP1" export PRIMARY="DP1-2" export SECONDARY="DP1-3" -export LDPI_PROFILE="default" -export HDPI_PROFILE="laptop" +export LOCATION="work" EOM . $ENV_FILE diff --git a/i3/.config/i3/workspaces/ws03.sh b/i3/.config/i3/workspaces/ws03.sh index 7c70dfe..10391bb 100755 --- a/i3/.config/i3/workspaces/ws03.sh +++ b/i3/.config/i3/workspaces/ws03.sh @@ -3,9 +3,11 @@ if [ $LOCATION = "home" ]; then - i3-msg "workspace 3:IDE; append_layout ~/.config/i3/layouts/ws-ide-wide.json" - i3-msg "workspace 3:IDE; move workspace to output $PRIMARY" + i3-msg "workspace 3:; append_layout ~/.config/i3/layouts/ws-ide-wide.json" + i3-msg "workspace 3:; exec google-chrome-stable --no-default-browser-check --new-window" + i3-msg "workspace 3:; exec /home/jfm/Tools/idea-2018.2/bin/idea.sh" + i3-msg "workspace 3:; move workspace to output $PRIMARY" else - i3-msg "workspace 3:IDE; append_layout ~/.config/i3/layouts/workspace3-ide.json" - i3-msg "workspace 3:IDE; move workspace to output $PRIMARY" + i3-msg "workspace 3:; append_layout ~/.config/i3/layouts/workspace3-ide.json" + i3-msg "workspace 3:; move workspace to output $PRIMARY" fi diff --git a/i3/.config/i3/workspaces/ws04.sh b/i3/.config/i3/workspaces/ws04.sh index 7b302ea..463fb75 100755 --- a/i3/.config/i3/workspaces/ws04.sh +++ b/i3/.config/i3/workspaces/ws04.sh @@ -5,16 +5,16 @@ if [ $LOCATION = "home" ]; then i3-msg "workspace 4:; append_layout ~/.config/i3/layouts/ws-work-wide.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'" - i3-msg "workspace 4:; exec termite -t shell1" - i3-msg "workspace 4:; exec termite -t ranger -e ~/.config/ranger/ranger.sh" + 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 google-chrome-stable --app=http://netflix.com" 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" - i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote'" + 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/termite/.config/termite/home-config b/termite/.config/termite/home-config new file mode 100644 index 0000000..59a2bcc --- /dev/null +++ b/termite/.config/termite/home-config @@ -0,0 +1,33 @@ +[options] +font = Source Code Pro for Powerline 15 +scrollback_lines = 10000 +size_hints = true + +# Solarized dark color scheme +[colors] +foreground = #839496 +foreground_bold = #eee8d5 +foreground_dim = #002b36 +background = #002b36 +cursor = #93a1a1 + +# if unset, will reverse foreground and background +#highlight = #839496 + +# colors from color0 to color254 can be set +color0 = #073642 +color1 = #dc322f +color2 = #859900 +color3 = #b58900 +color4 = #268bd2 +color5 = #d33682 +color6 = #2aa198 +color7 = #eee8d5 +color8 = #002b36 +color9 = #cb4b16 +color10 = #586e75 +color11 = #657b83 +color12 = #839496 +color13 = #6c71c4 +color14 = #93a1a1 +color15 = #fdf6e3 diff --git a/termite/.config/termite/laptop-config b/termite/.config/termite/laptop-config index 463000a..59a2bcc 100644 --- a/termite/.config/termite/laptop-config +++ b/termite/.config/termite/laptop-config @@ -1,12 +1,13 @@ [options] -font = DejaVu Sans Mono for Powerline 22 +font = Source Code Pro for Powerline 15 +scrollback_lines = 10000 +size_hints = true # Solarized dark color scheme - [colors] foreground = #839496 foreground_bold = #eee8d5 -#foreground_dim = #888888 +foreground_dim = #002b36 background = #002b36 cursor = #93a1a1