diff --git a/README.md b/README.md index c6fb8d5..e51ac9a 100755 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ each host should have these files: - divide steam and gamemode? - laptop specific configuration (power profiles daemon, battery, etc) - sddm cursors no work :( - - try out the [new sddm options](https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=sddm) + - sddm x11 support, too. or maybe just remove x11 - gnome keyring / gcr for saving passwords \ No newline at end of file diff --git a/flake.lock b/flake.lock index d538ec3..8adaae6 100644 --- a/flake.lock +++ b/flake.lock @@ -487,11 +487,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index bd6e116..3447a85 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -20,7 +20,7 @@ in { }; config = mkIf cfg.enable { - services.xserver.displayManager.sessionPackages = [ cfg.package ]; + services.displayManager.sessionPackages = [ cfg.package ]; xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk cfg.portalPackage ]; diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix index 1ab2038..69efeea 100644 --- a/modules/desktop/sddm.nix +++ b/modules/desktop/sddm.nix @@ -9,15 +9,13 @@ in { }; config = mkIf cfg.enable { - services.xserver.enable = true; # this is needed, unfortunately! - services.xserver.excludePackages = [ pkgs.xterm ]; # prevents xterm on wayland and x environment.systemPackages = with pkgs; [ config.modules.desktop.themes.sddmTheme.package libsForQt5.qt5.qtsvg libsForQt5.qt5.qtgraphicaleffects libsForQt5.qt5.qtquickcontrols2 ]; - services.xserver.displayManager.sddm = { + services.displayManager.sddm = { enable = true; wayland.enable = true; theme = config.modules.desktop.themes.sddmTheme.name;