fix(eww -> get-connectivity-info): Fixed signal strength calculations

bar/eww/bar/widget.yuck

@@ -53,7 +53,6 @@
 
 (defwidget connectivity []
   (eventbox
-    :onclick "bash -c 'iwgtk &> /dev/null &'"
     (label
       :class "connectivity"
       :text "${

bar/eww/default.nix

@@ -11,7 +11,6 @@
   home.packages = [
     pkgs.eww
     # Script dependencies
-    pkgs.iw
     pkgs.jq
     pkgs.dash
     pkgs.socat

bar/eww/scripts/get-connectivity-info

@@ -9,6 +9,9 @@ print_network_state() {
     wlan*)
       echo wireless
       ;;
+    wlp*)
+      echo wireless
+      ;;
     usb*)
       echo tethering
       ;;
@@ -19,11 +22,11 @@ print_network_state() {
 }
 
 wifi_strength() {
-    if [ "$1" -le -80 ]; then echo terrible
+    if [ "$1" -le 20 ]; then echo terrible
-  elif [ "$1" -le -70 ]; then echo bad
+  elif [ "$1" -le 40 ]; then echo bad
-  elif [ "$1" -le -60 ]; then echo mediocre
+  elif [ "$1" -le 60 ]; then echo mediocre
-  elif [ "$1" -le -40 ]; then echo good
+  elif [ "$1" -le 80 ]; then echo good
-  else                        echo excellent
+  else                       echo excellent
   fi
 }
 
@@ -36,10 +39,10 @@ print_network_infos() {
       "$(echo "$route_line" | awk '{ print $3 }')"
 
     if [ "$state" = wireless ]; then
-      signal=$(iw dev "$1" link | awk '($1 == "signal:") { print $2}')
+      signal=$(nmcli -m multiline device wifi | grep '^\s*SIGNAL: ' | xargs | cut -d \  -f 2)
       printf ',"wifi":{"signal":"%s","ssid":"%s"}' \
         "$(wifi_strength "$signal")" \
-        "$(iw dev wlan0 info | grep '^\s*ssid ' | xargs | cut -d \  -f 2-)"
+        "$(nmcli -m multiline device wifi | grep '^\s*SSID: ' | xargs | cut -d \  -f 2)"
     fi
   fi
 }

de/hypr/default.nix

@@ -37,22 +37,23 @@
     };
   };
 
-  home.packages = [
+  home.packages = with pkgs; [
-    pkgs.egl-wayland # For NVIDIA compatibility
+    egl-wayland # For NVIDIA compatibility
-    pkgs.xdg-desktop-portal-hyprland
+    xdg-desktop-portal-hyprland
     # Common DE packages required in config
-    pkgs.wl-clipboard
+    wl-clipboard
-    pkgs.grim
+    grim
-    pkgs.slurp
+    slurp
-    pkgs.hyprpicker
+    hyprpicker
-    pkgs.udiskie
+    udiskie
-    pkgs.swww
+    swww
-    pkgs.swaylock-effects
+    swaylock-effects
-    pkgs.brightnessctl
+    brightnessctl
+    networkmanagerapplet
     # Apps launchable from bindings
-    pkgs.firefox
+    firefox
-    pkgs.kitty
+    kitty
-    pkgs.yazi
+    yazi
   ];
 
   home.pointerCursor = {

de/hypr/hyprland.conf.d/startup.conf

@@ -1,9 +1,10 @@
 # Startup
 
 exec-once = artix-pipewire-launcher restart
-exec-once = end-rs daemon
 exec-once = wallpaperctl daemon
 exec-once = swayosd-server
+exec-once = nm-applet
 exec-once = udiskie
 exec-once = eww-bard
+exec-once = end-rs daemon
 exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP

de/hypr/hyprland.conf.d/windowrules.conf

@@ -13,6 +13,7 @@ windowrulev2 = workspace 8 silent, class:(Deezer)
 windowrule = float, ^(connman-gtk)$
 
 windowrulev2 = float, class:(iwgtk)
+windowrulev2 = float, class:(nm-connection-editor)
 
 windowrulev2 = float, class:(localsend_app)
 

hosts/Zephyrus/default.nix

@@ -1,7 +1,6 @@
 {
   inputs,
   pkgs,
-  lib,
   ...
 }: {
   imports = [
@@ -31,8 +30,9 @@
     neofetch
     bottom
     htop
-    iwgtk
+    wg-netmanager
     podman-compose
+    udisks
   ];
 
   #Podman
@@ -56,6 +56,7 @@
       "video"
       "seat"
       "audio"
+      "networkmanager"
     ];
     group = "gaspard";
   };

hosts/Zephyrus/hardware-configuration.nix

@@ -34,7 +34,7 @@
   };
 
   # Network & Bluetooth
-  networking.wireless.iwd.enable = true;
+  networking.networkmanager.enable = true;
 
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;