commit 28031f75796b1fb4ed9b7a26491666b26bb3e21a · pyrox.dev/nixpkgs

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

···

       47
       47
        
       

     

       48
       48
        
       - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable).

     

       49
       49
        
       

     

       50
       50
       +
       - [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Availabe as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie).

     

       51
       51
       +
       

     

       50
       52
        
       - [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable).

     

       51
       53
        
       

     

       52
       54
        
       - [opensearch](https://opensearch.org), a search server alternative to Elasticsearch. Available as [services.opensearch](options.html#opt-services.opensearch.enable).

+201

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

···

       1
       1
       +
       { lib, pkgs, config, utils, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         inherit (lib) concatMapStrings literalExpression mdDoc mkDefault mkEnableOption mkIf mkOption types;

     

       5
       5
       +
       

     

       6
       6
       +
         cfg = config.services.xserver.desktopManager.budgie;

     

       7
       7
       +
       

     

       8
       8
       +
         nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish;

     

       9
       9
       +
         nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray;

     

       10
       10
       +
       

     

       11
       11
       +
         nixos-gsettings-overrides = pkgs.budgie.budgie-gsettings-overrides.override {

     

       12
       12
       +
           inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages;

     

       13
       13
       +
           inherit nixos-background-dark nixos-background-light;

     

       14
       14
       +
         };

     

       15
       15
       +
       in {

     

       16
       16
       +
         options = {

     

       17
       17
       +
           services.xserver.desktopManager.budgie = {

     

       18
       18
       +
             enable = mkEnableOption (mdDoc "Budgie desktop");

     

       19
       19
       +
       

     

       20
       20
       +
             sessionPath = mkOption {

     

       21
       21
       +
               description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";

     

       22
       22
       +
               type = with types; listOf package;

     

       23
       23
       +
               example = literalExpression "[ pkgs.budgie.budgie-desktop-view ]";

     

       24
       24
       +
               default = [];

     

       25
       25
       +
             };

     

       26
       26
       +
       

     

       27
       27
       +
             extraGSettingsOverrides = mkOption {

     

       28
       28
       +
               description = mdDoc "Additional GSettings overrides.";

     

       29
       29
       +
               type = types.lines;

     

       30
       30
       +
               default = "";

     

       31
       31
       +
             };

     

       32
       32
       +
       

     

       33
       33
       +
             extraGSettingsOverridePackages = mkOption {

     

       34
       34
       +
               description = mdDoc "List of packages for which GSettings are overridden.";

     

       35
       35
       +
               type = with types; listOf path;

     

       36
       36
       +
               default = [];

     

       37
       37
       +
             };

     

       38
       38
       +
           };

     

       39
       39
       +
       

     

       40
       40
       +
           environment.budgie.excludePackages = mkOption {

     

       41
       41
       +
             description = mdDoc "Which packages Budgie should exclude from the default environment.";

     

       42
       42
       +
             type = with types; listOf package;

     

       43
       43
       +
             default = [];

     

       44
       44
       +
             example = literalExpression "[ pkgs.mate-terminal ]";

     

       45
       45
       +
           };

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         config = mkIf cfg.enable {

     

       49
       49
       +
           services.xserver.displayManager.sessionPackages = with pkgs; [

     

       50
       50
       +
             budgie.budgie-desktop

     

       51
       51
       +
           ];

     

       52
       52
       +
       

     

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

     

       54
       54
       +
             enable = mkDefault true;

     

       55
       55
       +
             theme = mkDefault { name = "Qogir"; package = pkgs.qogir-theme; };

     

       56
       56
       +
             iconTheme = mkDefault { name = "Qogir"; package = pkgs.qogir-icon-theme; };

     

       57
       57
       +
             cursorTheme = mkDefault { name = "Qogir"; package = pkgs.qogir-icon-theme; };

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie.budgie-desktop-view ];

     

       61
       61
       +
       

     

       62
       62
       +
           environment.extraInit = ''

     

       63
       63
       +
             ${concatMapStrings (p: ''

     

       64
       64
       +
               if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then

     

       65
       65
       +
                 export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}

     

       66
       66
       +
               fi

     

       67
       67
       +
               if [ -d "${p}/lib/girepository-1.0" ]; then

     

       68
       68
       +
                 export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0

     

       69
       69
       +
                 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib

     

       70
       70
       +
               fi

     

       71
       71
       +
             '') cfg.sessionPath}

     

       72
       72
       +
           '';

     

       73
       73
       +
       

     

       74
       74
       +
           environment.systemPackages = with pkgs;

     

       75
       75
       +
             [

     

       76
       76
       +
               # Budgie Desktop.

     

       77
       77
       +
               budgie.budgie-backgrounds

     

       78
       78
       +
               budgie.budgie-control-center

     

       79
       79
       +
               budgie.budgie-desktop

     

       80
       80
       +
               budgie.budgie-desktop-view

     

       81
       81
       +
               budgie.budgie-screensaver

     

       82
       82
       +
       

     

       83
       83
       +
               # Required by the Budgie Desktop session.

     

       84
       84
       +
               (gnome.gnome-session.override {gnomeShellSupport = false;})

     

       85
       85
       +
       

     

       86
       86
       +
               # Required by Budgie Menu.

     

       87
       87
       +
               gnome-menus

     

       88
       88
       +
       

     

       89
       89
       +
               # Provides `gsettings`.

     

       90
       90
       +
               glib

     

       91
       91
       +
       

     

       92
       92
       +
               # Update user directories.

     

       93
       93
       +
               xdg-user-dirs

     

       94
       94
       +
             ]

     

       95
       95
       +
             ++ (utils.removePackagesByName [

     

       96
       96
       +
                 cinnamon.nemo

     

       97
       97
       +
                 mate.eom

     

       98
       98
       +
                 mate.pluma

     

       99
       99
       +
                 mate.atril

     

       100
       100
       +
                 mate.engrampa

     

       101
       101
       +
                 mate.mate-calc

     

       102
       102
       +
                 mate.mate-terminal

     

       103
       103
       +
                 mate.mate-system-monitor

     

       104
       104
       +
                 vlc

     

       105
       105
       +
       

     

       106
       106
       +
                 # Desktop themes.

     

       107
       107
       +
                 qogir-theme

     

       108
       108
       +
                 qogir-icon-theme

     

       109
       109
       +
       

     

       110
       110
       +
                 # Default settings.

     

       111
       111
       +
                 nixos-gsettings-overrides

     

       112
       112
       +
               ] config.environment.budgie.excludePackages)

     

       113
       113
       +
             ++ cfg.sessionPath;

     

       114
       114
       +
       

     

       115
       115
       +
           # Fonts.

     

       116
       116
       +
           fonts.fonts = mkDefault [

     

       117
       117
       +
             pkgs.noto-fonts

     

       118
       118
       +
             pkgs.hack-font

     

       119
       119
       +
           ];

     

       120
       120
       +
           fonts.fontconfig.defaultFonts = {

     

       121
       121
       +
             sansSerif = mkDefault ["Noto Sans"];

     

       122
       122
       +
             monospace = mkDefault ["Hack"];

     

       123
       123
       +
           };

     

       124
       124
       +
       

     

       125
       125
       +
           # Qt application style.

     

       126
       126
       +
           qt = {

     

       127
       127
       +
             enable = mkDefault true;

     

       128
       128
       +
             style = mkDefault "gtk2";

     

       129
       129
       +
             platformTheme = mkDefault "gtk2";

     

       130
       130
       +
           };

     

       131
       131
       +
       

     

       132
       132
       +
           environment.pathsToLink = [

     

       133
       133
       +
             "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173

     

       134
       134
       +
           ];

     

       135
       135
       +
       

     

       136
       136
       +
           # GSettings overrides.

     

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

     

       138
       138
       +
       

     

       139
       139
       +
           # Required by Budgie Desktop.

     

       140
       140
       +
           services.xserver.updateDbusEnvironment = true;

     

       141
       141
       +
           programs.dconf.enable = true;

     

       142
       142
       +
       

     

       143
       143
       +
           # Required by Budgie Screensaver.

     

       144
       144
       +
           security.pam.services.budgie-screensaver = {};

     

       145
       145
       +
       

     

       146
       146
       +
           # Required by Budgie's Polkit Dialog.

     

       147
       147
       +
           security.polkit.enable = mkDefault true;

     

       148
       148
       +
       

     

       149
       149
       +
           # Required by Budgie Panel plugins and/or Budgie Control Center panels.

     

       150
       150
       +
           networking.networkmanager.enable = mkDefault true; # for BCC's Network panel.

     

       151
       151
       +
           programs.nm-applet.enable = config.networking.networkmanager.enable; # Budgie has no Network applet.

     

       152
       152
       +
           programs.nm-applet.indicator = false; # Budgie doesn't support AppIndicators.

     

       153
       153
       +
       

     

       154
       154
       +
           hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel.

     

       155
       155
       +
           hardware.pulseaudio.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Sound panel.

     

       156
       156
       +
       

     

       157
       157
       +
           xdg.portal.enable = mkDefault true; # for BCC's Applications panel.

     

       158
       158
       +
           xdg.portal.extraPortals = with pkgs; [

     

       159
       159
       +
             xdg-desktop-portal-gtk # provides a XDG Portals implementation.

     

       160
       160
       +
           ];

     

       161
       161
       +
       

     

       162
       162
       +
           services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel.

     

       163
       163
       +
           services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel.

     

       164
       164
       +
           services.xserver.libinput.enable = mkDefault true; # for BCC's Mouse panel.

     

       165
       165
       +
           services.colord.enable = mkDefault true; # for BCC's Color panel.

     

       166
       166
       +
           services.gnome.at-spi2-core.enable = mkDefault true; # for BCC's A11y panel.

     

       167
       167
       +
           services.accounts-daemon.enable = mkDefault true; # for BCC's Users panel.

     

       168
       168
       +
           services.fprintd.enable = mkDefault true; # for BCC's Users panel.

     

       169
       169
       +
           services.udisks2.enable = mkDefault true; # for BCC's Details panel.

     

       170
       170
       +
       

     

       171
       171
       +
           # For BCC's Online Accounts panel.

     

       172
       172
       +
           services.gnome.gnome-online-accounts.enable = mkDefault true;

     

       173
       173
       +
           services.gnome.gnome-online-miners.enable = true;

     

       174
       174
       +
       

     

       175
       175
       +
           # For BCC's Printers panel.

     

       176
       176
       +
           services.printing.enable = mkDefault true;

     

       177
       177
       +
           services.system-config-printer.enable = config.services.printing.enable;

     

       178
       178
       +
       

     

       179
       179
       +
           # For BCC's Sharing panel.

     

       180
       180
       +
           services.dleyna-renderer.enable = mkDefault true;

     

       181
       181
       +
           services.dleyna-server.enable = mkDefault true;

     

       182
       182
       +
           services.gnome.gnome-user-share.enable = mkDefault true;

     

       183
       183
       +
           services.gnome.rygel.enable = mkDefault true;

     

       184
       184
       +
       

     

       185
       185
       +
           # Other default services.

     

       186
       186
       +
           services.gnome.evolution-data-server.enable = mkDefault true;

     

       187
       187
       +
           services.gnome.glib-networking.enable = mkDefault true;

     

       188
       188
       +
           services.gnome.gnome-keyring.enable = mkDefault true;

     

       189
       189
       +
           services.gnome.gnome-settings-daemon.enable = mkDefault true;

     

       190
       190
       +
           services.gvfs.enable = mkDefault true;

     

       191
       191
       +
       

     

       192
       192
       +
           # Register packages for DBus.

     

       193
       193
       +
           services.dbus.packages = with pkgs; [

     

       194
       194
       +
             budgie.budgie-control-center

     

       195
       195
       +
           ];

     

       196
       196
       +
       

     

       197
       197
       +
           # Shell integration for MATE Terminal.

     

       198
       198
       +
           programs.bash.vteIntegration = true;

     

       199
       199
       +
           programs.zsh.vteIntegration = true;

     

       200
       200
       +
         };

     

       201
       201
       +
       }

+1 -1

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

···

       21
       21
        
           ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./lumina.nix

     

       22
       22
        
           ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix

     

       23
       23
        
           ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix

     

       24
       24
       -
           ./cinnamon.nix

     

       24
       24
       +
           ./cinnamon.nix ./budgie.nix

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         options = {

nixos/tests/all-tests.nix

···

       112
       112
        
         btrbk-doas = handleTest ./btrbk-doas.nix {};

     

       113
       113
        
         btrbk-no-timer = handleTest ./btrbk-no-timer.nix {};

     

       114
       114
        
         btrbk-section-order = handleTest ./btrbk-section-order.nix {};

     

       115
       115
       +
         budgie = handleTest ./budgie.nix {};

     

       115
       116
        
         buildbot = handleTest ./buildbot.nix {};

     

       116
       117
        
         buildkite-agents = handleTest ./buildkite-agents.nix {};

     

       117
       118
        
         caddy = handleTest ./caddy.nix {};

+51

nixos/tests/budgie.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
       +
         name = "budgie";

     

       3
       3
       +
       

     

       4
       4
       +
         meta = with lib; {

     

       5
       5
       +
           maintainers = [ maintainers.federicoschonborn ];

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.machine = { ... }: {

     

       9
       9
       +
           imports = [

     

       10
       10
       +
             ./common/user-account.nix

     

       11
       11
       +
           ];

     

       12
       12
       +
       

     

       13
       13
       +
           services.xserver.enable = true;

     

       14
       14
       +
       

     

       15
       15
       +
           services.xserver.displayManager = {

     

       16
       16
       +
             lightdm.enable = true;

     

       17
       17
       +
             autoLogin = {

     

       18
       18
       +
               enable = true;

     

       19
       19
       +
               user = "alice";

     

       20
       20
       +
             };

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           services.xserver.desktopManager.budgie.enable = true;

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         testScript = { nodes, ... }:

     

       27
       27
       +
           let

     

       28
       28
       +
             user = nodes.machine.users.users.alice;

     

       29
       29
       +
           in

     

       30
       30
       +
           ''

     

       31
       31
       +
             with subtest("Wait for login"):

     

       32
       32
       +
                 machine.wait_for_x()

     

       33
       33
       +
                 machine.wait_for_file("${user.home}/.Xauthority")

     

       34
       34
       +
                 machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       35
       35
       +
       

     

       36
       36
       +
             with subtest("Check that logging in has given the user ownership of devices"):

     

       37
       37
       +
                 machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")

     

       38
       38
       +
       

     

       39
       39
       +
             with subtest("Check if Budgie session components actually start"):

     

       40
       40
       +
                 machine.wait_until_succeeds("pgrep budgie-daemon")

     

       41
       41
       +
                 machine.wait_for_window("budgie-daemon")

     

       42
       42
       +
                 machine.wait_until_succeeds("pgrep budgie-panel")

     

       43
       43
       +
                 machine.wait_for_window("budgie-panel")

     

       44
       44
       +
       

     

       45
       45
       +
             with subtest("Open MATE terminal"):

     

       46
       46
       +
                 machine.succeed("su - ${user.name} -c 'DISPLAY=:0 mate-terminal >&2 &'")

     

       47
       47
       +
                 machine.wait_for_window("Terminal")

     

       48
       48
       +
                 machine.sleep(20)

     

       49
       49
       +
                 machine.screenshot("screen")

     

       50
       50
       +
           '';

     

       51
       51
       +
       })

+40

pkgs/desktops/budgie/budgie-backgrounds/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , imagemagick

     

       5
       5
       +
       , jhead

     

       6
       6
       +
       , meson

     

       7
       7
       +
       , ninja

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "budgie-backgrounds";

     

       12
       12
       +
         version = "0.1";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "BuddiesOfBudgie";

     

       16
       16
       +
           repo = "budgie-backgrounds";

     

       17
       17
       +
           rev = "v${version}";

     

       18
       18
       +
           hash = "sha256-pDFd+WvWOPgDoSffmX9mzjDQbhePsJV1wGqmPDcnOlw=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           imagemagick

     

       23
       23
       +
           jhead

     

       24
       24
       +
           meson

     

       25
       25
       +
           ninja

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         preConfigure = ''

     

       29
       29
       +
           chmod +x ./scripts/optimizeImage.sh

     

       30
       30
       +
           patchShebangs ./scripts/optimizeImage.sh

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           description = "The default background set for the Budgie Desktop";

     

       35
       35
       +
           homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds";

     

       36
       36
       +
           platforms = platforms.linux;

     

       37
       37
       +
           maintainers = [ maintainers.federicoschonborn ];

     

       38
       38
       +
           license = licenses.cc0;

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+175

pkgs/desktops/budgie/budgie-control-center/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , substituteAll

     

       5
       5
       +
       , accountsservice

     

       6
       6
       +
       , budgie-desktop

     

       7
       7
       +
       , clutter

     

       8
       8
       +
       , clutter-gtk

     

       9
       9
       +
       , colord

     

       10
       10
       +
       , colord-gtk

     

       11
       11
       +
       , cups

     

       12
       12
       +
       , docbook-xsl-nons

     

       13
       13
       +
       , fontconfig

     

       14
       14
       +
       , gcr

     

       15
       15
       +
       , gdk-pixbuf

     

       16
       16
       +
       , gettext

     

       17
       17
       +
       , glib

     

       18
       18
       +
       , glib-networking

     

       19
       19
       +
       , glibc

     

       20
       20
       +
       , gnome

     

       21
       21
       +
       , gnome-desktop

     

       22
       22
       +
       , gnome-online-accounts

     

       23
       23
       +
       , gsettings-desktop-schemas

     

       24
       24
       +
       , gsound

     

       25
       25
       +
       , gtk3

     

       26
       26
       +
       , ibus

     

       27
       27
       +
       , libcanberra-gtk3

     

       28
       28
       +
       , libepoxy

     

       29
       29
       +
       , libgnomekbd

     

       30
       30
       +
       , libgtop

     

       31
       31
       +
       , libgudev

     

       32
       32
       +
       , libhandy

     

       33
       33
       +
       , libkrb5

     

       34
       34
       +
       , libnma

     

       35
       35
       +
       , libpulseaudio

     

       36
       36
       +
       , libpwquality

     

       37
       37
       +
       , librsvg

     

       38
       38
       +
       , libsecret

     

       39
       39
       +
       , libwacom

     

       40
       40
       +
       , libxml2

     

       41
       41
       +
       , libxslt

     

       42
       42
       +
       , meson

     

       43
       43
       +
       , modemmanager

     

       44
       44
       +
       , networkmanager

     

       45
       45
       +
       , networkmanagerapplet

     

       46
       46
       +
       , ninja

     

       47
       47
       +
       , pkg-config

     

       48
       48
       +
       , polkit

     

       49
       49
       +
       , samba

     

       50
       50
       +
       , shadow

     

       51
       51
       +
       , shared-mime-info

     

       52
       52
       +
       , tzdata

     

       53
       53
       +
       , udisks2

     

       54
       54
       +
       , upower

     

       55
       55
       +
       , webp-pixbuf-loader

     

       56
       56
       +
       , wrapGAppsHook

     

       57
       57
       +
       }:

     

       58
       58
       +
       

     

       59
       59
       +
       stdenv.mkDerivation rec {

     

       60
       60
       +
         pname = "budgie-control-center";

     

       61
       61
       +
         version = "1.2.0";

     

       62
       62
       +
       

     

       63
       63
       +
         src = fetchFromGitHub {

     

       64
       64
       +
           owner = "BuddiesOfBudgie";

     

       65
       65
       +
           repo = pname;

     

       66
       66
       +
           rev = "v${version}";

     

       67
       67
       +
           fetchSubmodules = true;

     

       68
       68
       +
           sha256 = "sha256-z9apestNLEUKzrCMNo0BNAWeyE6FsUCAzcHIom8LcUs=";

     

       69
       69
       +
         };

     

       70
       70
       +
       

     

       71
       71
       +
         patches = [

     

       72
       72
       +
           (substituteAll {

     

       73
       73
       +
             src = ./paths.patch;

     

       74
       74
       +
             budgie_desktop = budgie-desktop;

     

       75
       75
       +
             gcm = gnome.gnome-color-manager;

     

       76
       76
       +
             inherit cups glibc libgnomekbd shadow;

     

       77
       77
       +
             inherit networkmanagerapplet tzdata;

     

       78
       78
       +
           })

     

       79
       79
       +
         ];

     

       80
       80
       +
       

     

       81
       81
       +
         nativeBuildInputs = [

     

       82
       82
       +
           docbook-xsl-nons

     

       83
       83
       +
           gettext

     

       84
       84
       +
           libxslt

     

       85
       85
       +
           meson

     

       86
       86
       +
           ninja

     

       87
       87
       +
           pkg-config

     

       88
       88
       +
           shared-mime-info

     

       89
       89
       +
           wrapGAppsHook

     

       90
       90
       +
         ];

     

       91
       91
       +
       

     

       92
       92
       +
         buildInputs = [

     

       93
       93
       +
           accountsservice

     

       94
       94
       +
           clutter

     

       95
       95
       +
           clutter-gtk

     

       96
       96
       +
           colord

     

       97
       97
       +
           colord-gtk

     

       98
       98
       +
           fontconfig

     

       99
       99
       +
           gcr

     

       100
       100
       +
           gdk-pixbuf

     

       101
       101
       +
           glib

     

       102
       102
       +
           glib-networking

     

       103
       103
       +
           gnome-desktop

     

       104
       104
       +
           gnome-online-accounts

     

       105
       105
       +
           gnome.adwaita-icon-theme

     

       106
       106
       +
           gnome.cheese

     

       107
       107
       +
           gnome.gnome-bluetooth_1_0

     

       108
       108
       +
           gnome.gnome-remote-desktop

     

       109
       109
       +
           gnome.gnome-settings-daemon

     

       110
       110
       +
           gnome.gnome-user-share

     

       111
       111
       +
           gnome.mutter

     

       112
       112
       +
           gsettings-desktop-schemas

     

       113
       113
       +
           gsound

     

       114
       114
       +
           gtk3

     

       115
       115
       +
           ibus

     

       116
       116
       +
           libcanberra-gtk3

     

       117
       117
       +
           libepoxy

     

       118
       118
       +
           libgtop

     

       119
       119
       +
           libgudev

     

       120
       120
       +
           libhandy

     

       121
       121
       +
           libkrb5

     

       122
       122
       +
           libnma

     

       123
       123
       +
           libpulseaudio

     

       124
       124
       +
           libpwquality

     

       125
       125
       +
           librsvg

     

       126
       126
       +
           libsecret

     

       127
       127
       +
           libwacom

     

       128
       128
       +
           libxml2

     

       129
       129
       +
           modemmanager

     

       130
       130
       +
           networkmanager

     

       131
       131
       +
           polkit

     

       132
       132
       +
           samba

     

       133
       133
       +
           udisks2

     

       134
       134
       +
           upower

     

       135
       135
       +
         ];

     

       136
       136
       +
       

     

       137
       137
       +
         preConfigure = ''

     

       138
       138
       +
           # For ITS rules

     

       139
       139
       +
           addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"

     

       140
       140
       +
         '';

     

       141
       141
       +
       

     

       142
       142
       +
         postInstall = ''

     

       143
       143
       +
           # Pull in WebP support for gnome-backgrounds.

     

       144
       144
       +
           # In postInstall to run before gappsWrapperArgsHook.

     

       145
       145
       +
           export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

     

       146
       146
       +
             extraLoaders = [

     

       147
       147
       +
               librsvg

     

       148
       148
       +
               webp-pixbuf-loader

     

       149
       149
       +
             ];

     

       150
       150
       +
           }}"

     

       151
       151
       +
         '';

     

       152
       152
       +
       

     

       153
       153
       +
         preFixup = ''

     

       154
       154
       +
           gappsWrapperArgs+=(

     

       155
       155
       +
             # Sound theme

     

       156
       156
       +
             --prefix XDG_DATA_DIRS : "${budgie-desktop}/share"

     

       157
       157
       +
             # Thumbnailers (for setting user profile pictures)

     

       158
       158
       +
             --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"

     

       159
       159
       +
             --prefix XDG_DATA_DIRS : "${librsvg}/share"

     

       160
       160
       +
             # WM keyboard shortcuts

     

       161
       161
       +
             --prefix XDG_DATA_DIRS : "${gnome.mutter}/share"

     

       162
       162
       +
           )

     

       163
       163
       +
         '';

     

       164
       164
       +
       

     

       165
       165
       +
         separateDebugInfo = true;

     

       166
       166
       +
       

     

       167
       167
       +
         meta = with lib; {

     

       168
       168
       +
           description = "A fork of GNOME Control Center for the Budgie 10 Series";

     

       169
       169
       +
           homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center";

     

       170
       170
       +
           mainProgram = "budgie-control-center";

     

       171
       171
       +
           platforms = platforms.linux;

     

       172
       172
       +
           maintainers = [ maintainers.federicoschonborn ];

     

       173
       173
       +
           license = licenses.gpl2Plus;

     

       174
       174
       +
         };

     

       175
       175
       +
       }

