Unverified Commit b32da71a authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 8426a11c 8c3cac76

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

+37 −3
Original line number Diff line number Diff line
@@ -12,10 +12,37 @@ let 
    inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages;

    inherit nixos-background-dark nixos-background-light;

  };



  nixos-background-info = pkgs.writeTextFile {

    name = "nixos-background-info";

    text = ''

      <?xml version="1.0"?>

      <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">

      <wallpapers>

        <wallpaper deleted="false">

          <name>Nineish</name>

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

          <options>zoom</options>

          <shade_type>solid</shade_type>

          <pcolor>#d1dcf8</pcolor>

          <scolor>#e3ebfe</scolor>

        </wallpaper>

        <wallpaper deleted="false">

          <name>Nineish Dark Gray</name>

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

          <options>zoom</options>

          <shade_type>solid</shade_type>

          <pcolor>#151515</pcolor>

          <scolor>#262626</scolor>

        </wallpaper>

      </wallpapers>

    '';

    destination = "/share/gnome-background-properties/nixos.xml";

  };

in {

  options = {

    services.xserver.desktopManager.budgie = {

      enable = mkEnableOption (mdDoc "Budgie desktop");

      enable = mkEnableOption (mdDoc "the Budgie desktop");



      sessionPath = mkOption {

        description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";
@@ -35,6 +62,12 @@ in { 
        type = with types; listOf path;

        default = [];

      };



      extraPlugins = mkOption {

        description = mdDoc "Extra plugins for the Budgie desktop";

        type = with types; listOf package;

        default = [];

      };

    };



    environment.budgie.excludePackages = mkOption {
@@ -76,7 +109,7 @@ in { 
        # Budgie Desktop.

        budgie.budgie-backgrounds

        budgie.budgie-control-center

        budgie.budgie-desktop

        (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })

        budgie.budgie-desktop-view

        budgie.budgie-screensaver
@@ -106,6 +139,7 @@ in { 
          # Desktop themes.

          qogir-theme

          qogir-icon-theme

          nixos-background-info



          # Default settings.

          nixos-gsettings-overrides

nixos/tests/budgie.nix

+6 −1
Original line number Diff line number Diff line
@@ -20,7 +20,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
      };

    };



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

    services.xserver.desktopManager.budgie = {

      enable = true;

      extraPlugins = [

        pkgs.budgie.budgie-analogue-clock-applet

      ];

    };

  };



  testScript = { nodes, ... }:

pkgs/applications/audio/tidal-hifi/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ 


stdenv.mkDerivation rec {

  pname = "tidal-hifi";

  version = "4.4.0";

  version = "5.0.0";



  src = fetchurl {

    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";

    sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8=";

    sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE=";

  };



  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];

pkgs/applications/misc/flowtime/default.nix

0 → 100644
+56 −0
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, vala

, meson

, ninja

, wrapGAppsHook4

, libadwaita

, libxml2

, libgee

, gst_all_1

, gobject-introspection

, desktop-file-utils

, glib

, pkg-config

}:



stdenv.mkDerivation rec {

  pname = "flowtime";

  version = "3.0";



  src = fetchFromGitHub {

    owner = "Diego-Ivan";

    repo = "Flowtime";

    rev = "v${version}";

    hash = "sha256-op643yU7KdkTO9hT0iYTIqBP4oPe0MT1R5I3FAtN0/I=";

  };



  nativeBuildInputs = [

    desktop-file-utils

    glib

    gobject-introspection

    meson

    ninja

    pkg-config

    vala

    wrapGAppsHook4

  ];



  buildInputs = [

    libadwaita

    libxml2

    libgee

  ] ++ (with gst_all_1; [

    gstreamer

    gst-plugins-base

    gst-plugins-bad

  ]);



  meta = with lib; {

    description = "Get what motivates you done, without losing concentration";

    homepage = "https://github.com/Diego-Ivan/Flowtime";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ foo-dogsquared ];

  };

}

pkgs/applications/misc/logseq/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 


stdenv.mkDerivation rec {

  pname = "logseq";

  version = "0.9.3";

  version = "0.9.4";



  src = fetchurl {

    url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";

    hash = "sha256-hwBTS6hjD66SPOPctcS2esybnVrgw77fFpt8phGt334=";

    hash = "sha256-K04iIa/WnRtcHwRUHJbKqXO9c4l5xwHPvnwN5WX/Row=";

    name = "${pname}-${version}.AppImage";

  };