mikael/nixfiles-emily
1
0
Fork 0
forked from emily/nixfiles
Code Pull requests Activity

Add new Display and fix hyprlock in graphical profile

Browse source
This commit is contained in:
emily 2024-06-12 15:10:04 +02:00
parent 114beec6ec
commit c4f3ccc4b5
Signed by untrusted user: emily
GPG key ID: F6F4C66207FCF995
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
config/profiles/graphical/default.nix
View file

@ -25,13 +25,15 @@
services.udisks2.enable = true; services.udisks2.enable = true;
environment.variables = { environment.variables = {
SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
GDK_BACKEND = "wayland,x11"; GDK_BACKEND = "wayland,x11";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
CLUTTER_BACKEND = "wayland"; QT_QPA_PLATFORM = "wayland;xcb";
LIBVA_DRIVER_NAME = "iHD"; 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.icons.enable = true;
xdg.portal = { xdg.portal = {
@ -121,7 +123,7 @@
source = pkgs.writeShellApplication { source = pkgs.writeShellApplication {
name = "rofi-powermenu"; name = "rofi-powermenu";
text = builtins.readFile ./files/scripts/rofi_powermenu.sh; 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" = { home.file."./local/bin/hypr/rofi_screenshot.sh" = {
@ -268,21 +270,21 @@
"eDP-1, 3840x2400@60, 0x0, 1, bitdepth, 10" "eDP-1, 3840x2400@60, 0x0, 1, bitdepth, 10"
#"eDP-1, 2560x1600@60, 0x0, 1, bitdepth, 10" #"eDP-1, 2560x1600@60, 0x0, 1, bitdepth, 10"
#"eDP-1, 1920x1200@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:Dell Inc. AW3225QF FXK2YZ3, 3840x2160@120,5280x0,1, bitdepth,10, vrr,2"
"desc:Samsung Electric Company S27E500 0x3043394D, 1920x1080@70,6400x180, 1" "desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, 2560x1440@144,3840x-350,1, bitdepth,10, transform,1"
",preferred,auto,1" ",preferred,auto,1"
]; ];
workspace = [ workspace = [
"1, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, default:true" "1, monitor:desc:Dell Inc. AW3225QF FXK2YZ3, default:true"
"2, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "2, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
"3, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "3, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
"4, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "4, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
"5, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "5, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
"6, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "6, monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
"7, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "7, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
"8, monitor:desc:Samsung Electric Company S27E500 0x3043394D" "8, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
"9, monitor:desc:Samsung Electric Company S27E500 0x3043394D" "9, monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455"
"10,monitor:desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455" "10,monitor:desc:Dell Inc. AW3225QF FXK2YZ3"
]; ];
windowrule = [ windowrule = [
"float, foot-float" "float, foot-float"
@ -313,7 +315,7 @@
# Misc # Misc
"$mod, C, exec, ~/.local/bin/hypr/colorpicker.sh" "$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 # Function keys
", XF86AudioMute, exec, ${pactl} set-sink-mute @DEFAULT_SINK@ toggle" ", XF86AudioMute, exec, ${pactl} set-sink-mute @DEFAULT_SINK@ toggle"
@ -726,7 +728,7 @@
services.swayidle = services.swayidle =
let let
hyprlock = "${pkgs.hyprlock}/bin/hyprlock"; hyprlock = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
in { in {
enable = true; enable = true;
systemdTarget = "hyprland-session.target"; systemdTarget = "hyprland-session.target";

4
config/profiles/graphical/files/scripts/rofi_powermenu.sh
View file

@ -59,11 +59,11 @@ confirm_run () {
# Execute Command # Execute Command
run_cmd() { run_cmd() {
if [[ "$1" == '--opt1' ]]; then if [[ "$1" == '--opt1' ]]; then
hyprlock pidof hyprlock || hyprlock
elif [[ "$1" == '--opt2' ]]; then elif [[ "$1" == '--opt2' ]]; then
confirm_run 'hyprctl dispatch exit 0' confirm_run 'hyprctl dispatch exit 0'
elif [[ "$1" == '--opt3' ]]; then elif [[ "$1" == '--opt3' ]]; then
confirm_run 'pulsemixer --mute' 'hyprlock' 'systemctl suspend' #"$DIR/scripts/lockscreen" confirm_run 'pulsemixer --mute' 'systemctl suspend'
elif [[ "$1" == '--opt4' ]]; then elif [[ "$1" == '--opt4' ]]; then
confirm_run 'systemctl hibernate' confirm_run 'systemctl hibernate'
elif [[ "$1" == '--opt5' ]]; then elif [[ "$1" == '--opt5' ]]; then