Unverified Commit a2e29f2f authored by rnhmjoj's avatar rnhmjoj
Browse files

nixos/startx: fix error if generateScript == false

parent 9fa43536

nixos/modules/services/x11/display-managers/startx.nix

+4 −4
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ in 
    '';



    # Add a sane system-wide xinitrc script

    environment.etc."X11/xinit/xinitrc".source = lib.mkIf cfg.generateScript (

      pkgs.writeShellScript "xinitrc" ''

    environment.etc."X11/xinit/xinitrc" = lib.mkIf cfg.generateScript {

      source = pkgs.writeShellScript "xinitrc" ''

        ${cfg.extraCommands}



        # start user services
@@ -97,8 +97,8 @@ in 
        # stop services and all subprocesses

        systemctl --user stop nixos-fake-graphical-session.target

        kill 0

      ''

    );

      '';

    };



    environment.systemPackages = with pkgs; [ xorg.xinit ];