+185

pkgs/desktops/budgie/budgie-control-center/paths.patch

···

       1
       1
       +
       diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c

     

       2
       2
       +
       index a2f90b093..7801b4a5e 100644

     

       3
       3
       +
       --- a/panels/color/cc-color-panel.c

     

       4
       4
       +
       +++ b/panels/color/cc-color-panel.c

     

       5
       5
       +
       @@ -587,7 +587,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs)

     

       6
       6
       +
        

     

       7
       7
       +
          /* run with modal set */

     

       8
       8
       +
          argv = g_ptr_array_new_with_free_func (g_free);

     

       9
       9
       +
       -  g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));

     

       10
       10
       +
       +  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));

     

       11
       11
       +
          g_ptr_array_add (argv, g_strdup ("--device"));

     

       12
       12
       +
          g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));

     

       13
       13
       +
          g_ptr_array_add (argv, g_strdup ("--parent-window"));

     

       14
       14
       +
       @@ -940,7 +940,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)

     

       15
       15
       +
        

     

       16
       16
       +
          /* open up gcm-viewer as a info pane */

     

       17
       17
       +
          argv = g_ptr_array_new_with_free_func (g_free);

     

       18
       18
       +
       -  g_ptr_array_add (argv, g_strdup ("gcm-viewer"));

     

       19
       19
       +
       +  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL));

     

       20
       20
       +
          g_ptr_array_add (argv, g_strdup ("--profile"));

     

       21
       21
       +
          g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));

     

       22
       22
       +
          g_ptr_array_add (argv, g_strdup ("--parent-window"));

     

       23
       23
       +
       @@ -1186,15 +1186,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)

     

       24
       24
       +
        static void

     

       25
       25
       +
        gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)

     

       26
       26
       +
        {

     

       27
       27
       +
       -  g_autofree gchar *s = NULL;

     

       28
       28
       +
       -

     

       29
       29
       +
          /* get profile */

     

       30
       30
       +
          g_debug ("selected profile = %s",

     

       31
       31
       +
             cd_profile_get_filename (profile));

     

       32
       32
       +
        

     

       33
       33
       +
          /* allow getting profile info */

     

       34
       34
       +
       -  if (cd_profile_get_filename (profile) != NULL &&

     

       35
       35
       +
       -      (s = g_find_program_in_path ("gcm-viewer")) != NULL)

     

       36
       36
       +
       +  if (cd_profile_get_filename (profile) != NULL)

     

       37
       37
       +
            gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);

     

       38
       38
       +
          else

     

       39
       39
       +
            gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);

     

       40
       40
       +
       diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h

     

       41
       41
       +
       index b6b7ab9d0..31f268e91 100644

     

       42
       42
       +
       --- a/panels/datetime/tz.h

     

       43
       43
       +
       +++ b/panels/datetime/tz.h

     

       44
       44
       +
       @@ -4,7 +4,7 @@

     

       45
       45
       +
         * Copyright (C) 2000-2001 Ximian, Inc.

     

       46
       46
       +
         *

     

       47
       47
       +
         * Authors: Hans Petter Jansson <hpj@ximian.com>

     

       48
       48
       +
       - * 

     

       49
       49
       +
       + *

     

       50
       50
       +
         * Largely based on Michael Fulbright's work on Anaconda.

     

       51
       51
       +
         *

     

       52
       52
       +
         * This program is free software; you can redistribute it and/or modify

     

       53
       53
       +
       @@ -27,11 +27,7 @@

     

       54
       54
       +
        

     

       55
       55
       +
        G_BEGIN_DECLS

     

       56
       56
       +
        

     

       57
       57
       +
       -#ifndef __sun

     

       58
       58
       +
       -#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"

     

       59
       59
       +
       -#else

     

       60
       60
       +
       -#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"

     

       61
       61
       +
       -#endif

     

       62
       62
       +
       +#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"

     

       63
       63
       +
        

     

       64
       64
       +
        typedef struct _TzDB TzDB;

     

       65
       65
       +
        typedef struct _TzLocation TzLocation;

     

       66
       66
       +
       diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c

     

       67
       67
       +
       index 25cda02d3..db664bc56 100644

     

       68
       68
       +
       --- a/panels/info-overview/cc-info-overview-panel.c

     

       69
       69
       +
       +++ b/panels/info-overview/cc-info-overview-panel.c

     

       70
       70
       +
       @@ -156,7 +156,7 @@ load_budgie_version (char **version)

     

       71
       71
       +
          gsize length;

     

       72
       72
       +
          g_autoptr(VersionData) data = NULL;

     

       73
       73
       +
        

     

       74
       74
       +
       -  if (!g_file_get_contents (DATADIR "/budgie/budgie-version.xml",

     

       75
       75
       +
       +  if (!g_file_get_contents ("@budgie_desktop@/share/budgie/budgie-version.xml",

     

       76
       76
       +
                                    &contents,

     

       77
       77
       +
                                    &length,

     

       78
       78
       +
                                    &error))

     

       79
       79
       +
       diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c

     

       80
       80
       +
       index 191207490..37e0fddc2 100644

     

       81
       81
       +
       --- a/panels/keyboard/cc-input-list-box.c

     

       82
       82
       +
       +++ b/panels/keyboard/cc-input-list-box.c

     

       83
       83
       +
       @@ -62,7 +62,7 @@ struct _CcInputListBox {

     

       84
       84
       +
        };

     

       85
       85
       +
        

     

       86
       86
       +
        G_DEFINE_TYPE (CcInputListBox, cc_input_list_box, GTK_TYPE_LIST_BOX)

     

       87
       87
       +
       - 

     

       88
       88
       +
       +

     

       89
       89
       +
        typedef struct

     

       90
       90
       +
        {

     

       91
       91
       +
          CcInputListBox *panel;

     

       92
       92
       +
       @@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self,

     

       93
       93
       +
          layout_variant = cc_input_source_get_layout_variant (source);

     

       94
       94
       +
        

     

       95
       95
       +
          if (layout_variant && layout_variant[0])

     

       96
       96
       +
       -    commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",

     

       97
       97
       +
       +    commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",

     

       98
       98
       +
        				   layout, layout_variant);

     

       99
       99
       +
          else

     

       100
       100
       +
       -    commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",

     

       101
       101
       +
       +    commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",

     

       102
       102
       +
        				   layout);

     

       103
       103
       +
        

     

       104
       104
       +
          g_spawn_command_line_async (commandline, NULL);

     

       105
       105
       +
       diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c

     

       106
       106
       +
       index 505b8ee25..62e94009f 100644

     

       107
       107
       +
       --- a/panels/network/connection-editor/net-connection-editor.c

     

       108
       108
       +
       +++ b/panels/network/connection-editor/net-connection-editor.c

     

       109
       109
       +
       @@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)

     

       110
       110
       +
                g_autoptr(GError) error = NULL;

     

       111
       111
       +
        

     

       112
       112
       +
                if (self->is_new_connection) {

     

       113
       113
       +
       -                cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);

     

       114
       114
       +
       +                cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);

     

       115
       115
       +
                } else {

     

       116
       116
       +
       -                cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",

     

       117
       117
       +
       +                cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'",

     

       118
       118
       +
                                                   nm_connection_get_uuid (self->connection));

     

       119
       119
       +
                }

     

       120
       120
       +
        

     

       121
       121
       +
       diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c

     

       122
       122
       +
       index 372c0c4f8..464f4b6a0 100644

     

       123
       123
       +
       --- a/panels/network/net-device-bluetooth.c

     

       124
       124
       +
       +++ b/panels/network/net-device-bluetooth.c

     

       125
       125
       +
       @@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)

     

       126
       126
       +
        

     

       127
       127
       +
                connection = net_device_get_find_connection (self->client, self->device);

     

       128
       128
       +
                uuid = nm_connection_get_uuid (connection);

     

       129
       129
       +
       -        cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);

     

       130
       130
       +
       +        cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);

     

       131
       131
       +
                g_debug ("Launching '%s'\n", cmdline);

     

       132
       132
       +
                if (!g_spawn_command_line_async (cmdline, &error))

     

       133
       133
       +
                        g_warning ("Failed to launch nm-connection-editor: %s", error->message);

     

       134
       134
       +
       diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c

     

       135
       135
       +
       index f50fd5d07..c6f6f776e 100644

     

       136
       136
       +
       --- a/panels/network/net-device-mobile.c

     

       137
       137
       +
       +++ b/panels/network/net-device-mobile.c

     

       138
       138
       +
       @@ -522,7 +522,7 @@ options_button_clicked_cb (NetDeviceMobile *self)

     

       139
       139
       +
        

     

       140
       140
       +
                connection = net_device_get_find_connection (self->client, self->device);

     

       141
       141
       +
                uuid = nm_connection_get_uuid (connection);

     

       142
       142
       +
       -        cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);

     

       143
       143
       +
       +        cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);

     

       144
       144
       +
                g_debug ("Launching '%s'\n", cmdline);

     

       145
       145
       +
                if (!g_spawn_command_line_async (cmdline, &error))

     

       146
       146
       +
                        g_warning ("Failed to launch nm-connection-editor: %s", error->message);

     

       147
       147
       +
       diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c

     

       148
       148
       +
       index a31a606e3..ed5133d29 100644

     

       149
       149
       +
       --- a/panels/printers/pp-host.c

     

       150
       150
       +
       +++ b/panels/printers/pp-host.c

     

       151
       151
       +
       @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask        *task,

     

       152
       152
       +
          devices = g_ptr_array_new_with_free_func (g_object_unref);

     

       153
       153
       +
        

     

       154
       154
       +
          argv = g_new0 (gchar *, 3);

     

       155
       155
       +
       -  argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");

     

       156
       156
       +
       +  argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp");

     

       157
       157
       +
          argv[1] = g_strdup (priv->hostname);

     

       158
       158
       +
        

     

       159
       159
       +
          /* Use SNMP to get printer's informations */

     

       160
       160
       +
       diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c

     

       161
       161
       +
       index 86f53d4fc..0b052856f 100644

     

       162
       162
       +
       --- a/panels/user-accounts/run-passwd.c

     

       163
       163
       +
       +++ b/panels/user-accounts/run-passwd.c

     

       164
       164
       +
       @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)

     

       165
       165
       +
                gchar  **envp;

     

       166
       166
       +
                gint    my_stdin, my_stdout, my_stderr;

     

       167
       167
       +
        

     

       168
       168
       +
       -        argv[0] = "/usr/bin/passwd";    /* Is it safe to rely on a hard-coded path? */

     

       169
       169
       +
       +        argv[0] = "/run/wrappers/bin/passwd";    /* Is it safe to rely on a hard-coded path? */

     

       170
       170
       +
                argv[1] = NULL;

     

       171
       171
       +
        

     

       172
       172
       +
                envp = g_get_environ ();

     

       173
       173
       +
       diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c

     

       174
       174
       +
       index 0de83479e..628e35247 100644

     

       175
       175
       +
       --- a/panels/user-accounts/user-utils.c

     

       176
       176
       +
       +++ b/panels/user-accounts/user-utils.c

     

       177
       177
       +
       @@ -497,7 +497,7 @@ is_valid_username_async (const gchar *username,

     

       178
       178
       +
                 * future, so it would be nice to have some official way for this

     

       179
       179
       +
                 * instead of relying on the current "--login" implementation.

     

       180
       180
       +
                 */

     

       181
       181
       +
       -        argv[0] = "/usr/sbin/usermod";

     

       182
       182
       +
       +        argv[0] = "@shadow@/bin/usermod";

     

       183
       183
       +
                argv[1] = "--login";

     

       184
       184
       +
                argv[2] = data->username;

     

       185
       185
       +
                argv[3] = "--";

+53

pkgs/desktops/budgie/budgie-desktop-view/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , desktop-file-utils

     

       5
       5
       +
       , glib

     

       6
       6
       +
       , gtk3

     

       7
       7
       +
       , intltool

     

       8
       8
       +
       , meson

     

       9
       9
       +
       , ninja

     

       10
       10
       +
       , pkg-config

     

       11
       11
       +
       , vala

     

       12
       12
       +
       , wrapGAppsHook

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       stdenv.mkDerivation rec {

     

       16
       16
       +
         pname = "budgie-desktop-view";

     

       17
       17
       +
         version = "1.2.1";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "BuddiesOfBudgie";

     

       21
       21
       +
           repo = pname;

     

       22
       22
       +
           rev = "v${version}";

     

       23
       23
       +
           sha256 = "sha256-USsySJuDov2oe9UXyzACBAyYIRLKSXOMXdia8Ix/8TE=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           desktop-file-utils

     

       28
       28
       +
           intltool

     

       29
       29
       +
           meson

     

       30
       30
       +
           ninja

     

       31
       31
       +
           pkg-config

     

       32
       32
       +
           vala

     

       33
       33
       +
           wrapGAppsHook

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         buildInputs = [

     

       37
       37
       +
           glib

     

       38
       38
       +
           gtk3

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         preInstall = ''

     

       42
       42
       +
           substituteInPlace ../scripts/mesonPostInstall.sh --replace "update-desktop-database -q" "update-desktop-database $out/share/applications"

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           description = "The official Budgie desktop icons application/implementation";

     

       47
       47
       +
           homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view";

     

       48
       48
       +
           mainProgram = "org.buddiesofbudgie.budgie-desktop-view";

     

       49
       49
       +
           platforms = platforms.linux;

     

       50
       50
       +
           maintainers = [ maintainers.federicoschonborn ];

     

       51
       51
       +
           license = licenses.asl20;

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+101

pkgs/desktops/budgie/budgie-desktop/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , accountsservice

     

       5
       5
       +
       , alsa-lib

     

       6
       6
       +
       , budgie-screensaver

     

       7
       7
       +
       , docbook-xsl-nons

     

       8
       8
       +
       , glib

     

       9
       9
       +
       , gnome

     

       10
       10
       +
       , gnome-desktop

     

       11
       11
       +
       , gnome-menus

     

       12
       12
       +
       , graphene

     

       13
       13
       +
       , gst_all_1

     

       14
       14
       +
       , gtk-doc

     

       15
       15
       +
       , gtk3

     

       16
       16
       +
       , ibus

     

       17
       17
       +
       , intltool

     

       18
       18
       +
       , libcanberra-gtk3

     

       19
       19
       +
       , libgee

     

       20
       20
       +
       , libGL

     

       21
       21
       +
       , libnotify

     

       22
       22
       +
       , libpeas

     

       23
       23
       +
       , libpulseaudio

     

       24
       24
       +
       , libuuid

     

       25
       25
       +
       , libwnck

     

       26
       26
       +
       , mesa

     

       27
       27
       +
       , meson

     

       28
       28
       +
       , ninja

     

       29
       29
       +
       , pkg-config

     

       30
       30
       +
       , polkit

     

       31
       31
       +
       , sassc

     

       32
       32
       +
       , upower

     

       33
       33
       +
       , vala

     

       34
       34
       +
       , wrapGAppsHook

     

       35
       35
       +
       }:

     

       36
       36
       +
       

     

       37
       37
       +
       stdenv.mkDerivation rec {

     

       38
       38
       +
         pname = "budgie-desktop";

     

       39
       39
       +
         version = "10.7.1";

     

       40
       40
       +
       

     

       41
       41
       +
         src = fetchFromGitHub {

     

       42
       42
       +
           owner = "BuddiesOfBudgie";

     

       43
       43
       +
           repo = pname;

     

       44
       44
       +
           rev = "v${version}";

     

       45
       45
       +
           fetchSubmodules = true;

     

       46
       46
       +
           sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0=";

     

       47
       47
       +
         };

     

       48
       48
       +
       

     

       49
       49
       +
         nativeBuildInputs = [

     

       50
       50
       +
           docbook-xsl-nons

     

       51
       51
       +
           gtk-doc

     

       52
       52
       +
           intltool

     

       53
       53
       +
           meson

     

       54
       54
       +
           ninja

     

       55
       55
       +
           pkg-config

     

       56
       56
       +
           vala

     

       57
       57
       +
           wrapGAppsHook

     

       58
       58
       +
         ];

     

       59
       59
       +
       

     

       60
       60
       +
         buildInputs = [

     

       61
       61
       +
           accountsservice

     

       62
       62
       +
           alsa-lib

     

       63
       63
       +
           budgie-screensaver

     

       64
       64
       +
           glib

     

       65
       65
       +
           gnome-desktop

     

       66
       66
       +
           gnome-menus

     

       67
       67
       +
           gnome.gnome-bluetooth_1_0

     

       68
       68
       +
           gnome.gnome-settings-daemon

     

       69
       69
       +
           gnome.mutter

     

       70
       70
       +
           graphene

     

       71
       71
       +
           gtk3

     

       72
       72
       +
           ibus

     

       73
       73
       +
           libcanberra-gtk3

     

       74
       74
       +
           libgee

     

       75
       75
       +
           libGL

     

       76
       76
       +
           libnotify

     

       77
       77
       +
           libpeas

     

       78
       78
       +
           libpulseaudio

     

       79
       79
       +
           libuuid

     

       80
       80
       +
           libwnck

     

       81
       81
       +
           mesa

     

       82
       82
       +
           polkit

     

       83
       83
       +
           sassc

     

       84
       84
       +
           upower

     

       85
       85
       +
         ] ++ (with gst_all_1; [

     

       86
       86
       +
           gstreamer

     

       87
       87
       +
           gst-plugins-base

     

       88
       88
       +
         ]);

     

       89
       89
       +
       

     

       90
       90
       +
         passthru.providedSessions = [

     

       91
       91
       +
           "budgie-desktop"

     

       92
       92
       +
         ];

     

       93
       93
       +
       

     

       94
       94
       +
         meta = with lib; {

     

       95
       95
       +
           description = "A feature-rich, modern desktop designed to keep out the way of the user";

     

       96
       96
       +
           homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop";

     

       97
       97
       +
           platforms = platforms.linux;

     

       98
       98
       +
           maintainers = [ maintainers.federicoschonborn ];

     

       99
       99
       +
           license = with licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30];

     

       100
       100
       +
         };

     

       101
       101
       +
       }

+78

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , runCommand

     

       3
       3
       +
       , budgie-desktop

     

       4
       4
       +
       , budgie-desktop-view

     

       5
       5
       +
       , glib

     

       6
       6
       +
       , gnome

     

       7
       7
       +
       , gsettings-desktop-schemas

     

       8
       8
       +
       , mate

     

       9
       9
       +
       , nixos-artwork

     

       10
       10
       +
       , nixos-background-light ? nixos-artwork.wallpapers.nineish

     

       11
       11
       +
       , nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray

     

       12
       12
       +
       , extraGSettingsOverrides ? ""

     

       13
       13
       +
       , extraGSettingsOverridePackages ? []

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       let

     

       17
       17
       +
         inherit (lib) concatMapStringsSep;

     

       18
       18
       +
       

     

       19
       19
       +
         gsettingsOverrides = ''

     

       20
       20
       +
           [org.gnome.desktop.background:Budgie]

     

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

     

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

     

       23
       23
       +
       

     

       24
       24
       +
           [org.gnome.desktop.screensaver:Budgie]

     

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

     

       26
       26
       +
       

     

       27
       27
       +
           [org.gnome.desktop.interface:Budgie]

     

       28
       28
       +
           gtk-theme="Qogir"

     

       29
       29
       +
           icon-theme="Qogir"

     

       30
       30
       +
           cursor-theme="Qogir"

     

       31
       31
       +
           font-name="Noto Sans 10"

     

       32
       32
       +
           document-font-name="Noto Sans 10"

     

       33
       33
       +
           monospace-font-name="Hack 10"

     

       34
       34
       +
           enable-hot-corners=true

     

       35
       35
       +
       

     

       36
       36
       +
           [org.gnome.desktop.wm.preferences:Budgie]

     

       37
       37
       +
           titlebar-font="Noto Sans Bold 10"

     

       38
       38
       +
       

     

       39
       39
       +
           [org.gnome.mutter:Budgie]

     

       40
       40
       +
           workspaces-only-on-primary=true

     

       41
       41
       +
       

     

       42
       42
       +
           [com.solus-project.budgie-panel:Budgie]

     

       43
       43
       +
           dark-theme=false

     

       44
       44
       +
           builtin-theme=false

     

       45
       45
       +
       

     

       46
       46
       +
           [com.solus-project.icon-tasklist:Budgie]

     

       47
       47
       +
           pinned-launchers=["nemo.desktop", "vlc.desktop", "mate-terminal.desktop"]

     

       48
       48
       +
       

     

       49
       49
       +
           [org.buddiesofbudgie.budgie-desktop-view:Budgie]

     

       50
       50
       +
           show=true

     

       51
       51
       +
           click-policy="double"

     

       52
       52
       +
           terminal="${mate.mate-terminal}/bin/mate-terminal"

     

       53
       53
       +
       

     

       54
       54
       +
           ${extraGSettingsOverrides}

     

       55
       55
       +
         '';

     

       56
       56
       +
       

     

       57
       57
       +
         gsettingsOverridePackages = [

     

       58
       58
       +
             budgie-desktop

     

       59
       59
       +
             budgie-desktop-view

     

       60
       60
       +
             gsettings-desktop-schemas

     

       61
       61
       +
             gnome.mutter

     

       62
       62
       +
         ] ++ extraGSettingsOverridePackages;

     

       63
       63
       +
       

     

       64
       64
       +
       in

     

       65
       65
       +
         runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } ''

     

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

     

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

     

       68
       68
       +
           mkdir -p "$schema_dir"

     

       69
       69
       +
       

     

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

     

       71
       71
       +
       

     

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

     

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

     

       74
       74
       +
           ${gsettingsOverrides}

     

       75
       75
       +
           EOF

     

       76
       76
       +
       

     

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

     

       78
       78
       +
         ''

