Merge branch 'master' of ssh://dundun.ddns.net:222/sheldonmlee/dotfiles

This commit is contained in:
Sheldon Lee 2022-09-19 17:40:13 +08:00
commit 16899b1ee2
2 changed files with 23 additions and 5 deletions

View File

@ -37,14 +37,17 @@ green="#98971a"
bemenu_cmd() bemenu_cmd()
{ {
bemenu -i -l 10 --scrollbar always\ bemenu -i --scrollbar always\
--fn "FiraCode Semibold 11px"\ -n -p 'Run:' -l 10 -B 3 -W 0.5\
--fn "FiraCode Semibold 16px"\
--tb $base02 --tf $green\ --tb $base02 --tf $green\
--fb $base03 --ff $base0\ --fb $base03 --ff $base0\
--nb $base03 --nf $base0\ --nb $base03 --nf $base0\
--ab $base03 --af $base3\
--sb $base02 --sf $cyan\ --sb $base02 --sf $cyan\
--hb $base02 --hf $cyan\ --hb $base02 --hf $cyan\
--scb $base02 --scf $cyan --scb $base02 --scf $cyan\
--bdr $violet
$@ $@
} }

View File

@ -91,6 +91,14 @@ exec swayidle -w \
# #
input 1133:50503:Logitech_USB_Receiver accel_profile flat input 1133:50503:Logitech_USB_Receiver accel_profile flat
input 1133:16500:Logitech_G304 accel_profile flat input 1133:16500:Logitech_G304 accel_profile flat
input 1133:16521:Logitech_K580 {
xkb_layout us
xkb_variant colemak
}
input 1204:4621:Majestouch_Convertible_2 {
xkb_layout us
xkb_variant colemak
}
input 1:1:AT_Translated_Set_2_keyboard { input 1:1:AT_Translated_Set_2_keyboard {
xkb_layout "us" xkb_layout "us"
xkb_variant "colemak" xkb_variant "colemak"
@ -321,13 +329,14 @@ default_border pixel 3
# #
# Startup programs: # Startup programs:
# #
#exec wayland-run-on-new-display set-correct-monitor 390+1080 exec wayland-run-on-new-display set-correct-monitor 390+1080
exec gentoo-pipewire-launcher exec gentoo-pipewire-launcher
exec dunst exec dunst
exec_always pkill wlsunset; wlsunset -l 22.4 -L 114.1
exec alacritty exec alacritty
exec firefox exec firefox
exec discord-ff exec webcord-bin
exec signal-desktop exec signal-desktop
# #
@ -337,17 +346,23 @@ exec signal-desktop
assign [app_id="firefox"] workspace 2:r assign [app_id="firefox"] workspace 2:r
assign [app_id="Discord Firefox"] workspace 3:s assign [app_id="Discord Firefox"] workspace 3:s
for_window [title="^Discord — Mozilla Firefox$"] fullscreen disable for_window [title="^Discord — Mozilla Firefox$"] fullscreen disable
assign [class="WebCord"] workspace 3:s
assign [class="Signal"] workspace 3:s assign [class="Signal"] workspace 3:s
assign [class="Steam"] workspace 4:t assign [class="Steam"] workspace 4:t
# Space Games, as joystick usage without mouse and keyboard count as idle. # Space Games, as joystick usage without mouse and keyboard count as idle.
for_window [class="steam_app_359320"] inhibit_idle focus for_window [class="steam_app_359320"] inhibit_idle focus
for_window [class="starcitizen.exe"] inhibit_idle focus for_window [class="starcitizen.exe"] inhibit_idle focus
# Inhibit idle on focus
for_window [class="WebCord"] inhibit_idle focus
for_window [app_id="org.jellyfin.jellyfinmediaplayer"] inhibit_idle focus
# Floating windows # Floating windows
for_window [title="^Firefox — Sharing Indicator$"] floating enable, move position 50ppt 0px; for_window [title="^Firefox — Sharing Indicator$"] floating enable, move position 50ppt 0px;
for_window [class="^Steam$"] floating enable for_window [class="^Steam$"] floating enable
for_window [class="^Steam$" title="^Steam$"] floating disable for_window [class="^Steam$" title="^Steam$"] floating disable
for_window [class="genshinimact.exe"] floating enable for_window [class="genshinimact.exe"] floating enable
for_window [class=".*.exe$"] floating enable for_window [class=".*.exe$"] floating enable
for_window [class="^QjackCtl$"] floating enable
for_window [class="^QjackCtl$" title="Graph — QjackCtl"] floating disable
# Move windows to trash workspace # Move windows to trash workspace
for_window [title="^Origin$"] floating enable, move container to workspace trash; for_window [title="^Origin$"] floating enable, move container to workspace trash;
for_window [title="^Wine System Tray$"] move container to workspace trash; for_window [title="^Wine System Tray$"] move container to workspace trash;