From 5a53f87c33c7405895e44d5cec686a80b1aa8f8d Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Sat, 20 Mar 2021 18:30:51 +0100 Subject: [PATCH] Update for 3rd monitor --- .config/Code - OSS/User/settings.json | 7 ++- .config/sway/config | 7 ++- .config/sway/config.local##hostname.avior | 11 ++++ .config/sway/config.local##hostname.saiph | 13 ++++- .config/termite/config | 70 +++++++++++------------ .local/share/backgrounds | 2 +- .tmux/plugins/tpm | 2 +- .vim/pack/colors/opt/onedark.vim | 2 +- 8 files changed, 71 insertions(+), 43 deletions(-) diff --git a/.config/Code - OSS/User/settings.json b/.config/Code - OSS/User/settings.json index adedf0b..b40bea0 100644 --- a/.config/Code - OSS/User/settings.json +++ b/.config/Code - OSS/User/settings.json @@ -25,7 +25,6 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "prettier.printWidth": 120, - "prettier.tabWidth": 4, "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, @@ -45,5 +44,11 @@ "todo-tree.tree.showScanModeButton": false, "[handlebars]": { "editor.defaultFormatter": "vscode.html-language-features" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" } } \ No newline at end of file diff --git a/.config/sway/config b/.config/sway/config index c4a0128..33c7cca 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -52,9 +52,12 @@ input 9456:311:Metadot_-_Das_Keyboard_Das_Keyboard_Model_S xkb_model "pc105" # Outputs # ------------------------------------------------------------------------------ output $primary_monitor_identifier pos 0 0 res $primary_monitor_resolution scale $primary_monitor_scale -output $secondary_monitor_identifier pos $secondary_monitor_x_offset 0 res $secondary_monitor_resolution scale $secondary_monitor_scale +output $secondary_monitor_identifier pos $secondary_monitor_x_offset $secondary_monitor_y_offset res $secondary_monitor_resolution scale $secondary_monitor_scale +output $tertiary_monitor_identifier pos $tertiary_monitor_x_offset $tertiary_monitor_y_offset res $tertiary_monitor_resolution scale $tertiary_monitor_scale transform 90 -output * bg $background fill +output $primary_monitor_identifier bg $primary_monitor_background fill +output $secondary_monitor_identifier bg $secondary_monitor_background fill +output $tertiary_monitor_identifier bg $tertiary_monitor_background fill bindswitch --reload --locked lid:on output $internal_monitor_identifier disable bindswitch --reload --locked lid:off output $internal_monitor_identifier enable diff --git a/.config/sway/config.local##hostname.avior b/.config/sway/config.local##hostname.avior index 950f1b1..8664cdb 100644 --- a/.config/sway/config.local##hostname.avior +++ b/.config/sway/config.local##hostname.avior @@ -1,10 +1,21 @@ set $primary_monitor_scale 1 set $primary_monitor_identifier DP-6 set $primary_monitor_resolution 1920x1200 +set $primary_monitor_background $HOME/.local/share/backgrounds/mountain.jpg + set $secondary_monitor_identifier eDP-1 set $secondary_monitor_resolution 3840x2400 set $secondary_monitor_scale 2 set $secondary_monitor_x_offset 1920 +set $secondary_monitor_y_offset 0 +set $secondary_monitor_background $HOME/.local/share/backgrounds/mountain.jpg + +set $tertiary_monitor_identifier DP-6 +set $tertiary_monitor_resolution 2560x1440 +set $tertiary_monitor_scale 1 +set $tertiary_monitor_x_offset 3840 +set $tertiary_monitor_y_offset -800 +set $tertiary_monitor_background $HOME/.local/share/backgrounds/mountain_vertical.jpg set $internal_monitor_identifier eDP-1 diff --git a/.config/sway/config.local##hostname.saiph b/.config/sway/config.local##hostname.saiph index 172f3ff..9aa1d07 100644 --- a/.config/sway/config.local##hostname.saiph +++ b/.config/sway/config.local##hostname.saiph @@ -1,14 +1,23 @@ set $primary_monitor_identifier eDP-1 set $primary_monitor_resolution 1920x1080 set $primary_monitor_scale 1 +set $primary_monitor_background $HOME/.local/share/backgrounds/mountain.jpg + set $secondary_monitor_identifier DP-3 set $secondary_monitor_resolution 1920x1200 set $secondary_monitor_scale 1 set $secondary_monitor_x_offset 1920 +set $secondary_monitor_y_offset 0 +set $secondary_monitor_background $HOME/.local/share/backgrounds/mountain.jpg + +set $tertiary_monitor_identifier DP-6 +set $tertiary_monitor_resolution 2560x1440 +set $tertiary_monitor_scale 1 +set $tertiary_monitor_x_offset 3840 +set $tertiary_monitor_y_offset -800 +set $tertiary_monitor_background $HOME/.local/share/backgrounds/mountain_vertical.jpg set $internal_monitor_identifier eDP-1 set $audio_out alsa_output.pci-0000_00_1b.0.analog-stereo set $audio_in alsa_input.pci-0000_00_1b.0.analog-stereo - -set $background $HOME/.local/share/backgrounds/triangle.png diff --git a/.config/termite/config b/.config/termite/config index 567c624..548dfcd 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -17,28 +17,28 @@ visible_bell = true #cursor_foreground = #002b36 # light: -#foreground = #657b83 -#foregrond_bold = #073642 -#background = #fdf6e3 -#cursor = #586e75 -#cursor_foreground = #fdf6e3 +#foreground = #657b83 +#foreground_bold = #073642 +#background = #fdf6e3 +#cursor = #586e75 +#cursor_foreground = #fdf6e3 -#color0 = #073642 -#color8 = #002b36 -#color1 = #dc322f -#color9 = #cb4b16 -#color2 = #859900 -#color10 = #586e75 -#color3 = #b58900 -#color11 = #657b83 -#color4 = #268bd2 -#color12 = #839496 -#color5 = #d33682 -#color13 = #6c71c4 -#color6 = #2aa198 -#color14 = #93a1a1 -#color7 = #eee8d5 -#color15 = #fdf6e3 +#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 # One: # dark: @@ -49,20 +49,20 @@ cursor = #abb2bf cursor_foreground = #282c34 background = #282c34 color0 = #282c34 -color8 = #5c6370 color1 = #e06c75 -color9 = #be5046 color2 = #98c379 -color10 = #98c379 color3 = #e5c07b -color11 = #d19a66 color4 = #61afef -color12 = #61afef color5 = #c678dd -color13 = #c678dd color6 = #56b6c2 -color14 = #56b6c2 color7 = #abb2bf +color8 = #5c6370 +color9 = #be5046 +color10 = #98c379 +color11 = #d19a66 +color12 = #61afef +color13 = #c678dd +color14 = #56b6c2 color15 = #3e4451 # light: @@ -73,18 +73,18 @@ color15 = #3e4451 #cursor_foreground = #fafafa #background = #fafafa #color0 = #fafafa -#color8 = #a0a1a7 #color1 = #ca1261 -#color9 = #e45649 #color2 = #50a14f -#color10 = #50a14f #color3 = #986801 -#color11 = #c18401 #color4 = #4078f2 -#color12 = #4078f2 #color5 = #a626a4 -#color13 = #a626a4 #color6 = #0184bc -#color14 = #0184bc #color7 = #383a42 +#color8 = #a0a1a7 +#color9 = #e45649 +#color10 = #50a14f +#color11 = #c18401 +#color12 = #4078f2 +#color13 = #a626a4 +#color14 = #0184bc #color15 = #e5e5e6 diff --git a/.local/share/backgrounds b/.local/share/backgrounds index c0276e5..5752563 160000 --- a/.local/share/backgrounds +++ b/.local/share/backgrounds @@ -1 +1 @@ -Subproject commit c0276e525dab0b0ba5f31e6244429ec03ec34cc0 +Subproject commit 57525636ef6c33ac437b5aa6b20f457e402bc66d diff --git a/.tmux/plugins/tpm b/.tmux/plugins/tpm index 60a36d6..2afeff1 160000 --- a/.tmux/plugins/tpm +++ b/.tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 60a36d6f7adddfb68d68349dce3081e7d5c4d4ab +Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5 diff --git a/.vim/pack/colors/opt/onedark.vim b/.vim/pack/colors/opt/onedark.vim index 7f9b180..b70ed29 160000 --- a/.vim/pack/colors/opt/onedark.vim +++ b/.vim/pack/colors/opt/onedark.vim @@ -1 +1 @@ -Subproject commit 7f9b1802b0d76f4f8fe7ad5bbef472c96e1c104f +Subproject commit b70ed293f3c3adaea23f9fcd84ef942015664756