pkgs/desktops/budgie/default.nix

···

       1
       1
        
       { lib, pkgs }:

     

       2
       2
        
       

     

       3
       3
        
       lib.makeScope pkgs.newScope (self: with self; {

     

       4
       4
       +
         budgie-backgrounds = callPackage ./budgie-backgrounds { };

     

       5
       5
       +
         budgie-control-center = callPackage ./budgie-control-center { };

     

       6
       6
       +
         budgie-desktop = callPackage ./budgie-desktop { };

     

       7
       7
       +
         budgie-desktop-view = callPackage ./budgie-desktop-view { };

     

       8
       8
       +
         budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };

     

       4
       9
        
         budgie-screensaver = callPackage ./budgie-screensaver { };

     

       5
       10
        
       })

+2 -1

pkgs/desktops/gnome/core/gnome-session/default.nix

···

       25
       25
        
       , libepoxy

     

       26
       26
        
       , bash

     

       27
       27
        
       , gnome-session-ctl

     

       28
       28
       +
       , gnomeShellSupport ? true

     

       28
       29
        
       }:

     

       29
       30
        
       

     

       30
       31
        
       stdenv.mkDerivation rec {

     
···

       113
       114
        
           wrapProgram "$out/libexec/gnome-session-binary" \

     

       114
       115
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       115
       116
        
             --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       116
       116
       -
             --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\

     

       117
       117
       +
             ${lib.optionalString gnomeShellSupport "--suffix XDG_DATA_DIRS : \"${gnome.gnome-shell}/share\""} \

     

       117
       118
        
             --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"

     

       118
       119
        
         '';

     

       119
       120