hyprland: enable mouse refocus

Signed-off-by: Myned <dev@bjork.tech>

options/custom/programs/waybar/default.nix

@@ -4,7 +4,6 @@
   pkgs,
   ...
 }:
-with lib; let
 with lib; let
   bash = "${pkgs.bash}/bin/bash";
   blueberry = "${pkgs.blueberry}/bin/blueberry";
@@ -33,8 +32,6 @@ with lib; let
   wttrbar = "${pkgs.wttrbar}/bin/wttrbar";
 
   cfg = config.custom.programs.waybar;
-in {
-  options.custom.programs.waybar.enable = mkOption {default = false;};
 in {
   options.custom.programs.waybar.enable = mkOption {default = false;};
 
@@ -49,52 +46,6 @@ in {
       ### SETTINGS ###
       # https://github.com/Alexays/Waybar/wiki/Configuration
       #?? pkill -SIGUSR2 -x waybar
-      settings = let
-        ## INHERIT ##
-        #!! Module defaults are not accurate to documentation
-        # TODO: Submit pull request to fix in addition to inconsistent hyphen vs underscore
-        # https://github.com/Alexays/Waybar/wiki/Module:-Cava
-        cava-config = {
-          cava_config = null; # Default: null?
-          framerate = 30; # Default: 30?
-          autosens = 1; # Default: 1
-          # sensitivity = 0; # Default: 100?
-          bars = 16; # Default: 2
-          lower_cutoff_freq = 50; # Default: 50?
-          higher_cutoff_freq = 10000; # Default: 10000?
-          sleep_timer = 5; # Default: 0
-          hide_on_silence = true; # Default: false
-          method = "pipewire"; # Default: pulse
-          source = "auto"; # Default: auto?
-          sample_rate = 44100; # Default: 44100?
-          sample_bits = 16; # Default: 16?
-          stereo = false; # Default: true
-          reverse = false; # Default: false
-          bar_delimiter = 32; # ASCII code for space, default: 59 or ;
-          monstercat = true; # Default: false?
-          waves = true; # Default: false?
-          noise_reduction = 0.2; # Default: 0.77?
-          input_delay = 1; # Default: 4
-          format-icons = [
-            "▁"
-            "▂"
-            "▃"
-            "▄"
-            "▅"
-            "▆"
-            "▇"
-            "█"
-          ]; # !! Required
-          on-click = easyeffects;
-          on-scroll-up = "${swayosd-client} --output-volume raise";
-          on-scroll-down = "${swayosd-client} --output-volume lower";
-          rotate = 180;
-        };
-      in {
-        status = {
-          ## GLOBAL ##
-          layer = "top";
-          position = "bottom";
       settings = let
         ## INHERIT ##
         #!! Module defaults are not accurate to documentation
@@ -142,26 +93,6 @@ in {
           layer = "top";
           position = "bottom";
 
-          ## POSITION ##
-          modules-left = [
-            "custom/power"
-            "custom/inhibitor"
-            "custom/vpn"
-            "custom/vm"
-            "hyprland/workspaces"
-          ];
-          modules-center = [
-            "clock"
-            "custom/weather"
-          ];
-          modules-right = [
-            "mpris"
-            "tray"
-            "wireplumber"
-            "bluetooth"
-            "network"
-            "battery"
-          ];
           ## POSITION ##
           modules-left = [
             "custom/power"
@@ -183,14 +114,6 @@ in {
             "battery"
           ];
 
-          ## MODULES ##
-          # https://github.com/Alexays/Waybar/wiki/Module:-Custom
-          "custom/power" = {
-            format = "";
-            on-click = "${systemctl} poweroff";
-            on-click-right = "${systemctl} reboot";
-            on-click-middle = "${loginctl} terminate-session ''";
-          };
           ## MODULES ##
           # https://github.com/Alexays/Waybar/wiki/Module:-Custom
           "custom/power" = {
@@ -200,26 +123,12 @@ in {
             on-click-middle = "${loginctl} terminate-session ''";
           };
 
-          "custom/inhibitor" = {
-            interval = 5;
-            exec = "~/.config/waybar/scripts/inhibitor.sh";
-            on-click = "~/.local/bin/inhibit";
-          };
           "custom/inhibitor" = {
             interval = 5;
             exec = "~/.config/waybar/scripts/inhibitor.sh";
             on-click = "~/.local/bin/inhibit";
           };
 
-          "custom/vm" = {
-            interval = 5;
-            exec = "~/.config/waybar/scripts/vm.sh";
-            on-click = "~/.local/bin/vm -x ${
-              if config.custom.hidpi
-              then "/scale:140"
-              else ""
-            }";
-          };
           "custom/vm" = {
             interval = 5;
             exec = "~/.config/waybar/scripts/vm.sh";
@@ -230,27 +139,12 @@ in {
             }";
           };
 
-          "custom/vpn" = {
-            interval = 5;
-            exec = "~/.config/waybar/scripts/vpn.sh";
-            on-click = "~/.local/bin/vpn mypi3";
-          };
           "custom/vpn" = {
             interval = 5;
             exec = "~/.config/waybar/scripts/vpn.sh";
             on-click = "~/.local/bin/vpn mypi3";
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Idle-Inhibitor
-          # FIXME: Not currently usable
-          # https://github.com/Alexays/Waybar/issues/690
-          idle_inhibitor = {
-            format = "{icon}";
-            format-icons = {
-              activated = "󰅶";
-              deactivated = "󰾪";
-            };
-          };
           # https://github.com/Alexays/Waybar/wiki/Module:-Idle-Inhibitor
           # FIXME: Not currently usable
           # https://github.com/Alexays/Waybar/issues/690
@@ -262,17 +156,8 @@ in {
             };
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
           # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
           # https://www.nerdfonts.com/cheat-sheet
-          "hyprland/workspaces" = {
-            show-special = true;
-            format = "{icon}";
-            format-icons = {
-              android = "";
-              dropdown = "󰞷";
-              game = "󰊴";
-              music = "󰝚";
           "hyprland/workspaces" = {
             show-special = true;
             format = "{icon}";
@@ -283,7 +168,6 @@ in {
               music = "󰝚";
               office = "󰈙";
               pip = "󰹙";
-              pip = "󰹙";
               scratchpad = "";
               steam = "󰓓";
               terminal = "";
@@ -291,28 +175,9 @@ in {
               wallpaper = "󰏩";
             };
           };
-              steam = "󰓓";
-              terminal = "";
-              vm = "󰢹";
-              wallpaper = "󰏩";
-            };
-          };
 
-          cava = cava-config;
           cava = cava-config;
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Clock
-          clock = {
-            # https://fmt.dev/latest/syntax.html#chrono-specs
-            format = "{:%a %b %d   %I:%M %p}"; # Mon Jan 01  12:00 AM
-            tooltip-format = "{calendar}";
-            calendar.format = {
-              months = "<span color='#eee8d5'>{}</span>";
-              weeks = "<span color='#eee8d5'>{}</span>";
-              weekdays = "<span color='#93a1a1'>{}</span>";
-              days = "<span color='#586e75'>{}</span>";
-              today = "<span color='#eee8d5'>{}</span>";
-            };
           # https://github.com/Alexays/Waybar/wiki/Module:-Clock
           clock = {
             # https://fmt.dev/latest/syntax.html#chrono-specs
@@ -333,19 +198,7 @@ in {
             on-scroll-up = "${swayosd-client} --output-volume raise";
             on-scroll-down = "${swayosd-client} --output-volume lower";
           };
-            # FIXME: Click release event sends to incorrect layer without sleeping
-            # https://github.com/hyprwm/Hyprland/issues/1348
-            on-click = "${swaync-client} --toggle-panel";
-            # on-click-right = easyeffects;
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-          };
 
-          # https://github.com/bjesus/wttrbar
-          "custom/weather" = {
-            format = "{}°";
-            interval = 60 * 60;
-            return-type = "json";
           # https://github.com/bjesus/wttrbar
           "custom/weather" = {
             format = "{}°";
@@ -358,13 +211,9 @@ in {
               "--fahrenheit"
               "--hide-conditions"
               "--main-indicator temp_F"
-              "--location 'Cedar Falls Iowa'"
             ];
           };
 
-          "cava#reverse" =
-            cava-config
-            // {
           "cava#reverse" =
             cava-config
             // {
@@ -387,37 +236,7 @@ in {
             on-scroll-up = "${swayosd-client} --output-volume raise";
             on-scroll-down = "${swayosd-client} --output-volume lower";
           };
-          # https://github.com/Alexays/Waybar/wiki/Module:-MPRIS
-          mpris = {
-            format = "{player_icon} {dynamic}";
-            format-paused = "{status_icon} {dynamic}";
-            dynamic-len = 50;
-            dynamic-order = [
-              "title"
-              "artist"
-            ];
-            dynamic-separator = " 󰧟 ";
-            player-icons.default = "󰎈";
-            status-icons.paused = "";
-            on-click-middle = ""; # TODO: Close music player
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-          };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-WirePlumber
-          wireplumber = {
-            format = "{icon} {volume}%";
-            format-muted = "󰸈";
-            format-icons = [
-              "󰕿"
-              "󰖀"
-              "󰕾"
-            ];
-            on-click = easyeffects;
-            on-click-right = "${swayosd-client} --output-volume mute-toggle";
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-          };
           # https://github.com/Alexays/Waybar/wiki/Module:-WirePlumber
           wireplumber = {
             format = "{icon} {volume}%";
@@ -433,16 +252,6 @@ in {
             on-scroll-down = "${swayosd-client} --output-volume lower";
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Bluetooth
-          bluetooth = {
-            format-disabled = "󰂲";
-            format-off = "󰂲";
-            format-on = "󰂯";
-            format-connected = "󰂱";
-            on-click = blueberry;
-            on-click-right = "${bluetoothctl} disconnect";
-            on-click-middle = "${rfkill} toggle bluetooth"; # Toggle bluetooth on/off
-          };
           # https://github.com/Alexays/Waybar/wiki/Module:-Bluetooth
           bluetooth = {
             format-disabled = "󰂲";
@@ -454,22 +263,6 @@ in {
             on-click-middle = "${rfkill} toggle bluetooth"; # Toggle bluetooth on/off
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Network
-          network = {
-            format = "{icon}";
-            format-icons = {
-              disabled = "";
-              disconnected = "";
-              ethernet = "󰈀";
-              linked = "";
-              wifi = [
-                "󰤯"
-                "󰤟"
-                "󰤢"
-                "󰤥"
-                "󰤨"
-              ];
-            };
           # https://github.com/Alexays/Waybar/wiki/Module:-Network
           network = {
             format = "{icon}";
@@ -490,31 +283,7 @@ in {
             on-click = nm-connection-editor;
             on-click-right = "~/.local/bin/network"; # Toggle networking on/off
           };
-            on-click = nm-connection-editor;
-            on-click-right = "~/.local/bin/network"; # Toggle networking on/off
-          };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Battery
-          "battery" = {
-            format = "{icon} {power:.0f}W";
-            format-icons = [
-              "󰂃"
-              "󰁺"
-              "󰁻"
-              "󰁼"
-              "󰁽"
-              "󰁾"
-              "󰁿"
-              "󰂀"
-              "󰂁"
-              "󰂂"
-              "󰁹"
-            ];
-            interval = 5;
-            states = {
-              critical = 15;
-              warning = 30;
-            };
           # https://github.com/Alexays/Waybar/wiki/Module:-Battery
           "battery" = {
             format = "{icon} {power:.0f}W";
@@ -541,10 +310,6 @@ in {
           };
         };
       };
-            on-click = "~/.local/bin/power"; # Toggle power-saver mode
-          };
-        };
-      };
     };
 
     # TODO: Convert to writeShellApplication