diff --git a/hosts/eirene/base/default.nix b/hosts/eirene/base/default.nix index 7151bc4..a9d6c85 100644 --- a/hosts/eirene/base/default.nix +++ b/hosts/eirene/base/default.nix @@ -53,14 +53,30 @@ initrd.kernelModules = [ "amdgpu" ]; }; - home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [{ wayland.windowManager.hyprland.settings = { - monitor = "eDP-1, 2560x1600@165, 0x0, 1.25"; - device = [ - { - name = "syna2ba6:00-06cb:ce44-touchpad"; - natural_scroll = "true"; - sensitivity = 0.5; - } - ]; - }; }]; + home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [{ + wayland.windowManager.hyprland.settings = { + monitor = "eDP-1, 2560x1600@165, 0x0, 1.25"; + env = [ "WLR_DRM_DEVICES,$HOME/.config/hypr/card" ]; + device = [ + { + name = "syna2ba6:00-06cb:ce44-touchpad"; + natural_scroll = "true"; + sensitivity = 0.5; + } + ]; + }; + + programs.zsh.loginExtra = lib.mkBefore '' + AMD=/dev/dri/by-path/pci-0000:06:00.0-card + NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card + + if [ -e $AMD ]; then + CARD=$AMD + else + CARD=$NVIDIA + fi + + ln -sf $CARD $HOME/.config/hypr/card + ''; + }]; } diff --git a/users/common/configs/hyprland/default.nix b/users/common/configs/hyprland/default.nix index 2b8b688..8023913 100644 --- a/users/common/configs/hyprland/default.nix +++ b/users/common/configs/hyprland/default.nix @@ -99,7 +99,7 @@ }; }; - programs.zsh.loginExtra = '' + programs.zsh.loginExtra = lib.mkAfter '' if [ -z "''${WAYLAND_DISPLAY}" ] && [ ! -z "''${XDG_VTNR}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then ${pkgs.hyprland}/bin/hyprland &> /tmp/hyprland.log fi