From da4a6e5eb932b29f91a197966f6849e657b7f83d Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 23 May 2020 17:31:36 -0500 Subject: [PATCH] Laptop stuff --- apps/de/bspwm/rc | 2 +- apps/de/libinput/sway-gestures.conf | 5 +++ apps/de/sway/config | 3 ++ apps/de/waybar/config | 2 +- apps/kitty/kitty.conf | 45 ++++++++++++++++--- .../arch-linux/provisioning/2-essentials.bash | 2 +- env/laptop/bin/gamedock | 8 ++++ env/laptop/bin/homedock | 9 ++++ env/laptop/bin/workdock | 2 +- env/laptop/sway/config.d/main | 14 ++++++ env/laptop/x/games.resources | 7 +++ env/laptop/x/home.docked.resources | 4 ++ 12 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 apps/de/libinput/sway-gestures.conf create mode 100755 env/laptop/bin/gamedock create mode 100755 env/laptop/bin/homedock create mode 100644 env/laptop/x/games.resources create mode 100644 env/laptop/x/home.docked.resources diff --git a/apps/de/bspwm/rc b/apps/de/bspwm/rc index f4398fb..f586483 100755 --- a/apps/de/bspwm/rc +++ b/apps/de/bspwm/rc @@ -1,6 +1,6 @@ #!/usr/bin/env sh -. "$DOTFILES_PATH/apps/de/x/profile" +# . "$DOTFILES_PATH/apps/de/x/profile" BAR_COMMAND="startbar" BSPWM_STATE_FILE="$HOME/.bspwm_state" diff --git a/apps/de/libinput/sway-gestures.conf b/apps/de/libinput/sway-gestures.conf new file mode 100644 index 0000000..5b307fe --- /dev/null +++ b/apps/de/libinput/sway-gestures.conf @@ -0,0 +1,5 @@ +gesture swipe left 3 bspc desktop -f next +gesture swipe right 3 bspc desktop -f prev + +gesture swipe right 2 swaymsg seat seat0 cursor press BTN_EXTRA && swaymsg seat seat0 cursor release BTN_EXTRA +gesture swipe left 2 swaymsg seat seat0 cursor press BTN_SIDE && swaymsg seat seat0 cursor release BTN_SIDE diff --git a/apps/de/sway/config b/apps/de/sway/config index 939b63e..e300344 100644 --- a/apps/de/sway/config +++ b/apps/de/sway/config @@ -132,3 +132,6 @@ client.focused_inactive #111111 #111111 #ffffff #111111 #111111 client.unfocused #111111 #111111 #ffffff #111111 #111111 include $ENV_PATH/sway/config.d/* + +exec mako +exec libinput-gestures -c $DOTFILES_PATH/apps/de/libinput/sway-gestures.conf diff --git a/apps/de/waybar/config b/apps/de/waybar/config index b767369..e04c3a8 100644 --- a/apps/de/waybar/config +++ b/apps/de/waybar/config @@ -1,7 +1,7 @@ { "layer": "top", "position": "bottom", - "output": ["DP-1"], + "output": ["DP-1", "eDP-1"], "height": 32, "modules-left": ["sway/workspaces"], "modules-center": ["clock"], diff --git a/apps/kitty/kitty.conf b/apps/kitty/kitty.conf index 75786a4..b5d5e03 100644 --- a/apps/kitty/kitty.conf +++ b/apps/kitty/kitty.conf @@ -20,16 +20,22 @@ map ctrl+shift+v paste_from_selection enable_audio_bell yes -# TODO: generate via color scheme generator -background #111111 -foreground #f8f8f2 - url_style curly # https://google.com strip_trailing_spaces smart +kitty_mod ctrl+shift+alt +open_url_modifiers ctrl + +# dark theme + +# TODO: generate via color scheme generator + +background #111111 +foreground #f8f8f2 + color0 #111111 color1 #f92672 color2 #a6e22e @@ -49,6 +55,31 @@ color13 #f5f4f1 color14 #cc6633 color15 #f9f8f5 -color18 #333333 -kitty_mod ctrl+shift+alt -open_url_modifiers ctrl +# color18 #333333 + +# # light theme +# +# background #eeeeee +# foreground #000000 +# +# color0 #eeeeee +# color1 #f92672 +# color2 #a6e22e +# color3 #f4bf75 +# color4 #66d9ef +# color5 #ae81ff +# color6 #a1efe4 +# color7 #000000 +# +# # TODO: where did these colors come from? donokai? +# color8 #aaaaaa +# color9 #fd971f +# color10 #cccccc +# color11 #49483e +# color12 #a59f85 +# color13 #f5f4f1 +# color14 #cc6633 +# color15 #f9f8f5 +# +# color18 #cccccc +# diff --git a/bin/lib/arch-linux/provisioning/2-essentials.bash b/bin/lib/arch-linux/provisioning/2-essentials.bash index 8f3a2f8..7164719 100755 --- a/bin/lib/arch-linux/provisioning/2-essentials.bash +++ b/bin/lib/arch-linux/provisioning/2-essentials.bash @@ -40,7 +40,7 @@ pacaur --needed -S \ wlroots-git sway-git `# Wayland Compositor` \ swaylock `# Wayland Compositor` \ waybar mako `# Wayland Bar & Notifications` \ - slurp grim `# Wayland Screen Selection & Clipping` \ + slurp grim wl-clipboard `# Wayland Screen Selection & Clipping` \ wl-clipboard `# Wayland Clipboard CLI` \ terminus-font ttf-iosevka-type ttf-iosevka-term `# Primary Fonts` \ ttf-font-awesome `# Icon Font` \ diff --git a/env/laptop/bin/gamedock b/env/laptop/bin/gamedock new file mode 100755 index 0000000..c1c9cd3 --- /dev/null +++ b/env/laptop/bin/gamedock @@ -0,0 +1,8 @@ +#!/usr/bin/env sh + +autorandr --load games +xrandr --output eDP1 --mode 1600x900 +"${DOTFILES_PATH}/apps/de/bspwm/rc" +xrdb -merge "$ENV_PATH/x/games.resources" +restartbar +"${HOME}/.fehbg" diff --git a/env/laptop/bin/homedock b/env/laptop/bin/homedock new file mode 100755 index 0000000..07028c7 --- /dev/null +++ b/env/laptop/bin/homedock @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +autorandr --change +xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800 +xrdb -merge "$ENV_PATH/x/docked.resources" +xrdb -merge "$ENV_PATH/x/home.docked.resources" +"${DOTFILES_PATH}/apps/de/bspwm/rc" +restartbar +"${HOME}/.fehbg" diff --git a/env/laptop/bin/workdock b/env/laptop/bin/workdock index 6d56259..f448e54 100755 --- a/env/laptop/bin/workdock +++ b/env/laptop/bin/workdock @@ -2,7 +2,7 @@ autorandr --change xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800 -"${DOTFILES_PATH}/apps/de/bspwm/rc" xrdb -merge "$ENV_PATH/x/docked.resources" +"${DOTFILES_PATH}/apps/de/bspwm/rc" restartbar "${HOME}/.fehbg" diff --git a/env/laptop/sway/config.d/main b/env/laptop/sway/config.d/main index 8f82562..bf4fe8c 100644 --- a/env/laptop/sway/config.d/main +++ b/env/laptop/sway/config.d/main @@ -18,3 +18,17 @@ output DP-1 res 3440x1440@100Hz pos 1440 1120 # You can get the names of your inputs by running: swaymsg -t get_inputs # Read `man 5 sway-input` for more information about this section. + +# Touchpad +# Identifier: 1739:30383:DLL075B:01_06CB:76AF_Touchpad +input type:touchpad { + dwt enabled + tap enabled + natural_scroll enabled + middle_emulation enabled + pointer_accel 0.33 +} + +input type:keyboard { + xkb_options ctrl:nocaps +} diff --git a/env/laptop/x/games.resources b/env/laptop/x/games.resources new file mode 100644 index 0000000..3122459 --- /dev/null +++ b/env/laptop/x/games.resources @@ -0,0 +1,7 @@ +dpi: 92 +.dpi: 92 +*dpi: 92 +Xft.dpi: 92 + +polybar.display_monitor: eDP1 +polybar.height: 40 diff --git a/env/laptop/x/home.docked.resources b/env/laptop/x/home.docked.resources new file mode 100644 index 0000000..7229388 --- /dev/null +++ b/env/laptop/x/home.docked.resources @@ -0,0 +1,4 @@ +polybar.display_monitor: DP1-1 +polybar.height: 40 +bspwm.reverse_monitor_desktops: 1 +bspwm.reverse_desktop_ordering: 1