aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile6
-rw-r--r--linux/sway/config.m4 (renamed from linux/sway/config)5
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index fc05cd5..109e924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,5 +80,6 @@ system.m4
Common/zshrc
linux/tmux.conf
linux/qtile/config/config.conf
+linux/sway/config
linux/sway/autostart
linux/sway/hid
diff --git a/Makefile b/Makefile
index 272d55a..1a5cd13 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ endef
TARGETS := linux/tmux.conf \
Common/zshrc \
linux/qtile/config/config.py \
+ linux/sway/config \
linux/sway/autostart \
linux/sway/hid
@@ -30,10 +31,7 @@ linux/qtile/config/config.py: linux/qtile/config/config.py.m4 \
${M4_COMMON_DEPS}
$(call M4_EXEC)
-linux/sway/autostart: linux/sway/autostart.m4 \
+linux/sway/%: linux/sway/%.m4 \
${M4_COMMON_DEPS}
$(call M4_EXEC)
-linux/sway/hid: linux/sway/hid.m4 \
- ${M4_COMMON_DEPS}
- $(call M4_EXEC)
diff --git a/linux/sway/config b/linux/sway/config.m4
index fb4afe5..60f9d06 100644
--- a/linux/sway/config
+++ b/linux/sway/config.m4
@@ -1,3 +1,4 @@
+m4_include(`system.m4')m4_dnl
include autostart
include hid
@@ -47,7 +48,7 @@ bindsym $Mod+Return exec alacritty
bindsym $Mod+w exec firefox
bindsym $Mod+f exec thunar
bindsym $Mod+c exec swaync-client -t
-bindsym Mod1+l exec physlock
+bindsym Mod1+l exec m4_ifelse(SYSID, `2', `nwg-lock', physlock)
bindsym $Mod+d exec wofi --show=drun
# Exit menu
@@ -82,7 +83,7 @@ bindsym $Mod+Shift+c reload
bindsym $Mod+Shift+Return exec /home/jakob/.local/bin/tt-g
# Keyboard layout
-bindsym $Mod+Shift+Space input "1:1:AT_Translated_Set_2_keyboard" xkb_switch_layout next
+#bindsym $Mod+Shift+Space input "1:1:AT_Translated_Set_2_keyboard" xkb_switch_layout next
########### Workspace Bindings ###############