From 3dc9ab3879da5f5bcb9b2a3c1a98cbc89d06c973 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 26 Oct 2020 11:56:49 -0500 Subject: [PATCH] Fixes for arch before moving to NixOS anyways...? --- apps/de/sway/config | 4 +-- apps/kanshi/config | 6 ++++ apps/kanshi/desktop-H-workspaces.sh | 24 ++++++++++++++++ .../arch-linux/provisioning/2-essentials.bash | 1 + env/desktop/sway/config.d/main | 28 +++++++++---------- env/laptop/sway/config.d/main | 2 +- setup.bash | 3 ++ 7 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 apps/kanshi/config create mode 100755 apps/kanshi/desktop-H-workspaces.sh diff --git a/apps/de/sway/config b/apps/de/sway/config index 9940c7f..77fb313 100644 --- a/apps/de/sway/config +++ b/apps/de/sway/config @@ -141,7 +141,7 @@ mode "resize" { default_border pixel 5 for_window [app_id="floating_terminal"] floating enable for_window [class="floating_terminal"] floating enable -for_window [class=".*"] layout splith +for_window [class=".*"] layout splitv # bindsym $mod+r mode "resize" @@ -161,9 +161,9 @@ client.focused_inactive #111111 #111111 #ffffff #111111 #111111 client.unfocused #111111 #111111 #ffffff #111111 #111111 exec mako -exec gammastep -t 6500:3500 -l 39.0:-94.5 exec_always makoctl reload exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded." +exec_always kanshi include $ENV_PATH/sway/config.d/* diff --git a/apps/kanshi/config b/apps/kanshi/config new file mode 100644 index 0000000..48698c0 --- /dev/null +++ b/apps/kanshi/config @@ -0,0 +1,6 @@ +profile desktop-H { + output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal + output "Dell Inc. DELL U2719DC 5DL4QS2" enable mode 2560x1440@60Hz position 0,0 scale 1 transform 270 + output "Dell Inc. DELL U2719DC 9DL4QS2" enable mode 2560x1440@60Hz position 4880,0 scale 1 transform 90 + exec "$HOME/.config/dotfiles/apps/kanshi/desktop-H-workspaces.sh" +} diff --git a/apps/kanshi/desktop-H-workspaces.sh b/apps/kanshi/desktop-H-workspaces.sh new file mode 100755 index 0000000..8929748 --- /dev/null +++ b/apps/kanshi/desktop-H-workspaces.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env sh + +set -x + +uw='Samsung Electric Company CF791 HTRJ500315' +l='Dell Inc. DELL U2719DC 5DL4QS2' +r='Dell Inc. DELL U2719DC 9DL4QS2' + +mws() { + swaymsg workspace "$1", move workspace to output "\"$2\"" +} + +mws 5 "$l" +mws 6 "$l" +mws 4 "$l" + +mws 8 "$r" +mws 9 "$r" +mws 7 "$r" + +mws 2 "$uw" +mws 3 "$uw" +mws 1 "$uw" + diff --git a/bin/lib/arch-linux/provisioning/2-essentials.bash b/bin/lib/arch-linux/provisioning/2-essentials.bash index d84bf49..4d06254 100755 --- a/bin/lib/arch-linux/provisioning/2-essentials.bash +++ b/bin/lib/arch-linux/provisioning/2-essentials.bash @@ -40,6 +40,7 @@ pacaur --needed -S \ bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \ wlroots-git sway-git `# Wayland Compositor` \ swaylock `# Wayland Compositor` \ + kanshi `# Monitor Management for Wayland` \ waybar mako `# Wayland Bar & Notifications` \ slurp grim wl-clipboard `# Wayland Screen Selection & Clipping` \ wl-clipboard `# Wayland Clipboard CLI` \ diff --git a/env/desktop/sway/config.d/main b/env/desktop/sway/config.d/main index 711dbc7..e771715 100644 --- a/env/desktop/sway/config.d/main +++ b/env/desktop/sway/config.d/main @@ -1,27 +1,27 @@ exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000' # shared -workspace 1 output DP-1 -workspace 2 output DP-1 -workspace 3 output DP-1 +# workspace 1 output DP-1 +# workspace 2 output DP-1 +# workspace 3 output DP-1 # --I format # output DP-1 res 3440x1440@100Hz pos 2560 720 # output DP-2 res 2560x1440@60Hz pos 0 0 # output DP-4 res 2560x1440@60Hz pos 6000 0 transform 270 -workspace 4 output DP-2 -workspace 5 output DP-2 -workspace 6 output DP-2 -workspace 7 output DP-4 -workspace 8 output DP-4 -workspace 9 output DP-4 +# workspace 4 output DP-2 +# workspace 5 output DP-2 +# workspace 6 output DP-2 +# workspace 7 output DP-4 +# workspace 8 output DP-4 +# workspace 9 output DP-4 # H format -output DP-1 res 3440x1440@100Hz pos 1440 560 -output DP-2 res 2560x1440@60Hz pos 0 0 transform 90 -output DP-3 res 2560x1440@60Hz pos 0 0 transform 90 -output DP-4 res 2560x1440@60Hz pos 4880 0 transform 270 -output DP-5 res 2560x1440@60Hz pos 4880 0 transform 270 +# output DP-1 res 3440x1440@100Hz pos 1440 560 +# output DP-2 res 2560x1440@60Hz pos 0 0 transform 90 +# output DP-3 res 2560x1440@60Hz pos 0 0 transform 90 +# output DP-4 res 2560x1440@60Hz pos 4880 0 transform 270 +# output DP-5 res 2560x1440@60Hz pos 4880 0 transform 270 # iIi format # output DP-1 res 3440x1440@100Hz pos 1440 0 transform 90 diff --git a/env/laptop/sway/config.d/main b/env/laptop/sway/config.d/main index 61a3a53..959fb08 100644 --- a/env/laptop/sway/config.d/main +++ b/env/laptop/sway/config.d/main @@ -1,5 +1,5 @@ exec libinput-gestures -c $DOTFILES_PATH/apps/de/libinput/sway-gestures.conf - +exec gammastep -t 6500:3500 -l 39.0:-94.5 # exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000' bindswitch lid:toggle exec swaylock diff --git a/setup.bash b/setup.bash index d731581..0103ada 100755 --- a/setup.bash +++ b/setup.bash @@ -125,6 +125,9 @@ links=( # XDG user directories "env/nix/pkgs" "$XDG_CONFIG_HOME/nixpkgs" + + # Kanshi configuration + "apps/kanshi" "$XDG_CONFIG_HOME/kanshi" ) chmod 700 -R "$HOME/.bin"