diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 5bc8dba..bde20f8 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -18,13 +18,16 @@ in # # See https://wiki.hyprland.org/Configuring/Monitors/ - monitor = [ + monitor = if osConfig.networking.hostName == "kop-pc" then [ # PC "HDMI-A-1,1920x1080@60,0x0,1" - "DP-1,2560x1440@144,1920x0,1" + "DP-1,2560x1440@165,1920x0,1" + "Unknown-1,disable" + ] else if osConfig.networking.hostName == "nix-laptop" then [ # laptop "eDP-1,3840x2160@60,0x0,2" "DP-3,1920x1080@60,1920x0,1" + ] else [ # Default ",preferred,auto,auto" ]; @@ -38,7 +41,7 @@ in # source = ~/.config/hypr/myColors.conf # Some default env vars. - env = "XCURSOR_SIZE,24"; + env = [ "XCURSOR_SIZE,24" "NIXOS_OZONE_WL,1" ]; # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input = { diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index 6802ed7..c09fba6 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -18,14 +18,12 @@ in xkb.layout = config.mainUser.layout; xkb.variant = config.mainUser.variant; enable = true; - displayManager = mkIf (!config.services.xserver.displayManager.gdm.enable) { - sddm.enable = true; + displayManager = mkIf (!config.services.xserver.displayManager.sddm.enable) { + gdm.enable = true; }; }; environment.sessionVariables = { - # Hint electron apps to use wayland - NIXOS_OZONE_WL = "1"; WLR_NO_HARDWARE_CURSORS="1"; #WLR_DRM_NO_ATOMIC="1"; #WLR_DRM_DEVICES = "/dev/dri/card0"; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index e03b5af..f1334f5 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -13,6 +13,23 @@ mainUser.layout = "de"; mainUser.variant = "us"; age.identityPaths = [ /home/kopatz/.ssh/id_rsa ]; + services.xserver.displayManager.session = [ + { + manage = "desktop"; + name = "hyprland"; + start = '' + ${lib.getExe pkgs.hyprland} & + waitPID=$! + ''; + } + { + manage = "desktop"; + name = "plasma5"; + start = '' + env ${pkgs.plasma-workspace}/bin/startplasma-x11 + ''; + } + ]; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix index 44a9849..c08406a 100644 --- a/users/kopatz/home.nix +++ b/users/kopatz/home.nix @@ -18,7 +18,7 @@ ../../home-manager/firefox ../../home-manager/gitconfig.nix ../../home-manager/hyprland - ../../home-manager/kde-path.nix + #../../home-manager/kde-path.nix ../../home-manager/kitty.nix ../../home-manager/lf.nix ../../home-manager/nvim.nix