before flake update

modules/desktop/X11/default.nix

@@ -16,21 +16,20 @@
       };
     };
   };
-  environment.systemPackages = with pkgs; [
-    numlockx
-    adwaita-icon-theme
-    xclip
-    flameshot
+  environment.systemPackages = [
+    pkgs.numlockx
+    pkgs.adwaita-icon-theme
+    pkgs.xclip
+    pkgs.flameshot
   ];
   environment.etc = {
     "X11/xinit/xinitrc".source = ./config/xinitrc;
   };
-  imports =
-    [
-      ./i3
-      ./polybar
-    ]
-    ++ lib.optionals args.isGpu [
-      ./picom
-    ];
+  imports = [
+    ./i3
+    ./polybar
+  ]
+  ++ lib.optionals args.isGpu [
+    ./picom
+  ];
 }

modules/desktop/rofi/default.nix

@@ -15,7 +15,7 @@
           Shutdown\0icon\x1fsystem-shutdown
           Reboot\0icon\x1fsystem-reboot
           Exit hyprland\0icon\x1fsystem-log-out
-          Reload hyprland\0icon\x1fsystem-log-out" | ${pkgs.rofi-wayland}/bin/rofi -dmenu -show-icons -i -theme /etc/xdg/rofi/disconnect.rasi -p System)
+          Reload hyprland\0icon\x1fsystem-log-out" | ${pkgs.rofi}/bin/rofi -dmenu -show-icons -i -theme /etc/xdg/rofi/disconnect.rasi -p System)
 
           echo "$selected"
 
@@ -56,7 +56,7 @@
              _LINES="$(curl "http://10.0.0.1:2013/$1" 2>/dev/null | sed -e "s|.*<a href=\"\([^\"]*\).*|$1\1|" -e "s/.*<.*\|.*C=D.*\|.*\/\/$\|.*.nfo//" -e "/^$/d")"
           fi
 
-          _RESULT=$(${pkgs.rofi-wayland}/bin/rofi -dmenu -config /etc/xdg/rofi/config.rasi -i <<< "$_LINES")
+          _RESULT=$(${pkgs.rofi}/bin/rofi -dmenu -config /etc/xdg/rofi/config.rasi -i <<< "$_LINES")
 
           # If no output
           echo "$_RESULT"

modules/desktop/wayland/default.nix

@@ -8,7 +8,6 @@
 
   environment.systemPackages = [
     pkgs.wl-clipboard
-    pkgs.rofi-wayland
     pkgs.waybar
     pkgs.font-awesome
     pkgs.hyprlock
@@ -27,7 +26,7 @@
       "xdg/hypr/hyprpaper.conf".source = ./config/hypr/hyprpaper.conf;
       "xdg/hypr/rofi.conf" = {
         text = ''
-          $rofi = ${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons -config /etc/xdg/rofi/config.rasi
+          $rofi = ${pkgs.rofi}/bin/rofi -show drun -show-icons -config /etc/xdg/rofi/config.rasi
         '';
       };
       "xdg/waybar".source = ./config/waybar;