commit e14d1e1bc93a047e96d4a4107b9c90c875cdc452 · pyrox.dev/nixpkgs

+7 -35

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

···

       22
       22
        
           favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ]

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
       -
         nixos-background-ligtht = pkgs.nixos-artwork.wallpapers.simple-blue;

     

       25
       25
       +
         nixos-background-light = pkgs.nixos-artwork.wallpapers.simple-blue;

     

       26
       26
        
         nixos-background-dark = pkgs.nixos-artwork.wallpapers.simple-dark-gray;

     

       27
       27
        
       

     

       28
       28
       -
         nixos-gsettings-desktop-schemas = let

     

       29
       29
       -
           defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ];

     

       30
       30
       -
         in

     

       31
       31
       -
         pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }

     

       32
       32
       -
           ''

     

       33
       33
       -
            mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       34
       34
       -
       

     

       35
       35
       -
            ${concatMapStrings

     

       36
       36
       -
               (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")

     

       37
       37
       -
               (defaultPackages ++ cfg.extraGSettingsOverridePackages)}

     

       38
       38
       -
       

     

       39
       39
       -
            cp -f ${pkgs.gnome.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       40
       40
       -
       

     

       41
       41
       -
            ${optionalString flashbackEnabled ''

     

       42
       42
       -
              cp -f ${pkgs.gnome.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       43
       43
       -
            ''}

     

       44
       44
       -
       

     

       45
       45
       -
            chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides

     

       46
       46
       -
            cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF

     

       47
       47
       -
              [org.gnome.desktop.background]

     

       48
       48
       -
              picture-uri='file://${nixos-background-ligtht.gnomeFilePath}'

     

       49
       49
       -
              picture-uri-dark='file://${nixos-background-dark.gnomeFilePath}'

     

       50
       50
       -
       

     

       51
       51
       -
              [org.gnome.desktop.screensaver]

     

       52
       52
       -
              picture-uri='file://${nixos-background-dark.gnomeFilePath}'

     

       53
       53
       -
       

     

       54
       54
       -
              ${cfg.favoriteAppsOverride}

     

       55
       55
       -
       

     

       56
       56
       -
              ${cfg.extraGSettingsOverrides}

     

       57
       57
       -
            EOF

     

       58
       58
       -
       

     

       59
       59
       -
            ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/

     

       60
       60
       -
           '';

     

       28
       28
       +
         # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this

     

       29
       29
       +
         nixos-gsettings-desktop-schemas = pkgs.gnome.nixos-gsettings-overrides.override {

     

       30
       30
       +
           inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages favoriteAppsOverride;

     

       31
       31
       +
           inherit flashbackEnabled nixos-background-dark nixos-background-light;

     

       32
       32
       +
         };

     

       61
       33
        
       

     

       62
       34
        
         nixos-background-info = pkgs.writeTextFile rec {

     

       63
       35
        
           name = "nixos-background-info";

     
···

       67
       39
        
             <wallpapers>

     

       68
       40
        
               <wallpaper deleted="false">

     

       69
       41
        
                 <name>Blobs</name>

     

       70
       70
       -
                 <filename>${nixos-background-ligtht.gnomeFilePath}</filename>

     

       42
       42
       +
                 <filename>${nixos-background-light.gnomeFilePath}</filename>

     

       71
       43
        
                 <filename-dark>${nixos-background-dark.gnomeFilePath}</filename-dark>

     

       72
       44
        
                 <options>zoom</options>

     

       73
       45
        
                 <shade_type>solid</shade_type>

+10 -9

pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix

···

       20
       20
        
       

     

       21
       21
        
       let

     

       22
       22
        
       

     

       23
       23
       +
         inherit (lib) concatMapStringsSep;

     

       24
       24
       +
       

     

       23
       25
        
         gsettingsOverridePackages = [

     

       24
       26
        
           # from

     

       25
       27
        
           mint-artwork

     
···

       38
       40
        
       

     

       39
       41
        
       in

     

       40
       42
        
       

     

       41
       41
       -
       with lib;

     

       42
       42
       -
       

     

       43
       43
        
       # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this

     

       44
       44
       -
       runCommand "cinnamon-gsettings-overrides" { }

     

       44
       44
       +
       runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; }

     

       45
       45
        
         ''

     

       46
       46
       -
           schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       46
       46
       +
           data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"

     

       47
       47
       +
           schema_dir="$data_dir/glib-2.0/schemas"

     

       47
       48
        
       

     

       48
       48
       -
           mkdir -p $schema_dir

     

       49
       49
       +
           mkdir -p "$schema_dir"

     

       49
       50
        
       

     

       50
       50
       -
           ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages}

     

       51
       51
       +
           ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages}

     

       51
       52
        
       

     

       52
       52
       -
           chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides

     

       53
       53
       +
           chmod -R a+w "$data_dir"

     

       53
       54
        
       

     

       54
       54
       -
           cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF

     

       55
       55
       +
           cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF

     

       55
       56
        
           ${extraGSettingsOverrides}

     

       56
       57
        
           EOF

     

       57
       58
        
       

     

       58
       58
       -
           ${glib.dev}/bin/glib-compile-schemas $schema_dir

     

       59
       59
       +
           ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"

     

       59
       60
        
         ''

pkgs/desktops/gnome/default.nix

···

       123
       123
        
           withGnome = true;

     

       124
       124
        
         };

     

       125
       125
        
       

     

       126
       126
       +
         nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { };

     

       127
       127
       +
       

     

       126
       128
        
         rygel = callPackage ./core/rygel { };

     

       127
       129
        
       

     

       128
       130
        
         simple-scan = callPackage ./core/simple-scan { };

+55

pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , runCommand

     

       3
       3
       +
       , gsettings-desktop-schemas

     

       4
       4
       +
       , gnome-shell

     

       5
       5
       +
       , glib

     

       6
       6
       +
       , gnome-flashback

     

       7
       7
       +
       , nixos-artwork

     

       8
       8
       +
       , nixos-background-light ? nixos-artwork.wallpapers.simple-blue

     

       9
       9
       +
       , nixos-background-dark ? nixos-artwork.wallpapers.simple-dark-gray

     

       10
       10
       +
       , extraGSettingsOverrides ? ""

     

       11
       11
       +
       , extraGSettingsOverridePackages ? [ ]

     

       12
       12
       +
       , favoriteAppsOverride ? ""

     

       13
       13
       +
       , flashbackEnabled ? false

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       let

     

       17
       17
       +
       

     

       18
       18
       +
         inherit (lib) concatMapStringsSep;

     

       19
       19
       +
       

     

       20
       20
       +
         gsettingsOverridePackages = [

     

       21
       21
       +
           gsettings-desktop-schemas

     

       22
       22
       +
           gnome-shell

     

       23
       23
       +
         ] ++ lib.optionals flashbackEnabled [

     

       24
       24
       +
           gnome-flashback

     

       25
       25
       +
         ] ++ extraGSettingsOverridePackages;

     

       26
       26
       +
       

     

       27
       27
       +
         gsettingsOverrides = ''

     

       28
       28
       +
           [org.gnome.desktop.background]

     

       29
       29
       +
           picture-uri='file://${nixos-background-light.gnomeFilePath}'

     

       30
       30
       +
           picture-uri-dark='file://${nixos-background-dark.gnomeFilePath}'

     

       31
       31
       +
       

     

       32
       32
       +
           [org.gnome.desktop.screensaver]

     

       33
       33
       +
           picture-uri='file://${nixos-background-dark.gnomeFilePath}'

     

       34
       34
       +
       

     

       35
       35
       +
           ${favoriteAppsOverride}

     

       36
       36
       +
       

     

       37
       37
       +
           ${extraGSettingsOverrides}

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
       in

     

       41
       41
       +
       

     

       42
       42
       +
       runCommand "gnome-gsettings-overrides" { preferLocalBuild = true; } ''

     

       43
       43
       +
         data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"

     

       44
       44
       +
         schema_dir="$data_dir/glib-2.0/schemas"

     

       45
       45
       +
         mkdir -p "$schema_dir"

     

       46
       46
       +
       

     

       47
       47
       +
         ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages}

     

       48
       48
       +
       

     

       49
       49
       +
         chmod -R a+w "$data_dir"

     

       50
       50
       +
         cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF

     

       51
       51
       +
         ${gsettingsOverrides}

     

       52
       52
       +
         EOF

     

       53
       53
       +
       

     

       54
       54
       +
         ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"

     

       55
       55
       +
       ''

