From c4f3ccc4b5434983ce1a7f5f987936583d31bd39 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Wed, 12 Jun 2024 15:10:04 +0200
Subject: [PATCH] Add new Display and fix hyprlock in graphical profile

---
 config/profiles/graphical/default.nix         | 40 ++++++++++---------
 .../graphical/files/scripts/rofi_powermenu.sh |  4 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/config/profiles/graphical/default.nix b/config/profiles/graphical/default.nix
index dfd6d5e..73f5b23 100644
--- a/config/profiles/graphical/default.nix
+++ b/config/profiles/graphical/default.nix
@@ -25,13 +25,15 @@
   services.udisks2.enable = true;
 
   environment.variables = {
-    SDL_VIDEODRIVER = "wayland";
-    QT_QPA_PLATFORM = "wayland";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    CLUTTER_BACKEND = "wayland";
     GDK_BACKEND = "wayland,x11";
     MOZ_ENABLE_WAYLAND = "1";
-    CLUTTER_BACKEND = "wayland";
-    LIBVA_DRIVER_NAME = "iHD";
+    QT_QPA_PLATFORM = "wayland;xcb";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    SDL_VIDEODRIVER = "wayland";
+    LIBVA_DRIVER_NAME = "radeonsi";
+    MESA_VK_DEVICE_SELECT = "1002:73df";
+    WLR_DRM_DEVICES = "$HOME/.config/hypr/external-gpu:$HOME/.config/hypr/internal-gpu";
   };
   xdg.icons.enable = true;
   xdg.portal = {
@@ -121,7 +123,7 @@
       source = pkgs.writeShellApplication {
         name = "rofi-powermenu";
         text = builtins.readFile ./files/scripts/rofi_powermenu.sh;
-        runtimeInputs = with pkgs; [ rofi coreutils-full toybox xdg-user-dirs ];
+        runtimeInputs = with pkgs; [ rofi hyprlock coreutils-full toybox xdg-user-dirs ];
       };
     };
     home.file."./local/bin/hypr/rofi_screenshot.sh" = {
@@ -268,21 +270,21 @@
           "eDP-1, 3840x2400@60, 0x0, 1, bitdepth, 10"
           #"eDP-1, 2560x1600@60, 0x0, 1, bitdepth, 10"
           #"eDP-1, 1920x1200@60, 0x0, 1, bitdepth, 10"
-          "desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, 2560x1440@143.972,3840x0, 1,bitdepth,10"
-          "desc:Samsung Electric Company S27E500 0x3043394D, 1920x1080@70,6400x180, 1"
+          "desc:Dell Inc. AW3225QF FXK2YZ3, 3840x2160@120,5280x0,1, bitdepth,10, vrr,2"
+          "desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, 2560x1440@144,3840x-350,1, bitdepth,10, transform,1"
           ",preferred,auto,1"
         ];
         workspace = [
-          "1, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, default:true"
-          "2, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
-          "3, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
-          "4, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
-          "5, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
-          "6, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
+          "1, monitor:desc:Dell Inc. AW3225QF FXK2YZ3, default:true"
+          "2, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
+          "3, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
+          "4, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
+          "5, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
+          "6, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
           "7, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
-          "8, monitor:desc:Samsung Electric Company S27E500 0x3043394D"
-          "9, monitor:desc:Samsung Electric Company S27E500 0x3043394D"
-          "10,monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
+          "8, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
+          "9, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
+          "10,monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
         ];
         windowrule = [
           "float, foot-float"
@@ -313,7 +315,7 @@
 
           # Misc
           "$mod, C,     exec, ~/.local/bin/hypr/colorpicker.sh"
-          "CTRL_ALT, L, exec, ${pkgs.hyprlock}/bin/hyprlock" 
+          "CTRL_ALT, L, exec, ${pkgs.systemd}/bin/loginctl lock-session" 
 
           # Function keys
           ", XF86AudioMute,         exec, ${pactl} set-sink-mute @DEFAULT_SINK@ toggle"
@@ -726,7 +728,7 @@
 
     services.swayidle =
     let 
-      hyprlock = "${pkgs.hyprlock}/bin/hyprlock";
+      hyprlock = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
     in {
       enable = true;
       systemdTarget = "hyprland-session.target";
diff --git a/config/profiles/graphical/files/scripts/rofi_powermenu.sh b/config/profiles/graphical/files/scripts/rofi_powermenu.sh
index 3a2c032..4a209b9 100755
--- a/config/profiles/graphical/files/scripts/rofi_powermenu.sh
+++ b/config/profiles/graphical/files/scripts/rofi_powermenu.sh
@@ -59,11 +59,11 @@ confirm_run () {
 # Execute Command
 run_cmd() {
 	if [[ "$1" == '--opt1' ]]; then
-		hyprlock
+		pidof hyprlock || hyprlock
 	elif [[ "$1" == '--opt2' ]]; then
 		confirm_run 'hyprctl dispatch exit 0'
 	elif [[ "$1" == '--opt3' ]]; then
-		confirm_run 'pulsemixer --mute' 'hyprlock' 'systemctl suspend' #"$DIR/scripts/lockscreen" 
+		confirm_run 'pulsemixer --mute' 'systemctl suspend'
 	elif [[ "$1" == '--opt4' ]]; then
 		confirm_run 'systemctl hibernate'
 	elif [[ "$1" == '--opt5' ]]; then