modules/home/sway/hotkeys/default.nix

@@ -60,42 +60,33 @@
         "${primeMod}+F2" = ''exec librewolf -P Alt --name=AltBrowser | ${sendNotif} "Alternate Browser"'';
         "${primeMod}+F3" = ''exec librewolf -P Misc --name=MiscBrowser | ${sendNotif} "Miscellaneous Browser"'';
 
-        # Discord
-        "${primeMod}+F4" = ''exec vesktop --ozone-platform-hint=auto | ${sendNotif} "Discord"'';
-
-        # Games
-        "${primeMod}+F5" = ''exec steam | ${sendNotif} "Steam"'';
-        "${primeMod}+F6" = ''exec heroic | ${sendNotif} "Heroic Games"'';
-
         # Looking glass for VMs
-        "${primeMod}+F7" = ''exec looking-glass-client input:rawMouse=yes | ${sendNotif} "Looking Glass"'';
+        "${primeMod}+F4" = ''exec looking-glass-client input:rawMouse=yes | ${sendNotif} "Looking Glass"'';
 
         # Virtual Machines
-        "${primeMod}+F10" = ''exec virt-manager | ${sendNotif} "Virtual Machines"'';
+        "${primeMod}+F5" = ''exec virt-manager | ${sendNotif} "Virtual Machines"'';
 
         # BeMenu scripts
-        "${primeMod}+F11" = ''exec rofiscripts --scratchpads | ${sendNotif} "Scratchpads"'';
+        "${primeMod}+F6" = ''exec rofiscripts --scratchpads | ${sendNotif} "Scratchpads"'';
         "${primeMod}+${secMod}+Ctrl+r" = ''exec rofiscripts --resolutions'';
 
-        # Open NixOS configuration files
+        # Mod + Key
-        "${primeMod}+F12" = ''exec foot ranger /etc/nixos | ${sendNotif} "Nix Config"'';
-
-        # Terminal, rofi, clipmenu, media script, power menu, show/hide waybar
-        "${primeMod}+Return" = ''exec foot'';
         "${primeMod}+s" = ''exec rofi -show run -p Command'';
         "${primeMod}+c" = ''exec clipman pick -t rofi'';
         "${primeMod}+x" = ''exec rofiscripts --power'';
         "${primeMod}+b" = ''exec pkill -USR1 waybar'';
+        "${primeMod}+Return" = ''exec foot'';
         "${primeMod}+Escape" = ''exec ${swayTools} --kill'';
+        "${primeMod}+Delete" = ''exec foot ranger /etc/nixos | ${sendNotif} "Nix Config"'';
 
-        # PCManFM, Emoji Picker, Rofi Launcher, Bluetooth, Ranger
+	# Mod + shift + key
         "${primeMod}+Shift+t" = ''exec pcmanfm-qt'';
         "${primeMod}+Shift+e" = ''exec BEMOJI_PICKER_CMD="rofi -dmenu -i -p Emoji" bemoji -n -P 0'';
         "${primeMod}+Shift+s" = ''exec rofi -show drun -modi drun -drun-display-format {name} -show-icons -disable-history'';
         "${primeMod}+Shift+b" = ''exec rofi-bluetooth'';
         "${primeMod}+Shift+Return" = ''exec foot ranger'';
 
-        # Swaytools prop, colorpicker, obs-cmd
+	# Mod + ctrl + key
         "${primeMod}+Ctrl+x" = ''exec ${swayTools} --prop'';
         "${primeMod}+Ctrl+c" = ''exec ${pkgs.hyprpicker}/bin/hyprpicker -an && ${sendNotif} "Color copied to clipboard"'';
         "${primeMod}+Ctrl+Prior" = ''exec ${pkgs.obs-cmd}/bin/obs-cmd scene switch "Main"'';
@@ -104,29 +95,20 @@
         ## Media keys
 
         # Volume control
-        "XF86AudioRaiseVolume" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+'';
+        "${secMod}+Up" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+'';
-        "XF86AudioLowerVolume" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-'';
+        "${secMod}+Down" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-'';
 
         # MPV volume control
-        "${secMod}+XF86AudioRaiseVolume" = ''exec mpc volume +3'';
+        "${secMod}+Shift+Up" = ''exec mpc volume +3'';
-        "${secMod}+XF86AudioLowerVolume" = ''exec mpc volume -3'';
+        "${secMod}+Shift+Down" = ''exec mpc volume -3'';
 
-        # Mute, Stop
+        # Play MPD or Firefox
-        "XF86AudioMute" = ''exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'';
+        "${primeMod}+Backslash" = ''exec mpc toggle'';
-        "XF86AudioStop" = ''exec mpc stop'';
-
-        # Play MPD, Firefox, or MPV
-        "XF86AudioPlay" = ''exec mpc toggle'';
         "${secMod}+XF86AudioPlay" = ''exec playerctl --player=librewolf play-pause'';
-        "Ctrl+XF86AudioPlay" = ''exec playerctl --player=mpv play-pause'';
 
         # Next/Previous
-        "XF86AudioNext" = ''exec mpc next'';
+        "${secMod}+Right" = ''exec mpc next'';
-        "XF86AudioPrev" = ''exec mpc prev'';
+        "${secMod}+Left" = ''exec mpc prev'';
-
-        # Seek
-        "${secMod}+Shift+XF86AudioNext" = ''exec mpc seek +5'';
-        "${secMod}+Shift+XF86AudioPrev" = ''exec mpc seek -5'';
 
         ## Notification keys
 
@@ -138,9 +120,8 @@
         ## Miscellaneous keys
 
         # Screenshots
-        "Print" = ''exec swayshot --swappy'';
+        "${secMod}+f" = ''exec swayshot --swappy'';
-        "${primeMod}+Shift+f" = ''exec swayshot --swappy'';
+        "${secMod}+Shift+f" = ''exec swayshot --screen'';
-        "Shift+Print" = ''exec swayshot --screen'';
 
         # Server SSH
         "${primeMod}+Ctrl+Return" = ''exec foot ssh ${config.ips.server}'';
@@ -148,8 +129,6 @@
         # Display Brightness and Keyboard Brightness
         "XF86MonBrightnessUp" = ''exec light -A 5'';
         "XF86MonBrightnessDown" = ''exec light -U 5'';
-        "Shift+XF86MonBrightnessUp" = ''exec light -A 1'';
-        "Shift+XF86MonBrightnessDown" = ''exec light -U 1'';
         "XF86KbdBrightnessUp" = ''exec light -s sysfs/leds/smc::kbd_backlight -A 5'';
         "XF86KbdBrightnessDown" = ''exec light -s sysfs/leds/smc::kbd_backlight -U 5'';
 
@@ -246,7 +225,7 @@
 
         # Focus parent / child
         "${primeMod}+a" = ''focus parent'';
-        "${primeMod}+d" = ''focus child'';
+        "${primeMod}+shift+a" = ''focus child'';
 
         # Resize windows
         "${primeMod}+${secMod}+Up" = ''resize grow height ${resizeAmount} px or 5 ppt'';