diff --git a/flake.lock b/flake.lock index cc42d2c..91881e7 100644 --- a/flake.lock +++ b/flake.lock @@ -958,11 +958,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1750998539, - "narHash": "sha256-lmyIs/tlMtRq92NYPAix8iwN85oCrcqIXzOAo9gqYl0=", + "lastModified": 1751200680, + "narHash": "sha256-sVep+p1XtL4tpArd1of+8mA3mJ9T0NsHNOCLGKxxRns=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ea8a9b6b32027a1eeba7fcef4a3368d7f867c110", + "rev": "35ba63ea42a57e8470e605b178e5228a29edbcbe", "type": "github" }, "original": { diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index a6e4aaa..a869d65 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -13,7 +13,7 @@ ../common/features/intel-graphics.nix ../common/features/wayland.nix ../common/features/x11.nix - ../common/features/greetd.nix + # ../common/features/greetd.nix ../common/features/pipewire.nix ../common/features/docker.nix ../common/features/fonts.nix @@ -52,7 +52,7 @@ let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-QKVtVXIVxYUqpnNCJAfRow3RG4j2jkQSFOwTeDgwO7s="; + sha256 = "sha256-O5JbzK5ulPob0HIrO8DT1MxfkC9bnfBw/0GR8Xu1tjw="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/common/features/x11.nix b/hosts/common/features/x11.nix index 8d104ef..fe3e379 100644 --- a/hosts/common/features/x11.nix +++ b/hosts/common/features/x11.nix @@ -12,7 +12,10 @@ in services.xserver = { enable = true; - displayManager.startx.enable = true; + displayManager = { + startx.enable = true; + gdm.enable = true; + }; autoRepeatDelay = 250; autoRepeatInterval = 30; }; @@ -24,7 +27,6 @@ in gnome.enable = true; }; services.xserver.windowManager = { - # gnome.enable = true; i3 = { enable = true; extraPackages = with pkgs; [ @@ -35,7 +37,6 @@ in }; programs.i3lock.enable = true; - services.displayManager.gdm.enable = true; programs.dconf.enable = true; services = { sysprof.enable = true;