home/file/sway/module/ScratchPad.nix

@@ -4,11 +4,12 @@
 		# You can send windows there and get them back later.
 		# NOTE: Get id with `swaymsg -t get_tree`.
 
+		# Move the currently focused window to the scratchpad
+		bindsym $mod+shift+C move scratchpad
+
 		# Show the next scratchpad window or hide the focused scratchpad window.
 		# If there are multiple scratchpad windows, this command cycles through them.
-		bindsym --to-code $mod+c scratchpad show
+		bindsym $mod+c scratchpad show
-		bindsym --to-code $mod+shift+C move scratchpad
-		bindsym --to-code $mod+shift+X exec swayscript scratchpad_kill
 
 		# Fix for a goddamn Firefox WebRTC indicator.
 		for_window [app_id="firefox" title="Firefox — Sharing Indicator"] {

home/file/sway/module/Sound.nix

@@ -3,18 +3,18 @@
 	step_volume = 5;
 in {
 	text = ''
-		bindsym XF86AudioRaiseVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ +${toString step_volume}%'
+		bindsym --to-code XF86AudioRaiseVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ +${toString step_volume}%'
-		bindsym XF86AudioLowerVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ -${toString step_volume}%'
+		bindsym --to-code XF86AudioLowerVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ -${toString step_volume}%'
-		bindsym XF86AudioMute        exec 'pactl set-sink-mute   @DEFAULT_SINK@ toggle'
+		bindsym --to-code XF86AudioMute        exec 'pactl set-sink-mute   @DEFAULT_SINK@ toggle'
-		bindsym XF86AudioMicMute     exec 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
+		bindsym --to-code XF86AudioMicMute     exec 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
 
-		bindsym XF86AudioPlay  exec 'playerctl play-pause'
+		bindsym --to-code XF86AudioPlay  exec 'playerctl play-pause'
-		bindsym XF86AudioPause exec 'playerctl pause'
+		bindsym --to-code XF86AudioPause exec 'playerctl pause'
-		bindsym XF86AudioStop  exec 'playerctl stop'
+		bindsym --to-code XF86AudioStop  exec 'playerctl stop'
-		bindsym XF86AudioNext  exec 'playerctl next'
+		bindsym --to-code XF86AudioNext  exec 'playerctl next'
-		bindsym XF86AudioPrev  exec 'playerctl previous'
+		bindsym --to-code XF86AudioPrev  exec 'playerctl previous'
-		bindsym XF86Forward    exec 'playerctl position ${toString step_music}+'
+		bindsym --to-code XF86Forward    exec 'playerctl position ${toString step_music}+'
-		bindsym XF86Back       exec 'playerctl position ${toString step_music}-'
+		bindsym --to-code XF86Back       exec 'playerctl position ${toString step_music}-'
-		bindsym XF86Eject      exec 'swayscript sound_output_cycle'
+		bindsym --to-code XF86Eject      exec 'swayscript sound_output_cycle'
 	'';
 }