+15 -14

pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix

···

       10
       10
        
       , elementary-dock

     

       11
       11
        
       , gsettings-desktop-schemas

     

       12
       12
        
       , extraGSettingsOverrides ? ""

     

       13
       13
       -
       , extraGSettingsOverridePackages ? []

     

       13
       13
       +
       , extraGSettingsOverridePackages ? [ ]

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
       +
       

     

       18
       18
       +
         inherit (lib) concatMapStringsSep;

     

       17
       19
        
       

     

       18
       20
        
         gsettingsOverridePackages = [

     

       19
       21
        
           elementary-dock

     
···

       27
       29
        
       

     

       28
       30
        
       in

     

       29
       31
        
       

     

       30
       30
       -
       with lib;

     

       31
       32
        
       

     

       32
       33
        
       # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this

     

       33
       33
       -
       runCommand "elementary-gsettings-desktop-schemas" {}

     

       34
       34
       +
       runCommand "elementary-gsettings-desktop-schemas" { preferLocalBuild = true; }

     

       34
       35
        
         ''

     

       35
       35
       -
            schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       36
       36
       +
           data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"

     

       37
       37
       +
           schema_dir="$data_dir/glib-2.0/schemas"

     

       36
       38
        
       

     

       37
       37
       -
            mkdir -p $schema_dir

     

       39
       39
       +
           mkdir -p "$schema_dir"

     

       40
       40
       +
           cp -rf "${glib.getSchemaPath gala}"/*.gschema.override "$schema_dir"

     

       38
       41
        
       

     

       39
       39
       -
            cp -rf ${glib.getSchemaPath gala}/*.gschema.override $schema_dir

     

       42
       42
       +
           ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"") gsettingsOverridePackages}

     

       40
       43
        
       

     

       41
       41
       -
            ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages}

     

       44
       44
       +
           chmod -R a+w "$data_dir"

     

       45
       45
       +
           cp "${glib.getSchemaPath elementary-default-settings}"/* "$schema_dir"

     

       42
       46
        
       

     

       43
       43
       -
            chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides

     

       44
       44
       -
            cp ${glib.getSchemaPath elementary-default-settings}/* $schema_dir

     

       45
       45
       -
       

     

       46
       46
       -
            cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF

     

       47
       47
       -
            ${extraGSettingsOverrides}

     

       48
       48
       -
            EOF

     

       47
       47
       +
           cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF

     

       48
       48
       +
           ${extraGSettingsOverrides}

     

       49
       49
       +
           EOF

     

       49
       50
        
       

     

       50
       50
       -
            ${glib.dev}/bin/glib-compile-schemas $schema_dir

     

       51
       51
       +
           ${glib.dev}/bin/glib-compile-schemas $schema_dir

     

       51
       52
        
         ''