b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #204225 from bobby285271/cinnamon

Browse source 
Cinnamon updates 2022-12-02
This commit is contained in:
Bobby Rong 2022-12-04 12:02:36 +08:00 committed by GitHub
parent 421e806340 35763bc43b
commit 71fe9c0596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -74,6 +74,10 @@ in
name = mkDefault "Mint-X-Dark";
package = mkDefault pkgs.cinnamon.mint-x-icons;
};
cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
name = mkDefault "Bibata-Modern-Classic";
package = mkDefault pkgs.cinnamon.mint-cursor-themes;
};
};
services.xserver.displayManager.sessionCommands = ''
if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then

31
nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
View file

@ -11,6 +11,7 @@ let
theme = cfg.theme.package;
icons = cfg.iconTheme.package;
font = cfg.font.package;
cursors = cfg.cursorTheme.package;
slickGreeterConf = writeText "slick-greeter.conf" ''
[Greeter]
@ -18,6 +19,8 @@ let
theme-name=${cfg.theme.name}
icon-theme-name=${cfg.iconTheme.name}
font-name=${cfg.font.name}
cursor-theme-name=${cfg.cursorTheme.name}
cursor-theme-size=${toString cfg.cursorTheme.size}
draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds}
${cfg.extraConfig}
'';
@ -84,6 +87,33 @@ in
};
};
cursorTheme = {
package = mkOption {
type = types.package;
default = pkgs.gnome.adwaita-icon-theme;
defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";
description = lib.mdDoc ''
The package path that contains the cursor theme given in the name option.
'';
};
name = mkOption {
type = types.str;
default = "Adwaita";
description = lib.mdDoc ''
Name of the cursor theme to use for the lightdm-slick-greeter.
'';
};
size = mkOption {
type = types.int;
default = 24;
description = lib.mdDoc ''
Size of the cursor theme to use for the lightdm-slick-greeter.
'';
};
};
draw-user-backgrounds = mkEnableOption (lib.mdDoc "draw user backgrounds");
extraConfig = mkOption {
@ -107,6 +137,7 @@ in
};
environment.systemPackages = [
cursors
icons
theme
];

4
pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "lightdm-slick-greeter";
version = "1.5.9";
version = "1.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "slick-greeter";
rev = version;
sha256 = "sha256-UEzidH4ZWggcOWHHuAclHbbgATDBdogL99Ze0PlwRoc=";
sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/sticky/default.nix
View file

@ -12,14 +12,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sticky";
version = "1.12";
version = "1.13";
format = "other";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY=";
hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8=";
};
postPatch = ''

4
pkgs/applications/video/hypnotix/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "hypnotix";
version = "3.0";
version = "3.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "hypnotix";
rev = version;
hash = "sha256-ZSHChUkd1yXVGNUotzyZ9eB7s3apwvRmEJcO5J0vsZQ=";
hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A=";
};
patches = [

4
pkgs/desktops/cinnamon/bulky/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bulky";
version = "2.5";
version = "2.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
rev = version;
hash = "sha256-WgpB/oMA3w7KO7KmkGXsl92siFGQo3Y4mLvMLTi54k8=";
hash = "sha256-OI7sIPMZOTmVoWj4Y7kEH0mxay4DwO5kPjclgRDVMus=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View file

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "5.6.1";
version = "5.6.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-dnfUvRlmsdUXfjAxPv+i/uJ8kr0LQ/i7ClUMtjjIWMo=";
hash = "sha256-xsxNGDFiBzVtoCV94iUuia45FRJGyGO522u6p1AIR6g=";
};
nativeBuildInputs = [

6
pkgs/desktops/cinnamon/mint-artwork/default.nix
View file

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "mint-artwork";
version = "1.7.0";
version = "1.7.2";
src = fetchurl {
urls = [
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20221130011545/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20221203023403/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
];
hash = "sha256-1dBLsN9nTzrqitlwoobYnjh1qKXR6UOaDsTkBMfnX1k=";
hash = "sha256-I8gLWwwuXZkgc5zZ9QVkSarugcNWLFIz2mU1d4QqJRU=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/warpinator/default.nix
View file

@ -15,7 +15,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "warpinator";
version = "1.4.1";
version = "1.4.2";
format = "other";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-gZ19WVolm8uoDZcX3OgLGkB8nFUPZIwCmKGQop9/xJ8=";
hash = "sha256-aiHlBeWGYqSaqvRtwL7smqt4iueIKzQoDawdFSCn6eg=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -22,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "xapp";
version = "2.4.1";
version = "2.4.2";
outputs = [ "out" "dev" ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-c86n3aYSS3Klm2HtN8dIN5UvL6Jxz9y1fMF1QAefCIg=";
hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM=";
};
nativeBuildInputs = [