Unverified Commit 3a422267 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #329199 from bobby285271/upd/cinnamon-by-name 

Move all packages out of cinnamon scope
parents 108b6d46 be722f04

.github/CODEOWNERS

+5 −1
Original line number Diff line number Diff line
@@ -305,7 +305,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar



# Cinnamon

/pkgs/desktops/cinnamon @mkg20001

/pkgs/by-name/ci/cinnamon-*    @mkg20001

/pkgs/by-name/cj/cjs           @mkg20001

/pkgs/by-name/mu/muffin        @mkg20001

/pkgs/by-name/ne/nemo          @mkg20001

/pkgs/by-name/ne/nemo-*        @mkg20001



# nim

/pkgs/development/compilers/nim   @ehmry

.github/labeler.yml

+6 −1
Original line number Diff line number Diff line
@@ -12,9 +12,14 @@ 
  - any:

    - changed-files:

      - any-glob-to-any-file:

        - pkgs/desktops/cinnamon/**/*

        - nixos/modules/services/x11/desktop-managers/cinnamon.nix

        - nixos/tests/cinnamon.nix

        - nixos/tests/cinnamon-wayland.nix

        - pkgs/by-name/ci/cinnamon-*/**/*

        - pkgs/by-name/cj/cjs/**/*

        - pkgs/by-name/mu/muffin/**/*

        - pkgs/by-name/ne/nemo/**/*

        - pkgs/by-name/ne/nemo-*/**/*



"6.topic: dotnet":

  - any:

nixos/doc/manual/release-notes/rl-2411.section.md

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 
  moved into the top level scope (i.e., `budgie.budgie-desktop` is now

  `budgie-desktop`)



- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).



- `services.cgit` now runs as the cgit user by default instead of root.

  This change requires granting access to the repositories to this user or

  setting the appropriate one through `services.cgit.some-instance.user`.

nixos/modules/services/x11/desktop-managers/budgie.nix

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ in { 
      ]

      ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet

      ++ (utils.removePackagesByName [

          cinnamon.nemo

          nemo

          mate.eom

          mate.pluma

          mate.atril

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+16 −16
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ let 
  cfg = config.services.xserver.desktopManager.cinnamon;

  serviceCfg = config.services.cinnamon;



  nixos-gsettings-overrides = pkgs.cinnamon.cinnamon-gsettings-overrides.override {

  nixos-gsettings-overrides = pkgs.cinnamon-gsettings-overrides.override {

    extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;

    extraGSettingsOverrides = cfg.extraGSettingsOverrides;

  };
@@ -51,7 +51,7 @@ in 


    environment.cinnamon.excludePackages = mkOption {

      default = [];

      example = literalExpression "[ pkgs.cinnamon.blueberry ]";

      example = literalExpression "[ pkgs.blueman ]";

      type = types.listOf types.package;

      description = "Which packages cinnamon should exclude from the default environment";

    };
@@ -60,7 +60,7 @@ in 


  config = mkMerge [

    (mkIf cfg.enable {

      services.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ];

      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];



      services.xserver.displayManager.lightdm.greeters.slick = {

        enable = mkDefault true;
@@ -102,9 +102,9 @@ in 
      services.accounts-daemon.enable = true;

      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

      services.dbus.packages = with pkgs; [

        cinnamon.cinnamon-common

        cinnamon.cinnamon-screensaver

        cinnamon.nemo-with-extensions

        cinnamon-common

        cinnamon-screensaver

        nemo-with-extensions

        xapp

      ];

      services.cinnamon.apps.enable = mkDefault true;
@@ -138,17 +138,17 @@ in 
        desktop-file-utils



        # common-files

        cinnamon.cinnamon-common

        cinnamon.cinnamon-session

        cinnamon.cinnamon-desktop

        cinnamon.cinnamon-menus

        cinnamon.cinnamon-translations

        cinnamon-common

        cinnamon-session

        cinnamon-desktop

        cinnamon-menus

        cinnamon-translations



        # utils needed by some scripts

        killall



        # session requirements

        cinnamon.cinnamon-screensaver

        cinnamon-screensaver

        # cinnamon-killer-daemon: provided by cinnamon-common

        networkmanagerapplet # session requirement - also nm-applet not needed
@@ -156,10 +156,10 @@ in 
        polkit_gnome



        # packages

        cinnamon.nemo-with-extensions

        nemo-with-extensions

        gnome-online-accounts-gtk

        cinnamon.cinnamon-control-center

        cinnamon.cinnamon-settings-daemon

        cinnamon-control-center

        cinnamon-settings-daemon

        libgnomekbd



        # theme
@@ -200,7 +200,7 @@ in 
        })

      ];



      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon.cinnamon-common ];

      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];



      # Override GSettings schemas

      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";